git: c446a9e1d89e - main - x11/xvt: Update to 3.0.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 23 Feb 2024 09:00:23 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c446a9e1d89e4211558b0004c910ff3cc9187fec
commit c446a9e1d89e4211558b0004c910ff3cc9187fec
Author: Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2024-02-23 08:51:51 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-02-23 08:59:26 +0000
x11/xvt: Update to 3.0.6
PR: 276387
---
x11/xvt/Makefile | 82 ++++++++++++----------
x11/xvt/distinfo | 5 +-
x11/xvt/files/patch-Makefile.in | 30 +++-----
...onf__config.h.in => patch-autoconf_config.h.in} | 4 +-
...atch-doc__Makefile.in => patch-doc_Makefile.in} | 6 +-
x11/xvt/files/patch-src__command.c | 11 ---
x11/xvt/files/patch-src__init.c | 22 ------
x11/xvt/files/patch-src__screen.c | 62 ----------------
x11/xvt/files/patch-src__xvt.h | 11 ---
x11/xvt/files/patch-src_logging.c | 50 -------------
x11/xvt/pkg-plist | 2 +-
11 files changed, 64 insertions(+), 221 deletions(-)
diff --git a/x11/xvt/Makefile b/x11/xvt/Makefile
index 3ce0b94af06b..0a69e79a73bc 100644
--- a/x11/xvt/Makefile
+++ b/x11/xvt/Makefile
@@ -1,34 +1,35 @@
PORTNAME= xvt
-PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTVERSION= 3.0.6
CATEGORIES+= x11
-MASTER_SITES= https://BSDforge.com/projects/source/x11/xvt/
+MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= portmaster@BSDforge.com
COMMENT= Xterm replacement, supporting color, transparency, and more, with less
-WWW= https://BSDforge.com/projects/x11/xvt/
+WWW= https://codeberg.org/BSDforge/xvt/
LICENSE= BSD2CLAUSE GPLv2
LICENSE_COMB= multi
-DEPRECATED= Deprecated in favour of various forks, consider using x11/rxvt-unicode
-EXPIRATION_DATE=2024-02-29
-
-PORTDOCS= xvt.1.html xvtRef.html xvtRef.txt
-
-USES= libtool perl5 tar:xz xorg
+USES= libtool perl5 xorg
USE_LDCONFIG= yes
USE_PERL5= build patch
USE_XORG= x11 xpm
GNU_CONFIGURE= yes
-DESKTOP_ENTRIES= "xvt" "xvt terminal emulator" \
+PORTDOCS= README.xvt xvt.1.html xvtRef.html xvtRef.txt
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
+DESKTOP_ENTRIES= "xvt" \
+ "xvt terminal emulator" \
"${PREFIX}/share/pixmaps/xvt.png" \
- "xvt" "GNOME;X-XFCE;X-Xfce-Toplevel;System;Utility;TerminalEmulator;" \
+ "xvt" \
+ "GNOME;X-XFCE;X-Xfce-Toplevel;System;Utility;TerminalEmulator;" \
false
-OPTIONS_DEFINE= 256_COLOR BIG5 EUCJ GB GREEK KR LINESPACE MENUBAR NEXT XVT \
- SJIS SMART TRANSPARENCY XIM XTERM DOCS XGETDEFAULT
+OPTIONS_DEFINE= 256_COLOR BIG5 DOCS EUCJ GB GREEK KR LINESPACE MENUBAR NEXT \
+ SJIS SMART TRANSPARENCY XGETDEFAULT XIM XTERM XVT
+OPTIONS_DEFAULT= 256_COLOR DOCS GB LINESPACE MENUBAR NEXT SMART \
+ TRANSPARENCY XIM XTERM XVT
256_COLOR_DESC= Build with 256-color support
BIG5_DESC= Build with BIG5 support
@@ -47,47 +48,52 @@ XIM_DESC= Build with XIM support
XTERM_DESC= Build with Xterm scrollbar
XGETDEFAULT_DESC= Build with resources checking via XGetDefault
-OPTIONS_DEFAULT=256_COLOR GB LINESPACE MENUBAR NEXT XVT SMART TRANSPARENCY \
- XIM XTERM DOCS
-
-CONFIGURE_ARGS= --enable-utmp --enable-lastlog \
- --with-xpm --enable-xpm-background --enable-shared \
- --enable-mousewheel --disable-languages \
- --disable-wtmp
+CONFIGURE_ARGS= --disable-wtmp \
+ --enable-lastlog \
+ --enable-mousewheel \
+ --enable-shared \
+ --enable-utmp \
+ --enable-xpm-background \
+ --with-xpm
LIBS+= -lutil
# enable 256 color
-256_COLOR_CONFIGURE_ON= --enable-256-color
+256_COLOR_CONFIGURE_ENABLE= --enable-256-color
# enable big5 support
-BIG5_CONFIGURE_ON= --with-encoding=big5 --enable-languages
+BIG5_CONFIGURE_ENABLE= --enable-languages \
+ --with-encoding=big5
# enable euc japanese support
-EUCJ_CONFIGURE_ON= --with-encoding=eucj --enable-languages
+EUCJ_CONFIGURE_ENABLE= --enable-languages \
+ --with-encoding=eucj
# enable gb support
-GB_CONFIGURE_ON= --with-encoding=gb --enable-languages
+GB_CONFIGURE_ENABLE= --enable-languages \
+ --with-encoding=gb
# enable greek keyboard support
-GREEK_CONFIGURE_ON= --enable-greek
+GREEK_CONFIGURE_ENABLE= --enable-greek
# enable euc korean support
-KR_CONFIGURE_ON= --with-encoding=kr --enable-languages
+KR_CONFIGURE_ENABLE= --enable-languages \
+ --with-encoding=kr
# enable line-spacing
-LINESPACE_CONFIGURE_ON= --enable-linespace
+LINESPACE_CONFIGURE_ENABLE= --enable-linespace
# enable menubar
-MENUBAR_CONFIGURE_ON= --enable-menubar
+MENUBAR_CONFIGURE_ON= --enable-menubar
# enable NeXT style scrollbar
-NEXT_CONFIGURE_ON= --enable-next-scroll
+NEXT_CONFIGURE_ENABLE= --enable-next-scroll
# enable xvt style scrollbar
-XVT_CONFIGURE_ON= --enable-xvt-scroll
+XVT_CONFIGURE_ENABLE= --enable-xvt-scroll
# enable shift jis support
-SJIS_CONFIGURE_ON= --with-encoding=sjis --enable-languages
+SJIS_CONFIGURE_ENABLE= --enable-languages \
+ --with-encoding=sjis
# enable smart resize
-SMART_CONFIGURE_ON= --enable-smart-resize
+SMART_CONFIGURE_ENABLE= --enable-smart-resize
# enable transparency support
-TRANSPARENCY_CONFIGURE_ON= --enable-transparency
+TRANSPARENCY_CONFIGURE_ENABLE= --enable-transparency
# XIM (X Input Method) protocol support
-XIM_CONFIGURE_ON= --enable-xim
+XIM_CONFIGURE_ENABLE= --enable-xim
# enable Xterm style scrollbar
-XTERM_CONFIGURE_ON= --enable-xterm-scroll
+XTERM_CONFIGURE_ENABLE= --enable-xterm-scroll
# make resources checking via XGetDefault
-XGETDEFAULT_CONFIGURE_ON= --enable-xgetdefault
+XGETDEFAULT_CONFIGURE_ENABLE= --enable-xgetdefault
post-patch:
@${PERL} -pi -e 's|(PTYCHAR2\s+"[^"]+)"|\1ghijklmnopqrstuv"|' \
diff --git a/x11/xvt/distinfo b/x11/xvt/distinfo
index fdab06afb482..903da0825cab 100644
--- a/x11/xvt/distinfo
+++ b/x11/xvt/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xvt-3.0.1.tar.xz) = f218db092449eb183de540f6500aefbcca6f8f4e3a40110c728e578c27593e6d
-SIZE (xvt-3.0.1.tar.xz) = 431296
+TIMESTAMP = 1708633938
+SHA256 (xvt-3.0.6.tar.gz) = c9eafb999841bc8843bd6fde2a100328f703106a4e06d4f6ece708760b4919ed
+SIZE (xvt-3.0.6.tar.gz) = 609999
diff --git a/x11/xvt/files/patch-Makefile.in b/x11/xvt/files/patch-Makefile.in
index f07f98d8a4d8..c47d8faebb76 100644
--- a/x11/xvt/files/patch-Makefile.in
+++ b/x11/xvt/files/patch-Makefile.in
@@ -1,19 +1,11 @@
-*** Makefile.in.orig Sat Aug 9 15:44:33 2003
---- Makefile.in Sat Aug 9 15:44:39 2003
-***************
-*** 9,15 ****
- first_rule: all
- dummy:
-
-! subdirs = src doc rclock src/graphics src/test
- allsubdirs = W11 $(subdirs)
-
- DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
---- 9,15 ----
- first_rule: all
- dummy:
-
-! subdirs = src doc #rclock src/graphics src/test
- allsubdirs = W11 $(subdirs)
-
- DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
+--- Makefile.in.orig 2024-02-21 00:18:50 UTC
++++ Makefile.in
+@@ -9,7 +9,7 @@ dummy:
+ first_rule: all
+ dummy:
+
+-subdirs = src doc rclock src/graphics src/test
++subdirs = src doc #rclock src/graphics src/test
+ allsubdirs = W11 $(subdirs)
+
+ DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
diff --git a/x11/xvt/files/patch-autoconf__config.h.in b/x11/xvt/files/patch-autoconf_config.h.in
similarity index 74%
rename from x11/xvt/files/patch-autoconf__config.h.in
rename to x11/xvt/files/patch-autoconf_config.h.in
index 608333139701..50bdd38c6db2 100644
--- a/x11/xvt/files/patch-autoconf__config.h.in
+++ b/x11/xvt/files/patch-autoconf_config.h.in
@@ -1,5 +1,5 @@
---- autoconf/config.h.in.orig 2014-12-09 14:01:13.000000000 -0800
-+++ autoconf/config.h.in 2014-12-09 14:01:19.000000000 -0800
+--- autoconf/config.h.in.orig 2024-02-21 00:18:50 UTC
++++ autoconf/config.h.in
@@ -313,13 +313,13 @@
#undef XVT_UTMPX_FILE
diff --git a/x11/xvt/files/patch-doc__Makefile.in b/x11/xvt/files/patch-doc_Makefile.in
similarity index 70%
rename from x11/xvt/files/patch-doc__Makefile.in
rename to x11/xvt/files/patch-doc_Makefile.in
index 48c390baf015..49075e2bedee 100644
--- a/x11/xvt/files/patch-doc__Makefile.in
+++ b/x11/xvt/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig 2014-12-09 14:08:52.000000000 -0800
-+++ doc/Makefile.in 2014-12-09 14:08:56.000000000 -0800
-@@ -40,9 +40,6 @@
+--- doc/Makefile.in.orig 2024-02-21 00:18:50 UTC
++++ doc/Makefile.in
+@@ -40,9 +40,6 @@ all: xvt.1
all: xvt.1
diff --git a/x11/xvt/files/patch-src__command.c b/x11/xvt/files/patch-src__command.c
deleted file mode 100644
index 995854c0449b..000000000000
--- a/x11/xvt/files/patch-src__command.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/command.c.orig 2014-12-09 12:06:57.000000000 -0800
-+++ src/command.c 2014-12-09 12:07:41.000000000 -0800
-@@ -3098,7 +3098,7 @@
- unsigned char buf[256];
-
- va_start(arg_ptr, fmt);
-- vsprintf((char *)buf, fmt, arg_ptr);
-+ vsnprintf((char *)buf, sizeof(buf), fmt, arg_ptr);
- va_end(arg_ptr);
- xvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
- }
diff --git a/x11/xvt/files/patch-src__init.c b/x11/xvt/files/patch-src__init.c
deleted file mode 100644
index 85febc23474e..000000000000
--- a/x11/xvt/files/patch-src__init.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
diff --git a/x11/xvt/files/patch-src__screen.c b/x11/xvt/files/patch-src__screen.c
deleted file mode 100644
index c79e5c5e107c..000000000000
--- a/x11/xvt/files/patch-src__screen.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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);
diff --git a/x11/xvt/files/patch-src__xvt.h b/x11/xvt/files/patch-src__xvt.h
deleted file mode 100644
index dc899723fe6b..000000000000
--- a/x11/xvt/files/patch-src__xvt.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xvt.h.orig 2014-12-09 12:59:35.000000000 -0800
-+++ src/xvt.h 2014-12-09 12:59:39.000000000 -0800
-@@ -804,7 +804,7 @@
- #define xvt_Gr_ButtonRelease(x,y) xvt_Gr_ButtonReport (r, 'R',(x),(y))
-
- #ifdef UTMP_SUPPORT
--# if !defined(XVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
-+# if !defined(HAVE_STRUCT_UTMPX)
- # undef HAVE_UTMPX_H
- # undef HAVE_STRUCT_UTMPX
- # endif
diff --git a/x11/xvt/files/patch-src_logging.c b/x11/xvt/files/patch-src_logging.c
deleted file mode 100644
index ec071a168302..000000000000
--- a/x11/xvt/files/patch-src_logging.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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
- }
diff --git a/x11/xvt/pkg-plist b/x11/xvt/pkg-plist
index 85b43a5075a8..5221b9e25a6b 100644
--- a/x11/xvt/pkg-plist
+++ b/x11/xvt/pkg-plist
@@ -1,6 +1,6 @@
@mode 4711
bin/xvt
-bin/xvt-3.0.1
+bin/xvt-3.0.6
@mode
include/xvtlib.h
lib/libxvt.a