Thu Dec 13 14:31:04 2012 UTC ()
Treat the app-defaults/XLock as a configuration file, thus enabling
administrators of multi-user machines to have a site-specific default
configuration and not lose it on updates of the package.
(is)
diff -r1.102 -r1.103 pkgsrc/x11/xlockmore/Makefile
diff -r1.68 -r1.69 pkgsrc/x11/xlockmore/Makefile.common
diff -r1.8 -r1.9 pkgsrc/x11/xlockmore/PLIST
diff -r1.18 -r1.19 pkgsrc/x11/xlockmore-lite/Makefile
--- pkgsrc/x11/xlockmore/Makefile 2012/10/28 20:21:11 1.102
+++ pkgsrc/x11/xlockmore/Makefile 2012/12/13 14:31:03 1.103
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.102 2012/10/28 20:21:11 is Exp $
+# $NetBSD: Makefile,v 1.103 2012/12/13 14:31:03 is Exp $
.include "Makefile.common"
+
+PKGREVISION= 1
COMMENT= Like the XLock session-locker/screensaver, but with more
--- pkgsrc/x11/xlockmore/Makefile.common 2012/10/29 05:07:14 1.68
+++ pkgsrc/x11/xlockmore/Makefile.common 2012/12/13 14:31:03 1.69
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.68 2012/10/29 05:07:14 asau Exp $
+# $NetBSD: Makefile.common,v 1.69 2012/12/13 14:31:03 is Exp $
#
# This Makefile.common is included by:
#
@@ -59,8 +59,11 @@
CONFIGURE_ARGS+= --without-nas
CONFIGURE_ARGS+= --without-gtk
CONFIGURE_ARGS+= --without-esound
-CONFIGURE_ARGS+= --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
-CONFIGURE_ENV+= ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults
+CONFIGURE_ARGS+= --enable-appdefaultdir=${EGDIR}/app-defaults
+CONFIGURE_ENV+= ac_cv_x_app_defaults=${EGDIR}/app-defaults
+
+CONF_FILES+= ${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
+
.if ${OPSYS} == "NetBSD"
XLOCK_AUDIOPLAY?= /usr/bin/audioplay
--- pkgsrc/x11/xlockmore/PLIST 2012/03/28 20:21:46 1.8
+++ pkgsrc/x11/xlockmore/PLIST 2012/12/13 14:31:03 1.9
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2012/03/28 20:21:46 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/12/13 14:31:03 is Exp $
${LITE}bin/xglock
bin/xlock
-lib/X11/app-defaults/XLock
lib/X11/xlock/sounds/complete.au
lib/X11/xlock/sounds/identify-please.au
lib/X11/xlock/sounds/not-programmed.au
lib/X11/xlock/sounds/thank-you.au
man/man1/xlock.1
share/examples/xlock/pam.d/xlock-NetBSD
+share/examples/xlock/app-defaults/XLock
${LITE}share/xlock/xglockrc
--- pkgsrc/x11/xlockmore-lite/Makefile 2012/10/28 20:21:12 1.18
+++ pkgsrc/x11/xlockmore-lite/Makefile 2012/12/13 14:31:03 1.19
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2012/10/28 20:21:12 is Exp $
+# $NetBSD: Makefile,v 1.19 2012/12/13 14:31:03 is Exp $
.include "../../x11/xlockmore/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-lite-/}
COMMENT= "lite" version of xlockmore
+
+PKGREVISION= 1
CONFIGURE_ARGS+= --without-xpm
CONFIGURE_ARGS+= --without-gltt