Attachment #248650 for bug #276387




PORTNAME=	xvt
PORTVERSION=	3.0.2
PORTREVISION=	1
CATEGORIES+=	x11
MASTER_SITES=	https://codeberg.org/BSDforge/${PORTNAME}/archive/

MAINTAINER=	portmaster@BSDforge.com
COMMENT=	Xterm replacement, supporting color, transparency, and more, with less
WWW=		https://codeberg.org/BSDforge/xvt/

LICENSE=	BSD2CLAUSE GPLv2
LICENSE_COMB=	multi

PORTDOCS=	xvt.1.html xvtRef.html xvtRef.txt README.xvt
EXPIRATION_DATE=2024-02-29

USES=		libtool perl5 xorg

USES=		libtool perl5 tar:xz xorg
USE_LDCONFIG=	yes
USE_PERL5=	build patch
USE_XORG=	x11 xpm

# make resources checking via XGetDefault
XGETDEFAULT_CONFIGURE_ON=	--enable-xgetdefault

# because the ports framework doesn't cope well with bare ${PORTNAME} ${WRKSRC}
post-extract:
	${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}

post-patch:
	@${PERL} -pi -e 's|(PTYCHAR2\s+"[^"]+)"|\1ghijklmnopqrstuv"|' \
		${WRKSRC}/src/ptytty.c

Lines 1-2 Link Here

(-)b/x11/xvt/distinfo (-2 / +3 lines)
1	SHA256 (xvt-3.0.1.tar.xz) = f218db092449eb183de540f6500aefbcca6f8f4e3a40110c728e578c27593e6d	1	TIMESTAMP = 1708466763
2	SIZE (xvt-3.0.1.tar.xz) = 431296	2	SHA256 (xvt-3.0.2.tar.gz) = cc6067e50dd84cd1e3f3aa9618ff16d97cef3cc05923ab83301d86ce33c7e97d
		3	SIZE (xvt-3.0.2.tar.gz) = 610338

Removed Link Here

(-)a/x11/xvt/files/patch-src__command.c (-11 lines)
1	--- src/command.c.orig 2014-12-09 12:06:57.000000000 -0800
2	+++ src/command.c 2014-12-09 12:07:41.000000000 -0800
3	@@ -3098,7 +3098,7 @@
4	unsigned char buf[256];
5
6	va_start(arg_ptr, fmt);
7	- vsprintf((char *)buf, fmt, arg_ptr);
8	+ vsnprintf((char *)buf, sizeof(buf), fmt, arg_ptr);
9	va_end(arg_ptr);
10	xvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
11	}




--- src/init.c.orig	2014-12-09 12:50:59.000000000 -0800
+++ src/init.c	2014-12-09 12:54:55.000000000 -0800
@@ -1531,6 +1531,9 @@
 # ifdef VEOL2
     tio->c_cc[VEOL2] = VDISABLE;
 # endif
+# ifdef VERASE2
+    tio->c_cc[VERASE2] = CERASE2;
+# endif
 # ifdef VSWTC
     tio->c_cc[VSWTC] = VDISABLE;
 # endif
@@ -1651,6 +1654,9 @@
 # ifdef VEOL2
     FOO(VEOL2, "VEOL2");
 # endif
+# ifdef VERASE2
+    FOO(VERASE2, "VERASE2");
+# endif
 # ifdef VSWTC
     FOO(VSWTC, "VSWTC");
 # endif




--- src/screen.c.orig	2014-12-09 13:14:46.000000000 -0800
+++ src/screen.c	2014-12-09 13:14:57.000000000 -0800
@@ -3520,6 +3520,7 @@
     Atom32          target_list[3];
 #endif
     Atom            target;
+    Atom            property;
     XTextProperty   ct;
     XICCEncodingStyle style;
     char           *cl[2], dummy[1];
@@ -3532,6 +3533,15 @@
     ev.target = rq->target;
     ev.time = rq->time;
 
+	/* ICCCM: 2.2. Responsibilities of the Selection Owner
+	 * SelectionRequest:
+	 * If the specified property is None , the requestor
+	 * an obsolete client. Owners are encouraged
+	 * to support these clients by using the specified
+	 * target atom as the property name to be used for
+	 * the reply.
+	 */
+	property = (rq->property == 0) ? rq->target : rq->property;
     if (rq->target == r->h->xa[XA_TARGETS]) {
 	target_list[0] = (Atom32) r->h->xa[XA_TARGETS];
 	target_list[1] = (Atom32) XA_STRING;
@@ -3539,7 +3549,7 @@
 #ifdef USE_XIM
 	target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT];
 #endif
-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM,
+	XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM,
 			(8 * sizeof(target_list[0])), PropModeReplace,
 			(unsigned char *)target_list,
 			(sizeof(target_list) / sizeof(target_list[0])));
@@ -3547,10 +3557,10 @@
     } else if (rq->target == r->h->xa[XA_MULTIPLE]) {
 	/* TODO: Handle MULTIPLE */
     } else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) {
-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
-			(8 * sizeof(Time)), PropModeReplace,
+	XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER,
+			32, PropModeReplace,
 			(unsigned char *)&r->h->selection_time, 1);
-	ev.property = rq->property;
+	ev.property = property;
     } else if (rq->target == XA_STRING
 	       || rq->target == r->h->xa[XA_COMPOUND_TEXT]
 	       || rq->target == r->h->xa[XA_TEXT]) {
@@ -3588,10 +3598,10 @@
 	    ct.value = (unsigned char *)cl[0];
 	    ct.nitems = selectlen;
 	}
-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property,
+	XChangeProperty(r->Xdisplay, rq->requestor, property,
 			target, 8, PropModeReplace,
 			ct.value, (int)ct.nitems);
-	ev.property = rq->property;
+	ev.property = property;
 #ifdef USE_XIM
 	if (freect)
 	    XFree(ct.value);

Removed Link Here

(-)a/x11/xvt/files/patch-src__xvt.h (-11 lines)
1	--- src/xvt.h.orig 2014-12-09 12:59:35.000000000 -0800
2	+++ src/xvt.h 2014-12-09 12:59:39.000000000 -0800
3	@@ -804,7 +804,7 @@
4	#define xvt_Gr_ButtonRelease(x,y) xvt_Gr_ButtonReport (r, 'R',(x),(y))
5
6	#ifdef UTMP_SUPPORT
7	-# if !defined(XVT_UTMPX_FILE) \|\| !defined(HAVE_STRUCT_UTMPX)
8	+# if !defined(HAVE_STRUCT_UTMPX)
9	# undef HAVE_UTMPX_H
10	# undef HAVE_STRUCT_UTMPX
11	# endif




--- src/logging.c.orig	2014-12-09 13:47:18.000000000 -0800
+++ src/logging.c	2014-12-09 13:47:35.000000000 -0800
@@ -82,7 +82,8 @@
     else if (sscanf(pty, "pts/%d", &i) == 1)
 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
 #endif
-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
+    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
+		STRNCMP(pty, "pts/", 4)) {
 	xvt_print_error("can't parse tty name \"%s\"", pty);
 	return;
     }
@@ -137,7 +138,9 @@
     STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
 	    sizeof(utx->ut_user));
     STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
+#if 0
     utx->ut_session = getsid(0);
+#endif
     utx->ut_tv.tv_sec = time(NULL);
     utx->ut_tv.tv_usec = 0;
     utx->ut_pid = r->h->cmd_pid;
@@ -202,7 +205,7 @@
 	xvt_update_wtmp(XVT_WTMP_FILE, ut);
 #  endif
 # endif
-# ifdef HAVE_STRUCT_UTMPX
+# if 0
 	updwtmpx(XVT_WTMPX_FILE, utx);
 # endif
     }
@@ -254,7 +257,9 @@
     if ((tmputx = getutxid(utx)))	/* position to entry in utmp file */
 	utx = tmputx;
     utx->ut_type = DEAD_PROCESS;
+#if 0
     utx->ut_session = getsid(0);
+#endif
     utx->ut_tv.tv_sec = time(NULL);
     utx->ut_tv.tv_usec = 0;
 #endif
@@ -274,7 +279,7 @@
 	xvt_update_wtmp(XVT_WTMP_FILE, ut);
 #  endif
 # endif
-# ifdef HAVE_STRUCT_UTMPX
+# if 0
 	updwtmpx(XVT_WTMPX_FILE, utx);
 # endif
     }

Return to bug 276387

Lines 1-22 Link Here

(-)b/x11/xvt/Makefile (-10 / +10 lines)
1	PORTNAME= xvt	1	PORTNAME= xvt
2	PORTVERSION= 3.0.1	2	PORTVERSION= 3.0.2
3	PORTREVISION= 1
4	CATEGORIES+= x11	3	CATEGORIES+= x11
5	MASTER_SITES= https://BSDforge.com/projects/source/x11/xvt/	4	MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/
6		5
7	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= portmaster@BSDforge.com
8	COMMENT= Xterm replacement, supporting color, transparency, and more, with less	7	COMMENT= Xterm replacement, supporting color, transparency, and more, with less
9	WWW= https://BSDforge.com/projects/x11/xvt/	8	WWW= https://codeberg.org/BSDforge/xvt/
10		9
11	LICENSE= BSD2CLAUSE GPLv2	10	LICENSE= BSD2CLAUSE GPLv2
12	LICENSE_COMB= multi	11	LICENSE_COMB= multi
13		12
14	DEPRECATED= Deprecated in favour of various forks, consider using x11/rxvt-unicode	13	PORTDOCS= xvt.1.html xvtRef.html xvtRef.txt README.xvt
15	EXPIRATION_DATE=2024-02-29
16		14
17	PORTDOCS= xvt.1.html xvtRef.html xvtRef.txt	15	USES= libtool perl5 xorg
18
19	USES= libtool perl5 tar:xz xorg
20	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
21	USE_PERL5= build patch	17	USE_PERL5= build patch
22	USE_XORG= x11 xpm	18	USE_XORG= x11 xpm
Lines 89-94 XTERM_CONFIGURE_ON= --enable-xterm-scroll Link Here
89	# make resources checking via XGetDefault	85	# make resources checking via XGetDefault
90	XGETDEFAULT_CONFIGURE_ON= --enable-xgetdefault	86	XGETDEFAULT_CONFIGURE_ON= --enable-xgetdefault
91		87
		88	# because the ports framework doesn't cope well with bare ${PORTNAME} ${WRKSRC}
		89	post-extract:
		90	${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		91
92	post-patch:	92	post-patch:
93	@${PERL} -pi -e 's\|(PTYCHAR2\s+"[^"]+)"\|\1ghijklmnopqrstuv"\|' \	93	@${PERL} -pi -e 's\|(PTYCHAR2\s+"[^"]+)"\|\1ghijklmnopqrstuv"\|' \
94	${WRKSRC}/src/ptytty.c	94	${WRKSRC}/src/ptytty.c

Removed Link Here

(-)a/x11/xvt/files/patch-src__init.c (-22 lines)
1	--- src/init.c.orig 2014-12-09 12:50:59.000000000 -0800
2	+++ src/init.c 2014-12-09 12:54:55.000000000 -0800
3	@@ -1531,6 +1531,9 @@
4	# ifdef VEOL2
5	tio->c_cc[VEOL2] = VDISABLE;
6	# endif
7	+# ifdef VERASE2
8	+ tio->c_cc[VERASE2] = CERASE2;
9	+# endif
10	# ifdef VSWTC
11	tio->c_cc[VSWTC] = VDISABLE;
12	# endif
13	@@ -1651,6 +1654,9 @@
14	# ifdef VEOL2
15	FOO(VEOL2, "VEOL2");
16	# endif
17	+# ifdef VERASE2
18	+ FOO(VERASE2, "VERASE2");
19	+# endif
20	# ifdef VSWTC
21	FOO(VSWTC, "VSWTC");
22	# endif

Removed Link Here

(-)a/x11/xvt/files/patch-src__screen.c (-62 lines)
1	--- src/screen.c.orig 2014-12-09 13:14:46.000000000 -0800
2	+++ src/screen.c 2014-12-09 13:14:57.000000000 -0800
3	@@ -3520,6 +3520,7 @@
4	Atom32 target_list[3];
5	#endif
6	Atom target;
7	+ Atom property;
8	XTextProperty ct;
9	XICCEncodingStyle style;
10	char *cl[2], dummy[1];
11	@@ -3532,6 +3533,15 @@
12	ev.target = rq->target;
13	ev.time = rq->time;
14
15	+ /* ICCCM: 2.2. Responsibilities of the Selection Owner
16	+ * SelectionRequest:
17	+ * If the specified property is None , the requestor
18	+ * an obsolete client. Owners are encouraged
19	+ * to support these clients by using the specified
20	+ * target atom as the property name to be used for
21	+ * the reply.
22	+ */
23	+ property = (rq->property == 0) ? rq->target : rq->property;
24	if (rq->target == r->h->xa[XA_TARGETS]) {
25	target_list[0] = (Atom32) r->h->xa[XA_TARGETS];
26	target_list[1] = (Atom32) XA_STRING;
27	@@ -3539,7 +3549,7 @@
28	#ifdef USE_XIM
29	target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT];
30	#endif
31	- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM,
32	+ XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM,
33	(8 * sizeof(target_list[0])), PropModeReplace,
34	(unsigned char *)target_list,
35	(sizeof(target_list) / sizeof(target_list[0])));
36	@@ -3547,10 +3557,10 @@
37	} else if (rq->target == r->h->xa[XA_MULTIPLE]) {
38	/* TODO: Handle MULTIPLE */
39	} else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) {
40	- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
41	- (8 * sizeof(Time)), PropModeReplace,
42	+ XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER,
43	+ 32, PropModeReplace,
44	(unsigned char *)&r->h->selection_time, 1);
45	- ev.property = rq->property;
46	+ ev.property = property;
47	} else if (rq->target == XA_STRING
48	\|\| rq->target == r->h->xa[XA_COMPOUND_TEXT]
49	\|\| rq->target == r->h->xa[XA_TEXT]) {
50	@@ -3588,10 +3598,10 @@
51	ct.value = (unsigned char *)cl[0];
52	ct.nitems = selectlen;
53	}
54	- XChangeProperty(r->Xdisplay, rq->requestor, rq->property,
55	+ XChangeProperty(r->Xdisplay, rq->requestor, property,
56	target, 8, PropModeReplace,
57	ct.value, (int)ct.nitems);
58	- ev.property = rq->property;
59	+ ev.property = property;
60	#ifdef USE_XIM
61	if (freect)
62	XFree(ct.value);

Removed Link Here

(-)a/x11/xvt/files/patch-src_logging.c (-50 lines)
1	--- src/logging.c.orig 2014-12-09 13:47:18.000000000 -0800
2	+++ src/logging.c 2014-12-09 13:47:35.000000000 -0800
3	@@ -82,7 +82,8 @@
4	else if (sscanf(pty, "pts/%d", &i) == 1)
5	sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
6	#endif
7	- else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
8	+ else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
9	+ STRNCMP(pty, "pts/", 4)) {
10	xvt_print_error("can't parse tty name \"%s\"", pty);
11	return;
12	}
13	@@ -137,7 +138,9 @@
14	STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
15	sizeof(utx->ut_user));
16	STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
17	+#if 0
18	utx->ut_session = getsid(0);
19	+#endif
20	utx->ut_tv.tv_sec = time(NULL);
21	utx->ut_tv.tv_usec = 0;
22	utx->ut_pid = r->h->cmd_pid;
23	@@ -202,7 +205,7 @@
24	xvt_update_wtmp(XVT_WTMP_FILE, ut);
25	# endif
26	# endif
27	-# ifdef HAVE_STRUCT_UTMPX
28	+# if 0
29	updwtmpx(XVT_WTMPX_FILE, utx);
30	# endif
31	}
32	@@ -254,7 +257,9 @@
33	if ((tmputx = getutxid(utx))) /* position to entry in utmp file */
34	utx = tmputx;
35	utx->ut_type = DEAD_PROCESS;
36	+#if 0
37	utx->ut_session = getsid(0);
38	+#endif
39	utx->ut_tv.tv_sec = time(NULL);
40	utx->ut_tv.tv_usec = 0;
41	#endif
42	@@ -274,7 +279,7 @@
43	xvt_update_wtmp(XVT_WTMP_FILE, ut);
44	# endif
45	# endif
46	-# ifdef HAVE_STRUCT_UTMPX
47	+# if 0
48	updwtmpx(XVT_WTMPX_FILE, utx);
49	# endif
50	}