Wed Nov 24 06:55:41 2021 UTC ()
Use CONF_FILES for lib/X11/app-defaults/Rxvt

The MESSAGE file suggests that it's meant to be edited by users.


(pho)
diff -r1.65 -r1.66 pkgsrc/x11/rxvt/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/rxvt/PLIST
cvs diff -r1.65 -r1.66 pkgsrc/x11/rxvt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/rxvt/Makefile 2021/11/24 06:35:51 1.65
+++ pkgsrc/x11/rxvt/Makefile 2021/11/24 06:55:41 1.66
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.65 2021/11/24 06:35:51 pho Exp $ 1# $NetBSD: Makefile,v 1.66 2021/11/24 06:55:41 pho Exp $
2 2
3DISTNAME= rxvt-2.7.10 3DISTNAME= rxvt-2.7.10
4PKGREVISION= 9 4PKGREVISION= 10
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rxvt/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rxvt/}
7 7
8MAINTAINER= gcw@rxvt.org 8MAINTAINER= gcw@rxvt.org
9HOMEPAGE= https://sourceforge.net/projects/rxvt 9HOMEPAGE= https://sourceforge.net/projects/rxvt
10COMMENT= Low memory usage xterm replacement that supports color 10COMMENT= Low memory usage xterm replacement that supports color
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14 14
15CONFIGURE_ARGS+= --enable-utmp \ 15CONFIGURE_ARGS+= --enable-utmp \
16 --enable-wtmp \ 16 --enable-wtmp \
17 --enable-lastlog \ 17 --enable-lastlog \
@@ -46,21 +46,23 @@ CONFIGURE_ARGS+= --with-xpm-library=${BU @@ -46,21 +46,23 @@ CONFIGURE_ARGS+= --with-xpm-library=${BU
46SPECIAL_PERMS= ${PREFIX}/bin/rxvt ${SETUID_ROOT_PERMS} 46SPECIAL_PERMS= ${PREFIX}/bin/rxvt ${SETUID_ROOT_PERMS}
47.endif 47.endif
48 48
49CFLAGS.SunOS+= -DSunOS 49CFLAGS.SunOS+= -DSunOS
50 50
51# Make sure _NETBSD_SOURCE is defined for updlastlogx 51# Make sure _NETBSD_SOURCE is defined for updlastlogx
52CFLAGS.NetBSD+= -D_NETBSD_SOURCE 52CFLAGS.NetBSD+= -D_NETBSD_SOURCE
53 53
54post-patch: 54post-patch:
55 ${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig 55 ${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig
56 ${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \ 56 ${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \
57 -e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:" 57 -e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:"
58 58
59INSTALLATION_DIRS= lib/X11/app-defaults 59EGDIR= share/examples/${PKGBASE}
 60INSTALLATION_DIRS+= ${EGDIR}/app-defaults
 61CONF_FILES+= ${EGDIR}/app-defaults/Rxvt ${PREFIX}/lib/X11/app-defaults/Rxvt
60 62
61pre-install: 63post-install:
62 ${INSTALL_DATA} ${FILESDIR}/Rxvt ${DESTDIR}${PREFIX}/lib/X11/app-defaults 64 ${INSTALL_DATA} ${FILESDIR}/Rxvt ${DESTDIR}${PREFIX}/${EGDIR}/app-defaults
63 65
64.include "../../x11/libXpm/buildlink3.mk" 66.include "../../x11/libXpm/buildlink3.mk"
65.include "../../x11/libXt/buildlink3.mk" 67.include "../../x11/libXt/buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/rxvt/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/rxvt/PLIST 2012/06/16 03:15:31 1.4
+++ pkgsrc/x11/rxvt/PLIST 2021/11/24 06:55:41 1.5
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
1@comment $NetBSD: PLIST,v 1.4 2012/06/16 03:15:31 dholland Exp $ 1@comment $NetBSD: PLIST,v 1.5 2021/11/24 06:55:41 pho Exp $
2bin/rxvt 2bin/rxvt
3lib/X11/app-defaults/Rxvt 
4man/man1/rxvt.1 3man/man1/rxvt.1
 4share/examples/rxvt/app-defaults/Rxvt
 5@pkgdir lib
 6@pkgdir include