Re: CVS commit: pkgsrc/x11/rxvt

To: Martin Husemann <martin%duskware.de@localhost>
Subject: Re: CVS commit: pkgsrc/x11/rxvt
From: Paolo Vincenzo Olivo <vins%NetBSD.org@localhost>
Date: Sun, 19 Oct 2025 15:30:16 +0000
On 25/10/11 12:20PM, Martin Husemann wrote:
>
> > An alternative we've been doing in a couple packages is to add the
> > missing 'int' to the configure script.
>
> I started down that road but it becomes a bit involved (it is not only
> the default int but missing X and stdlib.h includes in other tests).
>
> Martin

(Sending this again with inline attachments, as apparently encoding got
messed up upon first attempt).

I decided to take a look at the package this morning, and attempt to
address  all the `Werror=implicit-declaration' and `Werror=implicit-int'
breakages. I also applied some additonal fixes and improvements, and
added missing patch comments.

The package now compiles successfully (NetBSD 10.1 + pkgsrc's GCC14)
without warning.

Diff for x11/rxvt and build log are attached below.

Ok to commit?

Regards,
Paolo

+----------------------------------------------------------------------

# rxvt.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile	11 Oct 2025 10:18:32 -0000	1.68
+++ Makefile	19 Oct 2025 11:21:05 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.68 2025/10/11 10:18:32 martin 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: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- PLIST	24 Nov 2021 06:55:41 -0000	1.5
+++ PLIST	19 Oct 2025 11:21:05 -0000
@@ -1,6 +1,7 @@
 @comment $NetBSD: PLIST,v 1.5 2021/11/24 06:55:41 pho Exp $
 bin/rxvt
 man/man1/rxvt.1
+share/applications/rxvt.desktop
 share/examples/rxvt/app-defaults/Rxvt
 @pkgdir lib
 @pkgdir include
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo	26 Oct 2021 11:34:27 -0000	1.29
+++ distinfo	19 Oct 2025 11:21:05 -0000
@@ -3,17 +3,18 @@ $NetBSD: distinfo,v 1.29 2021/10/26 11:3
 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: files/rxvt.desktop
===================================================================
RCS file: files/rxvt.desktop
diff -N files/rxvt.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/rxvt.desktop	19 Oct 2025 11:21:05 -0000
@@ -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: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-aa,v
retrieving revision 1.9
diff -u -p -r1.9 patch-aa
--- patches/patch-aa	28 Mar 2003 12:28:17 -0000	1.9
+++ patches/patch-aa	19 Oct 2025 11:21:12 -0000
@@ -1,5 +1,7 @@
 $NetBSD: patch-aa,v 1.9 2003/03/28 12:28:17 wiz 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
 @@ -9,7 +9,7 @@
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ab,v
retrieving revision 1.8
diff -u -p -r1.8 patch-ab
--- patches/patch-ab	27 Mar 2003 07:14:50 -0000	1.8
+++ patches/patch-ab	19 Oct 2025 11:21:12 -0000
@@ -1,5 +1,7 @@
 $NetBSD: patch-ab,v 1.8 2003/03/27 07:14:50 wiz 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
 @@ -138,10 +138,8 @@
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ac,v
retrieving revision 1.8
diff -u -p -r1.8 patch-ac
--- patches/patch-ac	15 Sep 2004 18:29:20 -0000	1.8
+++ patches/patch-ac	19 Oct 2025 11:21:12 -0000
@@ -1,6 +1,9 @@
 $NetBSD: patch-ac,v 1.8 2004/09/15 18:29:20 minskim 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: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ad,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ad
--- patches/patch-ad	30 Aug 2000 00:01:05 -0000	1.4
+++ patches/patch-ad	19 Oct 2025 11:21:12 -0000
@@ -1,8 +1,19 @@
 $NetBSD: patch-ad,v 1.4 2000/08/30 00:01:05 wiz 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: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ae,v
retrieving revision 1.6
diff -u -p -r1.6 patch-ae
--- patches/patch-ae	28 Mar 2003 10:55:22 -0000	1.6
+++ patches/patch-ae	19 Oct 2025 11:21:12 -0000
@@ -1,8 +1,26 @@
 $NetBSD: patch-ae,v 1.6 2003/03/28 10:55:22 wiz 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: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-af,v
retrieving revision 1.9
diff -u -p -r1.9 patch-af
--- patches/patch-af	15 Sep 2004 18:29:20 -0000	1.9
+++ patches/patch-af	19 Oct 2025 11:21:12 -0000
@@ -1,6 +1,11 @@
 $NetBSD: patch-af,v 1.9 2004/09/15 18:29:20 minskim 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: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ag,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ag
--- patches/patch-ag	15 Sep 2004 18:29:20 -0000	1.4
+++ patches/patch-ag	19 Oct 2025 11:21:12 -0000
@@ -1,6 +1,8 @@
 $NetBSD: patch-ag,v 1.4 2004/09/15 18:29:20 minskim 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: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ah,v
retrieving revision 1.7
diff -u -p -r1.7 patch-ah
--- patches/patch-ah	15 Sep 2004 17:55:53 -0000	1.7
+++ patches/patch-ah	19 Oct 2025 11:21:12 -0000
@@ -1,6 +1,9 @@
 $NetBSD: patch-ah,v 1.7 2004/09/15 17:55:53 minskim 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: patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-aj,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aj
--- patches/patch-aj	15 Sep 2004 18:29:20 -0000	1.1
+++ patches/patch-aj	19 Oct 2025 11:21:12 -0000
@@ -1,5 +1,8 @@
 $NetBSD: patch-aj,v 1.1 2004/09/15 18:29:20 minskim 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
 @@ -1,3 +1,5 @@
Index: patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-ak,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ak
--- patches/patch-ak	9 Jul 2012 19:06:22 -0000	1.3
+++ patches/patch-ak	19 Oct 2025 11:21:12 -0000
@@ -1,29 +1,22 @@
-$NetBSD: patch-ak,v 1.3 2012/07/09 19:06:22 joerg Exp $
+$NetBSD$
+
+* 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: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-al,v
retrieving revision 1.1
diff -u -p -r1.1 patch-al
--- patches/patch-al	20 Jun 2006 13:07:20 -0000	1.1
+++ patches/patch-al	19 Oct 2025 11:21:12 -0000
@@ -1,7 +1,22 @@
 $NetBSD: patch-al,v 1.1 2006/06/20 13:07:20 martin 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: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-am,v
retrieving revision 1.1
diff -u -p -r1.1 patch-am
--- patches/patch-am	3 Apr 2008 22:33:00 -0000	1.1
+++ patches/patch-am	19 Oct 2025 11:21:12 -0000
@@ -1,10 +1,19 @@
 $NetBSD: patch-am,v 1.1 2008/04/03 22:33:00 tonnerre 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: patches/patch-src_command.c
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-src_command.c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_command.c
--- patches/patch-src_command.c	19 Sep 2021 08:41:13 -0000	1.2
+++ patches/patch-src_command.c	19 Oct 2025 11:21:12 -0000
@@ -1,11 +1,33 @@
 $NetBSD: patch-src_command.c,v 1.2 2021/09/19 08:41:13 nia 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));
+ }
Index: patches/patch-src_feature.h
===================================================================
RCS file: patches/patch-src_feature.h
diff -N patches/patch-src_feature.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_feature.h	19 Oct 2025 11:21:12 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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"
Index: patches/patch-src_rxvt.h
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt/patches/patch-src_rxvt.h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_rxvt.h
--- patches/patch-src_rxvt.h	9 Jul 2012 19:06:22 -0000	1.1
+++ patches/patch-src_rxvt.h	19 Oct 2025 11:21:12 -0000
@@ -1,8 +1,38 @@
 $NetBSD: patch-src_rxvt.h,v 1.1 2012/07/09 19:06:22 joerg 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

+----------------------------------------------------------------------



+----------------------------------------------------------------------

# rxvt_build.log

=> Checksum BLAKE2s OK for rxvt-2.7.10.tar.gz
=> Checksum SHA512 OK for rxvt-2.7.10.tar.gz
===> Installing dependencies for rxvt-2.7.10nb11
==========================================================================
The following variables will affect the build process of this package,
rxvt-2.7.10nb11.  Their current value is shown below:

        * VARBASE = /var

You may want to abort the process now with CTRL-C and change the value
of variables in the first group before continuing.  Be sure to run
`/usr/pkg/bin/bmake clean' after the changes.
==========================================================================
=> Tool dependency cwrappers>=20150314: found cwrappers-20220403
=> Tool dependency checkperms>=1.1: found checkperms-1.12
=> Build dependency gcc14>=14.3.0: found gcc14-14.3.0nb1
=> Build dependency x11-links>=1.36: found x11-links-1.36
===> Checking for vulnerabilities in rxvt-2.7.10nb11
Package rxvt-2.7.10nb11 has reached end-of-life (eol), see http://cdn.NetBSD.org/pub/NetBSD/packages/vulns/eol-packages
===> Overriding tools for rxvt-2.7.10nb11
===> Extracting for rxvt-2.7.10nb11
===> Patching for rxvt-2.7.10nb11
=> Applying pkgsrc patches for rxvt-2.7.10nb11
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-aa
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-aa
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-aa,v 1.9 2003/03/28 12:28:17 wiz 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
--------------------------
Patching file Makefile.in using Plan A...
Hunk #1 succeeded at 9.
Hunk #2 succeeded at 25.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ab
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ab
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-ab,v 1.8 2003/03/27 07:14:50 wiz 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
--------------------------
Patching file src/Makefile.in using Plan A...
Hunk #1 succeeded at 138.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ac
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ac
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-ac,v 1.8 2004/09/15 18:29:20 minskim Exp $
|
|* 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
--------------------------
Patching file autoconf/configure.in using Plan A...
Hunk #1 succeeded at 393.
Hunk #2 succeeded at 589.
Hunk #3 succeeded at 651.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ad
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ad
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-ad,v 1.4 2000/08/30 00:01:05 wiz Exp $
|
|Prevent clash on u_* type definitions.
|
|--- src/grkelot.c.orig	2001-07-27 06:38:37.000000000 +0000
|+++ src/grkelot.c
--------------------------
Patching file src/grkelot.c using Plan A...
Hunk #1 succeeded at 76.
Hunk #2 succeeded at 159.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ae
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ae
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-ae,v 1.6 2003/03/28 10:55:22 wiz Exp $
|
|* Check for lastlogx struct support.
|* Define RXVT_LASTLOGX_FILE.
|
|--- src/logging.h.orig	2002-10-01 04:33:47.000000000 +0000
|+++ src/logging.h
--------------------------
Patching file src/logging.h using Plan A...
Hunk #1 succeeded at 15.
Hunk #2 succeeded at 39.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-af
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-af
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-af,v 1.9 2004/09/15 18:29:20 minskim Exp $
|
|* 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
--------------------------
Patching file configure using Plan A...
Hunk #1 succeeded at 9481.
Hunk #2 succeeded at 9497.
Hunk #3 succeeded at 12966.
Hunk #4 succeeded at 13583.
Hunk #5 succeeded at 14297.
Hunk #6 succeeded at 14498.
Hunk #7 succeeded at 14517.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ag
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ag
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-ag,v 1.4 2004/09/15 18:29:20 minskim Exp $
|
|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
--------------------------
Patching file autoconf/config.h.in using Plan A...
Hunk #1 succeeded at 123.
Hunk #2 succeeded at 153.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ah
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ah
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-ah,v 1.7 2004/09/15 17:55:53 minskim Exp $
|
|* 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
--------------------------
Patching file src/ptytty.c using Plan A...
Hunk #1 succeeded at 46.
Hunk #2 succeeded at 102.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-aj
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-aj
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-aj,v 1.1 2004/09/15 18:29:20 minskim 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
--------------------------
Patching file src/logging.intpro using Plan A...
Hunk #1 succeeded at 1.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-ak
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-ak
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD$
|
|* 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
--------------------------
Patching file src/logging.c using Plan A...
Hunk #1 succeeded at 82.
Hunk #2 succeeded at 138.
Hunk #3 succeeded at 206.
Hunk #4 succeeded at 261.
Hunk #5 succeeded at 284.
Hunk #6 succeeded at 340.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-al
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-al
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-al,v 1.1 2006/06/20 13:07:20 martin Exp $
|
|* 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
--------------------------
Patching file src/screen.c using Plan A...
Hunk #1 succeeded at 3211.
Hunk #2 succeeded at 3515.
Hunk #3 succeeded at 3541.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-am
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-am
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-am,v 1.1 2008/04/03 22:33:00 tonnerre Exp $
|
|* Remove the default display :0 (solves CVE-2008-1142)
|* Replace deprecated XKeycodeToKeysym. 
|
|--- src/init.c.orig	2002-12-04 05:21:39.000000000 +0000
|+++ src/init.c
--------------------------
Patching file src/init.c using Plan A...
Hunk #1 succeeded at 33.
Hunk #2 succeeded at 533.
Hunk #3 succeeded at 550.
Hunk #4 succeeded at 1018.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-src_command.c
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-src_command.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_command.c,v 1.2 2021/09/19 08:41:13 nia Exp $
|
|* 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
--------------------------
Patching file src/command.c using Plan A...
Hunk #1 succeeded at 45.
Hunk #2 succeeded at 962.
Hunk #3 succeeded at 1956.
Hunk #4 succeeded at 2100.
Hunk #5 succeeded at 3102.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-src_feature.h
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-src_feature.h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD$
|
|pkgsrc PREFIX support.
|
|--- src/feature.h.orig	2002-04-09 00:49:38.000000000 +0000
|+++ src/feature.h
--------------------------
Patching file src/feature.h using Plan A...
Hunk #1 succeeded at 25.
done
=> Verifying /cvs/pkgsrc/x11/rxvt/patches/patch-src_rxvt.h
=> Applying pkgsrc patch /cvs/pkgsrc/x11/rxvt/patches/patch-src_rxvt.h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_rxvt.h,v 1.1 2012/07/09 19:06:22 joerg Exp $
|
|* 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
--------------------------
Patching file src/rxvt.h using Plan A...
Hunk #1 succeeded at 804.
Hunk #2 succeeded at 1100.
done
===> Creating toolchain wrappers for rxvt-2.7.10nb11
===> Configuring for rxvt-2.7.10nb11
=> Replacing path placeholders.
=> Modifying GNU configure scripts to avoid --recheck
=> Replacing config-guess with pkgsrc versions
=> Replacing config-sub with pkgsrc versions
=> Replacing install-sh with pkgsrc version
=> Checking for portability problems in extracted files

configuring for rxvt 2.7.10

checking for x86_64--netbsd-gcc... cc
checking for C compiler default output... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether cc accepts -g... yes
checking for cc option to accept ANSI C... none needed
checking how to run the C preprocessor... cc -E
checking for a BSD-compatible install... /usr/bin/install -c -o vins -g users
checking for gawk... /usr/pkg/bin/nawk
checking for egrep... grep -E
checking for AIX... no
checking for library containing strerror... none required
checking build system type... x86_64--netbsd
checking host system type... x86_64--netbsd
checking for ld used by GCC... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... nm
checking whether ln -s works... yes
checking how to recognise dependant libraries... file_magic ELF [0-9][0-9]*-bit [LM]SB shared object
checking command to parse nm output... failed
checking for ANSI C header files... no
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for x86_64--netbsd-ranlib... no
checking for ranlib... ranlib
checking for x86_64--netbsd-strip... no
checking for strip... strip
checking for objdir... .libs
checking for cc option to produce PIC... -fPIC
checking if cc PIC flag -fPIC works... yes
checking if cc static flag -static works... yes
checking if cc supports -c -o file.o... yes
checking if cc supports -c -o file.lo... yes
checking if cc supports -fno-rtti -fno-exceptions... yes
checking whether the linker (/usr/bin/ld) supports shared libraries... yes
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking dynamic linker characteristics... NetBSD ld.elf_so
checking if libtool supports shared libraries... yes
creating libtool
checking for mv... /bin/mv
checking for rm... /bin/rm
checking for cp... /bin/cp
checking for ln... /bin/ln
checking for sed... /usr/bin/sed
checking for echo... (cached) echo
checking for cmp... /usr/bin/cmp
checking for tbl... /cvs/pkgsrc/x11/rxvt/work/.tools/bin/tbl
checking for X... libraries /usr/X11R7/lib, headers /usr/X11R7/include
checking for gethostbyname... yes
checking for connect... yes
checking for remove... yes
checking for shmat... yes
checking for IceConnectionNumber in -lICE... yes
checking for libXpm... -I/usr/X11R7/include/X11, -L/usr/X11R7/lib
checking for sys/wait.h that is POSIX.1 compatible... yes
checking assert.h usability... yes
checking assert.h presence... yes
checking for assert.h... yes
checking fcntl.h usability... yes
checking fcntl.h presence... yes
checking for fcntl.h... yes
checking grp.h usability... yes
checking grp.h presence... yes
checking for grp.h... yes
checking libc.h usability... no
checking libc.h presence... no
checking for libc.h... no
checking lastlog.h usability... no
checking lastlog.h presence... no
checking for lastlog.h... no
checking stdarg.h usability... yes
checking stdarg.h presence... yes
checking for stdarg.h... yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking termios.h usability... yes
checking termios.h presence... yes
checking for termios.h... yes
checking for unistd.h... (cached) yes
checking sys/byteorder.h usability... no
checking sys/byteorder.h presence... no
checking for sys/byteorder.h... no
checking sys/ioctl.h usability... yes
checking sys/ioctl.h presence... yes
checking for sys/ioctl.h... yes
checking sys/select.h usability... yes
checking sys/select.h presence... yes
checking for sys/select.h... yes
checking sys/sockio.h usability... yes
checking sys/sockio.h presence... yes
checking for sys/sockio.h... yes
checking sys/stropts.h usability... no
checking sys/stropts.h presence... no
checking for sys/stropts.h... no
checking sys/strredir.h usability... no
checking sys/strredir.h presence... no
checking for sys/strredir.h... no
checking sys/time.h usability... yes
checking sys/time.h presence... yes
checking for sys/time.h... yes
checking utmp.h usability... yes
checking utmp.h presence... yes
checking for utmp.h... yes
checking utmpx.h usability... yes
checking utmpx.h presence... yes
checking for utmpx.h... yes
checking whether time.h and sys/time.h may both be included... yes
checking whether termios.h and sys/ioctl.h may both be included... yes
checking for -rpath dynamic library path recording... no
checking for -R dynamic library path recording... no
checking for XPointer... yes
checking for an ANSI C-conforming const... yes
checking for inline... inline
checking for mode_t... yes
checking for pid_t... yes
checking for uid_t in sys/types.h... yes
checking for char... yes
checking size of char... 1
checking for short... yes
checking size of short... 2
checking for int... yes
checking size of int... 4
checking for long... yes
checking size of long... 8
checking for long long... yes
checking size of long long... 8
checking for int *... yes
checking size of int *... 8
checking for int16_t... yes
checking for u_int16_t... yes
checking for int32_t... yes
checking for u_int32_t... yes
checking for int64_t... yes
checking for u_int64_t... yes
checking return type of signal handlers... void
checking for atexit... yes
checking for revoke... yes
checking for unsetenv... yes
checking for setutent... yes
checking for seteuid... yes
checking for setreuid... yes
checking for setsid... yes
checking for setpgrp... yes
checking for setpgid... yes
checking for openpty... no
checking for _getpty... no
checking for grantpt... yes
checking for unlockpt... yes
checking for isastream... no
checking for on_exit... no
checking for nanosleep... yes
checking for updwtmp... no
checking for updwtmpx... yes
checking for ttyslot... yes
checking for utmp.h... (cached) yes
checking for struct utmp... yes
checking for ut_host in utmp struct... yes
checking for ut_pid in utmp struct... no
checking for utmpx.h... (cached) yes
checking for struct utmpx... yes
checking for host in utmpx struct... yes
checking for session in utmpx struct... yes
checking for struct lastlog... yes
checking for struct lastlogx... yes
checking where utmp is located... 
checking where utmpx is located... 
checking where wtmp is located... 
checking where wtmpx is located... 
checking where lastlog is located... 
checking where lastlogx is located... 
checking where ttys/ttytab is located... /etc/ttys
checking for working Xlocale... yes
checking for working X setlocale... yes
checking for working plain setlocale... yes
checking for working nl_langinfo... yes
checking for posix_openpt... yes
checking for pty/tty type... GLIBC
configure: checking for pty ranges...
checking for setlocale in -lxpg4... no
configure: creating ./config.status
config.status: creating autoconf/Make.common
config.status: creating Makefile
config.status: creating doc/Makefile
config.status: creating src/Makefile
config.status: creating src/graphics/Makefile
config.status: creating src/test/Makefile
config.status: creating src/rxvtlib.h
config.status: creating rclock/Makefile
config.status: creating W11/Makefile
config.status: creating config.h
Configuration:

  Rxvt version:               2.7.10 : 26 MARCH 2003
  Source code location:       .
  Install path:               /usr/pkg/bin
  Compiler:                   cc
  Compiler flags:             -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include
  malloc support:             system default
  Xpm library:                -L/usr/X11R7/lib -lXpm

Adding modules:
  graphics.o:                 no
  grkelot.o:                  yes
  logging.o:                  yes
  menubar.o:                  yes
  scrollbar-rxvt.o:           yes
  scrollbar-next.o:           yes
  scrollbar-xterm.o:          yes
  strings.o:                  no
  xpm.o:                      yes

The following are set in config.h

  multichar glyph languages:  yes
  pty/tty type:               GLIBC
  utmp support:               enabled
  utmp file:                  
  utmpx file:                 
  wtmp file:                  
  wtmpx file:                 
  lastlog file:               
  ttys/ttytab file:           /etc/ttys

  *** Please check src/feature.h for further options ***

===> Building for rxvt-2.7.10nb11
--- all ---
--- command.intpro ---
--- init.intpro ---
--- grkelot.intpro ---
--- ptytty.intpro ---
--- screen.intpro ---
--- command.extpro ---
--- grkelot.extpro ---
--- init.extpro ---
--- logging.extpro ---
--- ptytty.extpro ---
--- screen.extpro ---
--- rxvt.o ---
--- command.lo ---
--- defaultfont.lo ---
--- grkelot.lo ---
--- command.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c command.c
--- rxvt.o ---
cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c rxvt.c
--- defaultfont.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c defaultfont.c
--- grkelot.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c grkelot.c
--- command.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c command.c -o command.o
--- defaultfont.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c defaultfont.c -o defaultfont.o
--- grkelot.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c grkelot.c -o grkelot.o
--- init.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c init.c
--- defaultfont.lo ---
echo timestamp > defaultfont.lo
--- logging.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c logging.c
--- init.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c init.c -o init.o
--- logging.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c logging.c -o logging.o
--- grkelot.lo ---
echo timestamp > grkelot.lo
--- main.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c main.c
--- logging.lo ---
echo timestamp > logging.lo
--- menubar.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c menubar.c
--- main.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c main.c -o main.o
--- menubar.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c menubar.c -o menubar.o
--- init.lo ---
echo timestamp > init.lo
--- misc.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c misc.c
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c misc.c -o misc.o
--- main.lo ---
echo timestamp > main.lo
--- netdisp.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c netdisp.c
--- misc.lo ---
echo timestamp > misc.lo
--- ptytty.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c ptytty.c
--- netdisp.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c netdisp.c -o netdisp.o
--- ptytty.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c ptytty.c -o ptytty.o
--- command.lo ---
echo timestamp > command.lo
--- screen.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c screen.c
--- netdisp.lo ---
echo timestamp > netdisp.lo
--- scrollbar.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar.c
--- ptytty.lo ---
echo timestamp > ptytty.lo
--- scrollbar-rxvt.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar-rxvt.c
--- screen.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c screen.c -o screen.o
--- scrollbar.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar.c -o scrollbar.o
--- scrollbar-rxvt.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar-rxvt.c -o scrollbar-rxvt.o
--- scrollbar.lo ---
echo timestamp > scrollbar.lo
--- scrollbar-next.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar-next.c
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar-next.c -o scrollbar-next.o
--- menubar.lo ---
echo timestamp > menubar.lo
--- scrollbar-xterm.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar-xterm.c
--- scrollbar-rxvt.lo ---
echo timestamp > scrollbar-rxvt.lo
--- xdefaults.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c xdefaults.c
--- scrollbar-xterm.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c scrollbar-xterm.c -o scrollbar-xterm.o
--- xdefaults.lo ---
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c xdefaults.c -o xdefaults.o
--- scrollbar-next.lo ---
echo timestamp > scrollbar-next.lo
--- scrollbar-xterm.lo ---
echo timestamp > scrollbar-xterm.lo
--- xpm.lo ---
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H  -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT  -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c xpm.c
cc -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DHAVE_LIBXPM -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -DDEBUG_STRICT -I/usr/X11R7/include -I/usr/X11R7/include/X11 -I.. -I. -I. -c xpm.c -o xpm.o
--- xdefaults.lo ---
echo timestamp > xdefaults.lo
--- xpm.lo ---
echo timestamp > xpm.lo
--- screen.lo ---
echo timestamp > screen.lo
--- librxvt.la ---
/bin/sh ../libtool --mode=link cc -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -L/usr/pkg/gcc14/lib/gcc/x86_64--netbsd/14.3.0 -Wl,-R/usr/pkg/gcc14/lib/gcc/x86_64--netbsd/14.3.0 -Wl,-zrelro -L/usr/pkg/lib -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib -rpath /usr/pkg/lib -version-info 1:0:0 command.lo defaultfont.lo init.lo grkelot.lo logging.lo main.lo menubar.lo misc.lo netdisp.lo ptytty.lo screen.lo scrollbar.lo scrollbar-rxvt.lo scrollbar-next.lo scrollbar-xterm.lo xdefaults.lo xpm.lo  -o librxvt.la
mkdir .libs
rm -fr .libs/librxvt.la .libs/librxvt.* .libs/librxvt.*
ar cru .libs/librxvt.a  command.o defaultfont.o init.o grkelot.o logging.o main.o menubar.o misc.o netdisp.o ptytty.o screen.o scrollbar.o scrollbar-rxvt.o scrollbar-next.o scrollbar-xterm.o xdefaults.o xpm.o 
ranlib .libs/librxvt.a
creating librxvt.la
(cd .libs && rm -f librxvt.la && ln -s ../librxvt.la librxvt.la)
--- rxvt ---
/bin/sh ../libtool --mode=link cc -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -L/usr/pkg/gcc14/lib/gcc/x86_64--netbsd/14.3.0 -Wl,-R/usr/pkg/gcc14/lib/gcc/x86_64--netbsd/14.3.0 -Wl,-zrelro -L/usr/pkg/lib -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib rxvt.o librxvt.la  -L/usr/X11R7/lib -L/usr/X11R7/lib -lXpm -lX11  -o rxvt
cc -O2 -D_NETBSD_SOURCE -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -Wl,-R/usr/pkg/gcc14/lib/gcc/x86_64--netbsd/14.3.0 -Wl,-zrelro -Wl,-R/usr/X11R7/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib rxvt.o -o rxvt  -L/usr/pkg/gcc14/lib/gcc/x86_64--netbsd/14.3.0 -L/usr/pkg/lib -L/usr/X11R7/lib -L/usr/lib ./.libs/librxvt.a -lXpm -lX11
--- rxvt.1 ---
/cvs/pkgsrc/x11/rxvt/work/.tools/bin/tbl ./rxvt.tbl | grep -v '^.lf' > rxvt.1
===> Installing for rxvt-2.7.10nb11
=> Generating pre-install file lists
=> Creating installation directories
./autoconf/mkinstalldirs /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/bin
mkdir /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/bin
./autoconf/mkinstalldirs /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/man/man1
mkdir /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/man
mkdir /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/man/man1
../autoconf/mkinstalldirs /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/include /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/lib /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/bin
mkdir /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/include
mkdir /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/lib
/bin/sh ../libtool --mode=install /usr/bin/install -c -o vins -g users -m 755 rxvt /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/bin/rxvt
/usr/bin/install -c -o vins -g users -m 755 rxvt /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/bin/rxvt
/usr/bin/install -c -o vins -g users -m 644 rxvt.1 /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/man/man1/rxvt.1
/usr/bin/install -c -o vins -g users -m 644 /cvs/pkgsrc/x11/rxvt/files/Rxvt		 /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/share/examples/rxvt/app-defaults
/usr/bin/install -c -o vins -g users -m 644 /cvs/pkgsrc/x11/rxvt/files/rxvt.desktop	 /cvs/pkgsrc/x11/rxvt/work/.destdir/usr/pkg/share/applications
=> Automatic manual page handling
=> Generating post-install file lists
=> Checking file-check results for rxvt-2.7.10nb11
=> Checking for non-existent script interpreters in rxvt-2.7.10nb11
=> Checking file permissions in rxvt-2.7.10nb11
=> Checking for PIE in rxvt-2.7.10nb11
=> Checking for RELRO in rxvt-2.7.10nb11
=> Checking for missing run-time search paths in rxvt-2.7.10nb11
=> Checking for work-directory references in rxvt-2.7.10nb11
=> Creating binary package /cvs/pkgsrc/x11/rxvt/work/.packages/rxvt-2.7.10nb11.tgz
===> Building binary package for rxvt-2.7.10nb11
=> Creating binary package /cvs/pkgsrc/packages/All/rxvt-2.7.10nb11.tgz

+----------------------------------------------------------------------
References:
- Re: CVS commit: pkgsrc/x11/rxvt
  - From: Thomas Klausner
- Re: CVS commit: pkgsrc/x11/rxvt
  - From: Martin Husemann
Prev by Date: Re: CVS commit: pkgsrc/x11/rxvt
Previous by Thread: Re: CVS commit: pkgsrc/x11/rxvt
Next by Thread: How to choose (pkgsrc) gcc version for build ?
Indexes:
Home | Main Index | Thread Index | Old Index