diff options
| author | is <is> | 2012-12-13 14:31:03 +0000 |
|---|---|---|
| committer | is <is> | 2012-12-13 14:31:03 +0000 |
| commit | 6ca3428cc9f4702baee433e793993e6b5e3f3c63 (patch) | |
| tree | e941c95d47587bfda768531c93ec86c1662a6802 /x11 | |
| parent | 7a173a76b99d9a772d5755db16831d58552a005a (diff) | |
| download | pkgsrc-6ca3428cc9f4702baee433e793993e6b5e3f3c63.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xlockmore-lite/Makefile | 4 | ||||
| -rw-r--r-- | x11/xlockmore/Makefile | 4 | ||||
| -rw-r--r-- | x11/xlockmore/Makefile.common | 9 | ||||
| -rw-r--r-- | x11/xlockmore/PLIST | 4 |
4 files changed, 14 insertions, 7 deletions
diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile index 5430a9ecfbc..3dc64f71997 100644 --- a/x11/xlockmore-lite/Makefile +++ b/x11/xlockmore-lite/Makefile @@ -1,10 +1,12 @@ -# $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 CONFIGURE_ARGS+= --without-ttf diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 5e322e3c648..d0db1e393e7 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,7 +1,9 @@ -# $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 CONFIGURE_ARGS+= --with-opengl diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 6a3f0ae4a4f..b1e160ed9c1 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -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-rplay 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 diff --git a/x11/xlockmore/PLIST b/x11/xlockmore/PLIST index ba9b248d2b5..7047ba99f8c 100644 --- a/x11/xlockmore/PLIST +++ b/x11/xlockmore/PLIST @@ -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 |