CVS commit: pkgsrc/x11/rxvt

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Nov 24 06:55:41 UTC 2021

Modified Files:
        pkgsrc/x11/rxvt: Makefile PLIST

Log Message:
Use CONF_FILES for lib/X11/app-defaults/Rxvt

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


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/x11/rxvt/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/rxvt/PLIST

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.65 pkgsrc/x11/rxvt/Makefile:1.66
--- pkgsrc/x11/rxvt/Makefile:1.65       Wed Nov 24 06:35:51 2021
+++ pkgsrc/x11/rxvt/Makefile    Wed Nov 24 06:55:41 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2021/11/24 06:35:51 pho Exp $
+# $NetBSD: Makefile,v 1.66 2021/11/24 06:55:41 pho Exp $
 
 DISTNAME=              rxvt-2.7.10
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rxvt/}
 
@@ -56,10 +56,12 @@ post-patch:
        ${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \
                -e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:"
 
-INSTALLATION_DIRS=     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
 
-pre-install:
-       ${INSTALL_DATA} ${FILESDIR}/Rxvt ${DESTDIR}${PREFIX}/lib/X11/app-defaults
+post-install:
+       ${INSTALL_DATA} ${FILESDIR}/Rxvt ${DESTDIR}${PREFIX}/${EGDIR}/app-defaults
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"

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