CVS commit: pkgsrc/x11/rxvt

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/rxvt
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Mon, 20 Oct 2025 18:32:11 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Oct 20 18:32:10 UTC 2025

Modified Files:
        pkgsrc/x11/rxvt: Makefile PLIST distinfo
        pkgsrc/x11/rxvt/patches: patch-aa patch-ab patch-ac patch-ad patch-ae
            patch-af patch-ag patch-ah patch-aj patch-ak patch-al patch-am
            patch-src_command.c patch-src_rxvt.h
Added Files:
        pkgsrc/x11/rxvt/files: rxvt.desktop
        pkgsrc/x11/rxvt/patches: patch-src_feature.h

Log Message:
x11/rxvt: fix build with GCC14

Fix a number of warnings to allow it to compile with recent compilers.
Tested with NetBSD 10.1 and pkgsrc's GCC14.
Revision bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/x11/rxvt/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/rxvt/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/rxvt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/rxvt/files/rxvt.desktop
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/rxvt/patches/patch-aa \
    pkgsrc/x11/rxvt/patches/patch-af
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/rxvt/patches/patch-ab \
    pkgsrc/x11/rxvt/patches/patch-ac
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/rxvt/patches/patch-ad \
    pkgsrc/x11/rxvt/patches/patch-ag
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/rxvt/patches/patch-ae
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/rxvt/patches/patch-ah
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/rxvt/patches/patch-aj \
    pkgsrc/x11/rxvt/patches/patch-al pkgsrc/x11/rxvt/patches/patch-am \
    pkgsrc/x11/rxvt/patches/patch-src_rxvt.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/rxvt/patches/patch-ak
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/rxvt/patches/patch-src_command.c
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/rxvt/patches/patch-src_feature.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/rxvt/Makefile
diff -u pkgsrc/x11/rxvt/Makefile:1.68 pkgsrc/x11/rxvt/Makefile:1.69
--- pkgsrc/x11/rxvt/Makefile:1.68       Sat Oct 11 10:18:32 2025
+++ pkgsrc/x11/rxvt/Makefile    Mon Oct 20 18:32:10 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2025/10/11 10:18:32 martin Exp $
+# $NetBSD: Makefile,v 1.69 2025/10/20 18:32:10 vins Exp $
 
 DISTNAME=              rxvt-2.7.10
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rxvt/}
 
@@ -12,6 +12,10 @@ LICENSE=             gnu-gpl-v2
 
 GNU_CONFIGURE=         YES
 
+BUILD_DEFS+=           VARBASE
+
+USE_TOOLS+=            grep tbl
+
 CONFIGURE_ARGS+=       --enable-utmp \
                        --enable-wtmp \
                        --enable-lastlog \
@@ -37,6 +41,12 @@ CONFIGURE_ARGS+=     --enable-utmp \
 CONFIGURE_ARGS+=       --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include/X11
 CONFIGURE_ARGS+=       --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths+=    src/feature.h src/logging.h src/rxvt.h
+SUBST_VARS.paths=      PREFIX VARBASE
+SUBST_MESSAGE.paths=   Replacing path placeholders.
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin"
@@ -51,23 +61,18 @@ CFLAGS.SunOS+=      -DSunOS
 # Make sure _NETBSD_SOURCE is defined for updlastlogx
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-14.*) || !empty(CC_VERSION:Mgcc-15.*)
-CFLAGS+=       -Wno-implicit-function-declaration -Wno-implicit-int
-.endif
-
-post-patch:
-       ${MV} ${WRKSRC}/src/feature.h  ${WRKSRC}/src/feature.h.orig
-       ${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \
-               -e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:"
-
 EGDIR=                 share/examples/${PKGBASE}
-INSTALLATION_DIRS+=    ${EGDIR}/app-defaults
-CONF_FILES+=           ${EGDIR}/app-defaults/Rxvt ${PREFIX}/lib/X11/app-defaults/Rxvt
+INSTALLATION_DIRS+=    ${EGDIR}/app-defaults share/applications
+CONF_FILES+=           ${EGDIR}/app-defaults/Rxvt      \
+                       ${PREFIX}/lib/X11/app-defaults/Rxvt
 
 post-install:
-       ${INSTALL_DATA} ${FILESDIR}/Rxvt ${DESTDIR}${PREFIX}/${EGDIR}/app-defaults
+       ${INSTALL_DATA} ${FILESDIR}/Rxvt                \
+               ${DESTDIR}${PREFIX}/${EGDIR}/app-defaults
+       ${INSTALL_DATA} ${FILESDIR}/rxvt.desktop        \
+               ${DESTDIR}${PREFIX}/share/applications
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/rxvt/PLIST
diff -u pkgsrc/x11/rxvt/PLIST:1.5 pkgsrc/x11/rxvt/PLIST:1.6
--- pkgsrc/x11/rxvt/PLIST:1.5   Wed Nov 24 06:55:41 2021
+++ pkgsrc/x11/rxvt/PLIST       Mon Oct 20 18:32:10 2025
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2021/11/24 06:55:41 pho Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/10/20 18:32:10 vins Exp $
 bin/rxvt
 man/man1/rxvt.1
+share/applications/rxvt.desktop
 share/examples/rxvt/app-defaults/Rxvt
 @pkgdir lib
 @pkgdir include

Index: pkgsrc/x11/rxvt/distinfo
diff -u pkgsrc/x11/rxvt/distinfo:1.29 pkgsrc/x11/rxvt/distinfo:1.30
--- pkgsrc/x11/rxvt/distinfo:1.29       Tue Oct 26 11:34:27 2021
+++ pkgsrc/x11/rxvt/distinfo    Mon Oct 20 18:32:10 2025
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 11:34:27 nia Exp $
+$NetBSD: distinfo,v 1.30 2025/10/20 18:32:10 vins Exp $
 
 BLAKE2s (rxvt-2.7.10.tar.gz) = 94d059d70b764459a4d9e4310790d029f3a3489afa2f641c2f5aa4c41f88792d
 SHA512 (rxvt-2.7.10.tar.gz) = cff86c2f94c533d906b412a949fe754726a0c67d87534b8f9794080898aa20744ee5de6f9109e9de1db14291cb6de7c1c4c1944ec9192e4ea42b0a3fe598b2a1
 Size (rxvt-2.7.10.tar.gz) = 595073 bytes
-SHA1 (patch-aa) = 11656b4c2d9e22055d203669b588b626079aa320
-SHA1 (patch-ab) = 62ef5b28f8842b769829fed0d217a9c54f48c832
-SHA1 (patch-ac) = 57e55b689dbdbc40008a65147d830b4a00611b9d
-SHA1 (patch-ad) = 86047c69fa397d71f3e71ae476bd7addd153729f
-SHA1 (patch-ae) = 76221e9b3cd35a0f40fb6128e0bf9d74d232d907
-SHA1 (patch-af) = 6a4f5cf91bc449f7ecef51695be278074e603c8b
-SHA1 (patch-ag) = 11019ed97892c8bd8834c56433573719892336c4
-SHA1 (patch-ah) = 5e6fcf6b4b4fe1111b97d0b916501ab5855a755a
-SHA1 (patch-aj) = 43ca25f034e6160f3a3dabbf1488df31cdecf95b
-SHA1 (patch-ak) = 83f7ffcf91d671bd8e75e5c063fd1336c0e08ed6
-SHA1 (patch-al) = 7107ec12205d0a5011a5828f8d30fbd577de41b7
-SHA1 (patch-am) = db69ba3b6754454613aa4aec61c1b033d7e013ae
-SHA1 (patch-src_command.c) = 50a7e36e97232af7bfc92e3e41b73e4c88e1605b
-SHA1 (patch-src_rxvt.h) = 86db6ffc24f1133771b6e94275a9edab07b97437
+SHA1 (patch-aa) = 45b158d92a232929212517ecedf1d00e42fc9d21
+SHA1 (patch-ab) = 832d24e2f9d6d3279e1bec10e4a540fa86f03231
+SHA1 (patch-ac) = a0913e56217f52d9b42e1d2d06852755c3e8d981
+SHA1 (patch-ad) = 433b4319a4e0e03075166e537f2d96fe1cb0c992
+SHA1 (patch-ae) = 66fcd0de76e1b926b1142a9ea859cf4e8c88eb26
+SHA1 (patch-af) = b73fc6b18741d5d73ecafa5360dcfcd9c6751b2c
+SHA1 (patch-ag) = 1ee04d95d656fcefe326604a8472d75f2a76998b
+SHA1 (patch-ah) = 21175cfb935932a4ac7c31970e37f0c3d92fba51
+SHA1 (patch-aj) = 1340c62cf6d869de803bde78b621683fb4167fb0
+SHA1 (patch-ak) = b21fe83ab42fdff2cf52cb25a933350c0b1d7902
+SHA1 (patch-al) = b36ec2e7fd40500a1cc0c5912a4043d6a33c3c00
+SHA1 (patch-am) = 9d99279b8f6d1e11777b8c9cfbc569cc95c2cd9f
+SHA1 (patch-src_command.c) = 6433f4fea5946c58af8f11ed96ec693982f9e344
+SHA1 (patch-src_feature.h) = e594de7b1ead0cab250dea5f6c3ffd7ca2722bec
+SHA1 (patch-src_rxvt.h) = a1c5e326e554d89a0f2f9d5aa81151d4fbd8a485

Index: pkgsrc/x11/rxvt/patches/patch-aa
diff -u pkgsrc/x11/rxvt/patches/patch-aa:1.9 pkgsrc/x11/rxvt/patches/patch-aa:1.10
--- pkgsrc/x11/rxvt/patches/patch-aa:1.9        Fri Mar 28 12:28:17 2003
+++ pkgsrc/x11/rxvt/patches/patch-aa    Mon Oct 20 18:32:10 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2003/03/28 12:28:17 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2025/10/20 18:32:10 vins Exp $
+
+Build RXVt only. 
 
 --- Makefile.in.~1~    2003-03-07 13:24:32.000000000 +1100
 +++ Makefile.in        2003-03-28 22:22:19.000000000 +1100
Index: pkgsrc/x11/rxvt/patches/patch-af
diff -u pkgsrc/x11/rxvt/patches/patch-af:1.9 pkgsrc/x11/rxvt/patches/patch-af:1.10
--- pkgsrc/x11/rxvt/patches/patch-af:1.9        Wed Sep 15 18:29:20 2004
+++ pkgsrc/x11/rxvt/patches/patch-af    Mon Oct 20 18:32:10 2025
@@ -1,6 +1,11 @@
-$NetBSD: patch-af,v 1.9 2004/09/15 18:29:20 minskim Exp $
+$NetBSD: patch-af,v 1.10 2025/10/20 18:32:10 vins Exp $
 
---- configure.orig     Wed Mar 26 00:07:26 2003
+* Add check for stropts.h header and updwtmpx func. 
+* Add check for ut_session in struct utmpx.
+* Fix broken Xlocale support
+* Use posix_openpt() to avoid GNUisms. 
+
+--- configure.orig     2003-03-26 06:07:26.000000000 +0000
 +++ configure
 @@ -9481,6 +9481,7 @@ fi
  
@@ -26,13 +31,10 @@ $NetBSD: patch-af,v 1.9 2004/09/15 18:29
        ttyslot \
  
  do
-@@ -13577,6 +13580,67 @@ if test x$rxvt_cv_struct_utmpx_host = xy
+@@ -13580,6 +13583,67 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_UTMPX_HOST 1
-+_ACEOF
-+
-+fi
+ fi
 +echo "$as_me:$LINENO: checking for session in utmpx struct" >&5
 +echo $ECHO_N "checking for session in utmpx struct... $ECHO_C" >&6
 +if test "${rxvt_cv_struct_utmpx_session+set}" = set; then
@@ -91,6 +93,40 @@ $NetBSD: patch-af,v 1.9 2004/09/15 18:29
 +
 +cat >>confdefs.h <<\_ACEOF
 +#define HAVE_UTMPX_SESSION 1
- _ACEOF
++_ACEOF
++
++fi
  
  fi
+ 
+@@ -14233,8 +14297,9 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+-main() {
++int main() {
+ char *p;
+ if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
+ exit (XSupportsLocale() ? 0 : 1);
+@@ -14433,8 +14498,8 @@ _ACEOF
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for getpt" >&5
+-echo $ECHO_N "checking for getpt... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for posix_openpt" >&5
++echo $ECHO_N "checking for posix_openpt... $ECHO_C" >&6
+ if test "${rxvt_cv_func_getpt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14452,7 +14517,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-(void)getpt();
++(void)posix_openpt(0);
+   ;
+   return 0;
+ }

Index: pkgsrc/x11/rxvt/patches/patch-ab
diff -u pkgsrc/x11/rxvt/patches/patch-ab:1.8 pkgsrc/x11/rxvt/patches/patch-ab:1.9
--- pkgsrc/x11/rxvt/patches/patch-ab:1.8        Thu Mar 27 07:14:50 2003
+++ pkgsrc/x11/rxvt/patches/patch-ab    Mon Oct 20 18:32:10 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2003/03/27 07:14:50 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2025/10/20 18:32:10 vins Exp $
+
+Remove versioning suffixes from rxvt binary.
 
 --- src/Makefile.in.org        2001-11-30 14:22:56.000000000 +1100
 +++ src/Makefile.in    2003-03-27 13:09:53.000000000 +1100
Index: pkgsrc/x11/rxvt/patches/patch-ac
diff -u pkgsrc/x11/rxvt/patches/patch-ac:1.8 pkgsrc/x11/rxvt/patches/patch-ac:1.9
--- pkgsrc/x11/rxvt/patches/patch-ac:1.8        Wed Sep 15 18:29:20 2004
+++ pkgsrc/x11/rxvt/patches/patch-ac    Mon Oct 20 18:32:10 2025
@@ -1,6 +1,9 @@
-$NetBSD: patch-ac,v 1.8 2004/09/15 18:29:20 minskim Exp $
+$NetBSD: patch-ac,v 1.9 2025/10/20 18:32:10 vins Exp $
 
---- autoconf/configure.in.orig Thu Mar  6 20:32:27 2003
+* Check for stropts.h header and updwtmpx func.
+* Check for ut_session in struct utmpx.
+
+--- autoconf/configure.in.orig 2003-03-07 02:32:27.000000000 +0000
 +++ autoconf/configure.in
 @@ -393,6 +393,7 @@ AC_CHECK_HEADERS( \
        sys/ioctl.h \
@@ -18,11 +21,10 @@ $NetBSD: patch-ac,v 1.8 2004/09/15 18:29
        ttyslot \
  )
  dnl# Note: On NetBSD, openpty() exists in libutil.  Don't pull it in
-@@ -648,6 +650,14 @@ AC_CACHE_CHECK(for host in utmpx struct,
- rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)])
+@@ -649,6 +651,14 @@ rxvt_cv_struct_utmpx_host=yes, rxvt_cv_s
  if test x$rxvt_cv_struct_utmpx_host = xyes; then
    AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
-+fi
+ fi
 +AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
 +[AC_TRY_COMPILE([#include <sys/types.h>
 +#include <utmpx.h>],
@@ -30,6 +32,7 @@ $NetBSD: patch-ac,v 1.8 2004/09/15 18:29
 +rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
 +if test x$rxvt_cv_struct_utmpx_session = xyes; then
 +  AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
- fi
++fi
  ) dnl# AC_CHECK_HEADER(utmpx.h
  
+ 

Index: pkgsrc/x11/rxvt/patches/patch-ad
diff -u pkgsrc/x11/rxvt/patches/patch-ad:1.4 pkgsrc/x11/rxvt/patches/patch-ad:1.5
--- pkgsrc/x11/rxvt/patches/patch-ad:1.4        Wed Aug 30 00:01:05 2000
+++ pkgsrc/x11/rxvt/patches/patch-ad    Mon Oct 20 18:32:10 2025
@@ -1,8 +1,19 @@
-$NetBSD: patch-ad,v 1.4 2000/08/30 00:01:05 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2025/10/20 18:32:10 vins Exp $
 
---- src/grkelot.c.orig Thu Jun  3 22:20:19 1999
-+++ src/grkelot.c      Wed Aug 16 03:07:26 2000
-@@ -81,10 +81,6 @@
+Prevent clash on u_* type definitions.
+
+--- src/grkelot.c.orig 2001-07-27 06:38:37.000000000 +0000
++++ src/grkelot.c
+@@ -76,15 +76,15 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++
+ /* --- Macros, Types --------- */
+ #define MAX_STATES    4       /* max # states for the FSM */
  #define MAX_SWITCHER  2U      /* per state */
  #define MAX_VAL       256     /* for temp allocation */
  
@@ -13,7 +24,7 @@ $NetBSD: patch-ad,v 1.4 2000/08/30 00:01
  typedef struct s_xlat {
      u_int           first, last;
      u_int          *pval;     /* array of translated values */
-@@ -159,9 +155,9 @@
+@@ -159,9 +159,9 @@ static XLAT_TYPE *xlat_now = &xlat_type[
  
  #define NUM_XLAT_TYPES        (sizeof(xlat_type) / sizeof(xlat_type[0]))
  
Index: pkgsrc/x11/rxvt/patches/patch-ag
diff -u pkgsrc/x11/rxvt/patches/patch-ag:1.4 pkgsrc/x11/rxvt/patches/patch-ag:1.5
--- pkgsrc/x11/rxvt/patches/patch-ag:1.4        Wed Sep 15 18:29:20 2004
+++ pkgsrc/x11/rxvt/patches/patch-ag    Mon Oct 20 18:32:10 2025
@@ -1,6 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2004/09/15 18:29:20 minskim Exp $
+$NetBSD: patch-ag,v 1.5 2025/10/20 18:32:10 vins Exp $
 
---- autoconf/config.h.in.orig  Wed Feb 19 18:35:55 2003
+Add definitions for stropts.h header and `updwtmpx' function.
+
+--- autoconf/config.h.in.orig  2003-02-20 00:35:55.000000000 +0000
 +++ autoconf/config.h.in
 @@ -123,6 +123,9 @@
  /* Define to 1 if you have the <sys/strredir.h> header file. */
@@ -12,7 +14,7 @@ $NetBSD: patch-ag,v 1.4 2004/09/15 18:29
  /* Define to 1 if you have the <sys/time.h> header file. */
  #undef HAVE_SYS_TIME_H
  
-@@ -150,11 +153,17 @@
+@@ -150,12 +153,18 @@
  /* Define to 1 if you have the `updwtmp' function. */
  #undef HAVE_UPDWTMP
  
@@ -24,9 +26,10 @@ $NetBSD: patch-ag,v 1.4 2004/09/15 18:29
  
  /* Define if struct utmpx contains ut_host */
  #undef HAVE_UTMPX_HOST
-+
+ 
 +/* Define if struct utmpx contains ut_session */
 +#undef HAVE_UTMPX_SESSION
- 
++
  /* Define to 1 if you have the <utmp.h> header file. */
  #undef HAVE_UTMP_H
+ 

Index: pkgsrc/x11/rxvt/patches/patch-ae
diff -u pkgsrc/x11/rxvt/patches/patch-ae:1.6 pkgsrc/x11/rxvt/patches/patch-ae:1.7
--- pkgsrc/x11/rxvt/patches/patch-ae:1.6        Fri Mar 28 10:55:22 2003
+++ pkgsrc/x11/rxvt/patches/patch-ae    Mon Oct 20 18:32:10 2025
@@ -1,8 +1,26 @@
-$NetBSD: patch-ae,v 1.6 2003/03/28 10:55:22 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2025/10/20 18:32:10 vins Exp $
 
---- src/logging.h.orig Tue Oct  1 06:33:47 2002
+* Check for lastlogx struct support.
+* Define RXVT_LASTLOGX_FILE.
+
+--- src/logging.h.orig 2002-10-01 04:33:47.000000000 +0000
 +++ src/logging.h
-@@ -31,4 +31,13 @@
+@@ -15,6 +15,14 @@
+ # endif
+ # include <pwd.h>
+ 
++#if defined(HAVE_STRUCT_LASTLOGX) && !defined(RXVT_LASTLOGX_FILE)
++# if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
++# define RXVT_LASTLOGX_FILE _PATH_LASTLOGX
++# else
++# define RXVT_LASTLOGX_FILE "@VARBASE@/log/lastlogx"
++# endif
++#endif
++
+ # ifdef RXVT_UTMP_SYSV
+ #  ifndef USER_PROCESS
+ #   define USER_PROCESS               7
+@@ -31,4 +39,13 @@
  
  #include "logging.intpro"             /* PROTOS for internal routines */
  #endif

Index: pkgsrc/x11/rxvt/patches/patch-ah
diff -u pkgsrc/x11/rxvt/patches/patch-ah:1.7 pkgsrc/x11/rxvt/patches/patch-ah:1.8
--- pkgsrc/x11/rxvt/patches/patch-ah:1.7        Wed Sep 15 17:55:53 2004
+++ pkgsrc/x11/rxvt/patches/patch-ah    Mon Oct 20 18:32:10 2025
@@ -1,6 +1,9 @@
-$NetBSD: patch-ah,v 1.7 2004/09/15 17:55:53 minskim Exp $
+$NetBSD: patch-ah,v 1.8 2025/10/20 18:32:10 vins Exp $
 
---- src/ptytty.c.orig  2002-09-19 02:40:39.000000000 -0500
+* Make sure stropts.h gets included.
+* Use posix_openpt() to avoid GNUisms.
+
+--- src/ptytty.c.orig  2002-09-19 07:40:39.000000000 +0000
 +++ src/ptytty.c
 @@ -46,7 +46,7 @@
  #ifdef HAVE_SYS_IOCTL_H
@@ -11,3 +14,12 @@ $NetBSD: patch-ah,v 1.7 2004/09/15 17:55
  # include <sys/stropts.h>      /* for I_PUSH */
  #endif
  
+@@ -102,7 +102,7 @@ rxvt_get_pty(int *fd_tty, const char **t
+       extern char    *ptsname();
+ 
+ #  ifdef PTYS_ARE_GETPT
+-      pfd = getpt();
++      pfd = posix_openpt(O_RDWR | O_NOCTTY);
+ #  else
+       pfd = open("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
+ #  endif

Index: pkgsrc/x11/rxvt/patches/patch-aj
diff -u pkgsrc/x11/rxvt/patches/patch-aj:1.1 pkgsrc/x11/rxvt/patches/patch-aj:1.2
--- pkgsrc/x11/rxvt/patches/patch-aj:1.1        Wed Sep 15 18:29:20 2004
+++ pkgsrc/x11/rxvt/patches/patch-aj    Mon Oct 20 18:32:10 2025
@@ -1,4 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2004/09/15 18:29:20 minskim Exp $
+$NetBSD: patch-aj,v 1.2 2025/10/20 18:32:10 vins Exp $
+
+* Bulid functions using struct utmp only when the struct utmp is
+  available
 
 --- src/logging.intpro.orig    Wed Mar 26 00:12:28 2003
 +++ src/logging.intpro
Index: pkgsrc/x11/rxvt/patches/patch-al
diff -u pkgsrc/x11/rxvt/patches/patch-al:1.1 pkgsrc/x11/rxvt/patches/patch-al:1.2
--- pkgsrc/x11/rxvt/patches/patch-al:1.1        Tue Jun 20 13:07:20 2006
+++ pkgsrc/x11/rxvt/patches/patch-al    Mon Oct 20 18:32:10 2025
@@ -1,7 +1,22 @@
-$NetBSD: patch-al,v 1.1 2006/06/20 13:07:20 martin Exp $
+$NetBSD: patch-al,v 1.2 2025/10/20 18:32:10 vins Exp $
 
---- src/screen.c.orig  2003-03-23 17:56:06.000000000 +0100
-+++ src/screen.c       2006-06-20 14:52:21.000000000 +0200
+* Fix 64-bit crash inside rxvt_selection_send().
+  See https://gnats.netbsd.org/33680
+
+--- src/screen.c.orig  2003-03-23 16:56:06.000000000 +0000
++++ src/screen.c
+@@ -3211,9 +3211,9 @@ rxvt_selection_adjust_kanji(rxvt_t *r)
+           && IS_MULTI1(r->screen.rend[r1][c1 - 1]))
+           r->selection.beg.col--;
+     }
+-    if (r->selection.end.col < r->TermWin.ncol) {
++    c1 = r->selection.end.col;
++    if (0 < c1 && c1 < r->TermWin.ncol) {
+       r1 = r->selection.end.row + r->TermWin.saveLines;
+-      c1 = r->selection.end.col;
+       if (IS_MULTI1(r->screen.rend[r1][c1 - 1])
+           && IS_MULTI2(r->screen.rend[r1][c1]))
+           r->selection.end.col++;
 @@ -3515,11 +3515,12 @@ rxvt_selection_send(rxvt_t *r, const XSe
  {
      XSelectionEvent ev;
Index: pkgsrc/x11/rxvt/patches/patch-am
diff -u pkgsrc/x11/rxvt/patches/patch-am:1.1 pkgsrc/x11/rxvt/patches/patch-am:1.2
--- pkgsrc/x11/rxvt/patches/patch-am:1.1        Thu Apr  3 22:33:00 2008
+++ pkgsrc/x11/rxvt/patches/patch-am    Mon Oct 20 18:32:10 2025
@@ -1,10 +1,19 @@
-$NetBSD: patch-am,v 1.1 2008/04/03 22:33:00 tonnerre Exp $
+$NetBSD: patch-am,v 1.2 2025/10/20 18:32:10 vins Exp $
 
-Remove the default display :0 (solves CVE-2008-1142)
+* Remove the default display :0 (solves CVE-2008-1142)
+* Replace deprecated XKeycodeToKeysym. 
 
---- src/init.c.orig    2002-12-04 06:21:39.000000000 +0100
+--- src/init.c.orig    2002-12-04 05:21:39.000000000 +0000
 +++ src/init.c
-@@ -532,14 +532,13 @@ rxvt_init_resources(rxvt_t *r, int argc,
+@@ -33,6 +33,7 @@
+ 
+ #include "../config.h"                /* NECESSARY */
+ #include "rxvt.h"             /* NECESSARY */
++#include <X11/XKBlib.h>               /* XKB */
+ #include "init.h"
+ 
+ #include <signal.h>
+@@ -532,14 +533,13 @@ rxvt_init_resources(rxvt_t *r, int argc,
  /*
   * Open display, get options/resources and create the window
   */
@@ -21,7 +30,7 @@ Remove the default display :0 (solves CV
        val = rxvt_malloc(5 + STRLEN(rs[Rs_display_name]));
        STRCPY(val, "unix");
        STRCAT(val, rs[Rs_display_name]);
-@@ -550,7 +549,9 @@ rxvt_init_resources(rxvt_t *r, int argc,
+@@ -550,7 +550,9 @@ rxvt_init_resources(rxvt_t *r, int argc,
  
      if (r->Xdisplay == NULL
        && (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) {
@@ -32,3 +41,12 @@ Remove the default display :0 (solves CV
        exit(EXIT_FAILURE);
      }
  
+@@ -1016,7 +1018,7 @@ rxvt_get_ourmods(rxvt_t *r)
+       for (j = map->max_keypermod; j--; k++) {
+           if (kc[k] == 0)
+               break;
+-          switch (XKeycodeToKeysym(r->Xdisplay, kc[k], 0)) {
++          switch (XkbKeycodeToKeysym(r->Xdisplay, kc[k], 0, 0)) {
+           case XK_Num_Lock:
+               r->h->ModNumLockMask = modmasks[i - 1];
+               /* FALLTHROUGH */
Index: pkgsrc/x11/rxvt/patches/patch-src_rxvt.h
diff -u pkgsrc/x11/rxvt/patches/patch-src_rxvt.h:1.1 pkgsrc/x11/rxvt/patches/patch-src_rxvt.h:1.2
--- pkgsrc/x11/rxvt/patches/patch-src_rxvt.h:1.1        Mon Jul  9 19:06:22 2012
+++ pkgsrc/x11/rxvt/patches/patch-src_rxvt.h    Mon Oct 20 18:32:10 2025
@@ -1,8 +1,38 @@
-$NetBSD: patch-src_rxvt.h,v 1.1 2012/07/09 19:06:22 joerg Exp $
+$NetBSD: patch-src_rxvt.h,v 1.2 2025/10/20 18:32:10 vins Exp $
 
---- src/rxvt.h.orig    2012-07-06 12:46:29.000000000 +0000
+* Rxvt UTMP log files are not defined elsewhere.
+* Ignore __attribute__ outside of GCC.
+
+--- src/rxvt.h.orig    2003-03-07 01:17:18.000000000 +0000
 +++ src/rxvt.h
-@@ -1097,8 +1097,9 @@ struct rxvt_hidden {
+@@ -804,15 +804,18 @@ enum {
+ #define rxvt_Gr_ButtonRelease(x,y)    rxvt_Gr_ButtonReport (r, 'R',(x),(y))
+ 
+ #ifdef UTMP_SUPPORT
+-# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
+-#  undef HAVE_UTMPX_H
+-#  undef HAVE_STRUCT_UTMPX
+-# endif
+-# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
+-#  undef HAVE_UTMP_H
+-#  undef HAVE_STRUCT_UTMP
++# if !defined(RXVT_UTMPX_FILE)
++#  define RXVT_UTMPX_FILE "@VARBASE@/log/utmpx" 
++# endif
++# if !defined(RXVT_UTMP_FILE) 
++#  define RXVT_UTMP_FILE "@VARBASE@/log/utmp"
++# endif
++# if !defined(RXVT_WTMPX_FILE) 
++#  define RXVT_WTMPX_FILE "@VARBASE@/log/wtmpx"
++# endif
++# if !defined(RXVT_WTMP_FILE) 
++#  define RXVT_WTMP_FILE "@VARBASE@/log/wtmp"
+ # endif
+-
+ # ifdef HAVE_UTMPX_H
+ #  include <utmpx.h>
+ # endif
+@@ -1097,8 +1100,9 @@ struct rxvt_hidden {
  #  if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
  #   define __attribute__(x)
  #  endif

Index: pkgsrc/x11/rxvt/patches/patch-ak
diff -u pkgsrc/x11/rxvt/patches/patch-ak:1.3 pkgsrc/x11/rxvt/patches/patch-ak:1.4
--- pkgsrc/x11/rxvt/patches/patch-ak:1.3        Mon Jul  9 19:06:22 2012
+++ pkgsrc/x11/rxvt/patches/patch-ak    Mon Oct 20 18:32:10 2025
@@ -1,29 +1,22 @@
-$NetBSD: patch-ak,v 1.3 2012/07/09 19:06:22 joerg Exp $
+$NetBSD: patch-ak,v 1.4 2025/10/20 18:32:10 vins Exp $
+
+* Try to get term name from terminal slaves.
+* Use ut_session only when it is available in struct utmpx.
+* If updwtmpx is not available, use pututxline instead.
 
 --- src/logging.c.orig 2002-12-16 00:33:04.000000000 +0000
 +++ src/logging.c
-@@ -66,9 +66,7 @@ rxvt_makeutent(rxvt_t *r, const char *pt
- #ifdef HAVE_STRUCT_UTMPX
-     struct utmpx   *utx = &(r->h->utx);
- #endif
--#ifdef HAVE_UTMP_PID
-     int             i;
--#endif
-     char            ut_id[5];
-     struct passwd  *pwent = getpwuid(getuid());
- 
-@@ -78,10 +76,8 @@ rxvt_makeutent(rxvt_t *r, const char *pt
-     if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) {
-       STRNCPY(ut_id, (pty + 3), sizeof(ut_id));
-     }
--#ifdef HAVE_UTMP_PID
+@@ -82,7 +82,8 @@ rxvt_makeutent(rxvt_t *r, const char *pt
      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)) {
+ #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)) {
        rxvt_print_error("can't parse tty name \"%s\"", pty);
        return;
-@@ -137,7 +133,9 @@ rxvt_makeutent(rxvt_t *r, const char *pt
+     }
+@@ -137,7 +138,9 @@ rxvt_makeutent(rxvt_t *r, const char *pt
      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));
@@ -33,7 +26,7 @@ $NetBSD: patch-ak,v 1.3 2012/07/09 19:06
      utx->ut_tv.tv_sec = time(NULL);
      utx->ut_tv.tv_usec = 0;
      utx->ut_pid = r->h->cmd_pid;
-@@ -203,7 +201,11 @@ rxvt_makeutent(rxvt_t *r, const char *pt
+@@ -203,7 +206,11 @@ rxvt_makeutent(rxvt_t *r, const char *pt
  #  endif
  # endif
  # ifdef HAVE_STRUCT_UTMPX
@@ -45,7 +38,7 @@ $NetBSD: patch-ak,v 1.3 2012/07/09 19:06
  # endif
      }
  #endif
-@@ -254,7 +256,9 @@ rxvt_cleanutent(rxvt_t *r)
+@@ -254,7 +261,9 @@ rxvt_cleanutent(rxvt_t *r)
      if ((tmputx = getutxid(utx)))     /* position to entry in utmp file */
        utx = tmputx;
      utx->ut_type = DEAD_PROCESS;
@@ -55,7 +48,7 @@ $NetBSD: patch-ak,v 1.3 2012/07/09 19:06
      utx->ut_tv.tv_sec = time(NULL);
      utx->ut_tv.tv_usec = 0;
  #endif
-@@ -275,7 +279,11 @@ rxvt_cleanutent(rxvt_t *r)
+@@ -275,7 +284,11 @@ rxvt_cleanutent(rxvt_t *r)
  #  endif
  # endif
  # ifdef HAVE_STRUCT_UTMPX
@@ -67,7 +60,7 @@ $NetBSD: patch-ak,v 1.3 2012/07/09 19:06
  # endif
      }
  #endif
-@@ -327,7 +335,7 @@ rxvt_write_bsd_utmp(int utmp_pos, struct
+@@ -327,7 +340,7 @@ rxvt_write_bsd_utmp(int utmp_pos, struct
  /*
   * Update a BSD style wtmp entry
   */

Index: pkgsrc/x11/rxvt/patches/patch-src_command.c
diff -u pkgsrc/x11/rxvt/patches/patch-src_command.c:1.2 pkgsrc/x11/rxvt/patches/patch-src_command.c:1.3
--- pkgsrc/x11/rxvt/patches/patch-src_command.c:1.2     Sun Sep 19 08:41:13 2021
+++ pkgsrc/x11/rxvt/patches/patch-src_command.c Mon Oct 20 18:32:10 2025
@@ -1,11 +1,33 @@
-$NetBSD: patch-src_command.c,v 1.2 2021/09/19 08:41:13 nia Exp $
+$NetBSD: patch-src_command.c,v 1.3 2025/10/20 18:32:10 vins Exp $
 
-* fix CVE-2021-33477
-* fix CVE-2017-7483
+* Fix CVE-2021-33477.
+* Fix CVE-2017-7483.
+* Prefer safer vsnprtinf().
+* Replace deprecated XKeycodeToKeysym.
 
 --- src/command.c.orig 2003-03-26 06:01:23.000000000 +0000
 +++ src/command.c
-@@ -1954,10 +1954,12 @@ rxvt_process_escape_seq(rxvt_t *r)
+@@ -45,6 +45,7 @@
+ 
+ /*{{{ includes: */
+ #include "../config.h"                /* NECESSARY */
++#include <X11/XKBlib.h>       /* XKB */
+ #include "rxvt.h"             /* NECESSARY */
+ #include "version.h"
+ #include "command.h"
+@@ -961,8 +962,9 @@ rxvt_process_x_event(rxvt_t *r, XEvent *
+               h->mouse_slip_wheel_speed = 0;
+           else {
+               KeySym          ks;
+-              
+-              ks = XKeycodeToKeysym(r->Xdisplay, ev->xkey.keycode, 0);
++
++              ks = XkbKeycodeToKeysym(r->Xdisplay, ev->xkey.keycode,
++                      0, ev->xkey.state & ControlMask ? 1 : 0);
+               if (ks == XK_Control_L || ks == XK_Control_R)
+                   h->mouse_slip_wheel_speed = 0;
+           }
+@@ -1954,10 +1956,12 @@ rxvt_process_escape_seq(rxvt_t *r)
        rxvt_scr_add_lines(r, (const unsigned char *)"\n\r", 1, 2);
        break;
  
@@ -18,7 +40,7 @@ $NetBSD: patch-src_command.c,v 1.2 2021/
  
      /* 8.3.63: CHARACTER TABULATION SET */
      case C1_HTS:              /* ESC H */
-@@ -2096,7 +2098,7 @@ rxvt_process_csi_seq(rxvt_t *r)
+@@ -2096,7 +2100,7 @@ rxvt_process_csi_seq(rxvt_t *r)
      i = ch - CSI_ICH;
      ndef = get_byte_array_bit(csi_defaults, i);
      for (p = 0; p < nargs; p++)
@@ -27,3 +49,12 @@ $NetBSD: patch-src_command.c,v 1.2 2021/
            arg[p] = ndef;
  
  #ifdef DEBUG_CMD
+@@ -3098,7 +3102,7 @@ rxvt_tt_printf(rxvt_t *r, const char *fm
+     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);
+     rxvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
+ }

Added files:

Index: pkgsrc/x11/rxvt/files/rxvt.desktop
diff -u /dev/null pkgsrc/x11/rxvt/files/rxvt.desktop:1.1
--- /dev/null   Mon Oct 20 18:32:11 2025
+++ pkgsrc/x11/rxvt/files/rxvt.desktop  Mon Oct 20 18:32:10 2025
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=RXvt
+GenericName=Terminal
+Comment=Virtual terminal emulator for X11
+Categories=System;Terminal;
+Exec=rxvt
+Icon=terminal
+Path=
+Type=Application
+Terminal=false

Index: pkgsrc/x11/rxvt/patches/patch-src_feature.h
diff -u /dev/null pkgsrc/x11/rxvt/patches/patch-src_feature.h:1.1
--- /dev/null   Mon Oct 20 18:32:11 2025
+++ pkgsrc/x11/rxvt/patches/patch-src_feature.h Mon Oct 20 18:32:10 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_feature.h,v 1.1 2025/10/20 18:32:10 vins Exp $
+
+pkgsrc PREFIX support.
+
+--- src/feature.h.orig 2002-04-09 00:49:38.000000000 +0000
++++ src/feature.h
+@@ -25,7 +25,7 @@
+ #define _FEATURE_H
+ 
+ #ifndef X11USRLIBDIR
+-# define X11USRLIBDIR         "/usr/X11R6/lib"
++# define X11USRLIBDIR         "@PREFIX@/lib"
+ #endif
+ #ifndef X11LIBDIR
+ # define X11LIBDIR            X11USRLIBDIR "/X11"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/scamper
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/scamper
Indexes:

Home | Main Index | Thread Index | Old Index