pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/rxvt Use CONF_FILES for lib/X11/app-defaults/Rxvt



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5d3d086e0fe
branches:  trunk
changeset: 770050:e5d3d086e0fe
user:      pho <pho%pkgsrc.org@localhost>
date:      Wed Nov 24 06:55:41 2021 +0000

description:
Use CONF_FILES for lib/X11/app-defaults/Rxvt

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

diffstat:

 x11/rxvt/Makefile |  12 +++++++-----
 x11/rxvt/PLIST    |   6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 4ce7229754b0 -r e5d3d086e0fe x11/rxvt/Makefile
--- a/x11/rxvt/Makefile Wed Nov 24 06:35:51 2021 +0000
+++ b/x11/rxvt/Makefile Wed Nov 24 06:55:41 2021 +0000
@@ -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 @@
        ${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"
diff -r 4ce7229754b0 -r e5d3d086e0fe x11/rxvt/PLIST
--- a/x11/rxvt/PLIST    Wed Nov 24 06:35:51 2021 +0000
+++ b/x11/rxvt/PLIST    Wed Nov 24 06:55:41 2021 +0000
@@ -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



Home | Main Index | Thread Index | Old Index