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
cvs diff -r1.102 -r1.103 pkgsrc/x11/xlockmore/Makefile (expand / switch to unified diff)

--- 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,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.102 2012/10/28 20:21:11 is Exp $ 1# $NetBSD: Makefile,v 1.103 2012/12/13 14:31:03 is Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
 5PKGREVISION= 1
 6
5COMMENT= Like the XLock session-locker/screensaver, but with more 7COMMENT= Like the XLock session-locker/screensaver, but with more
6 8
7CONFIGURE_ARGS+= --with-opengl 9CONFIGURE_ARGS+= --with-opengl
8CONFIGURE_ARGS+= --with-mesa 10CONFIGURE_ARGS+= --with-mesa
9CONFIGURE_ARGS+= --without-ttf 11CONFIGURE_ARGS+= --without-ttf
10XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib 12XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
11CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q} 13CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
12OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 14OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
13CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q} 15CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
14MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 16MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
15CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q} 17CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
16#BUILDLINK_TRANSFORM+= l:MesaGL:GL 18#BUILDLINK_TRANSFORM+= l:MesaGL:GL
17#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU 19#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU
cvs diff -r1.68 -r1.69 pkgsrc/x11/xlockmore/Makefile.common (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.68 2012/10/29 05:07:14 asau Exp $ 1# $NetBSD: Makefile.common,v 1.69 2012/12/13 14:31:03 is Exp $
2# 2#
3# This Makefile.common is included by: 3# This Makefile.common is included by:
4# 4#
5# x11/xlockmore/Makefile 5# x11/xlockmore/Makefile
6# x11/xlockmore-lite/Makefile 6# x11/xlockmore-lite/Makefile
7# 7#
8# If these packages are updated, please remember to reset any PKGREVISIONs 8# If these packages are updated, please remember to reset any PKGREVISIONs
9# in those Makefiles. 9# in those Makefiles.
10 10
11DISTNAME= xlockmore-5.41 11DISTNAME= xlockmore-5.41
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \ 13MASTER_SITES= http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \
14 ftp://ibiblio.org/pub/Linux/X11/screensavers/ 14 ftp://ibiblio.org/pub/Linux/X11/screensavers/
@@ -49,28 +49,31 @@ XLOCK_MODULEDIR= ${PREFIX}/lib/X11/xlock @@ -49,28 +49,31 @@ XLOCK_MODULEDIR= ${PREFIX}/lib/X11/xlock
49 49
50DEFINES+= -DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\"" 50DEFINES+= -DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\""
51CPPFLAGS+= ${DEFINES} 51CPPFLAGS+= ${DEFINES}
52CXXFLAGS+= ${DEFINES} 52CXXFLAGS+= ${DEFINES}
53 53
54GNU_CONFIGURE= YES 54GNU_CONFIGURE= YES
55CONFIGURE_ARGS+= --without-motif 55CONFIGURE_ARGS+= --without-motif
56CONFIGURE_ARGS+= --without-editres 56CONFIGURE_ARGS+= --without-editres
57CONFIGURE_ARGS+= --without-dtsaver 57CONFIGURE_ARGS+= --without-dtsaver
58CONFIGURE_ARGS+= --without-rplay 58CONFIGURE_ARGS+= --without-rplay
59CONFIGURE_ARGS+= --without-nas 59CONFIGURE_ARGS+= --without-nas
60CONFIGURE_ARGS+= --without-gtk 60CONFIGURE_ARGS+= --without-gtk
61CONFIGURE_ARGS+= --without-esound 61CONFIGURE_ARGS+= --without-esound
62CONFIGURE_ARGS+= --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults 62CONFIGURE_ARGS+= --enable-appdefaultdir=${EGDIR}/app-defaults
63CONFIGURE_ENV+= ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults 63CONFIGURE_ENV+= ac_cv_x_app_defaults=${EGDIR}/app-defaults
 64
 65CONF_FILES+= ${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
 66
64 67
65.if ${OPSYS} == "NetBSD" 68.if ${OPSYS} == "NetBSD"
66XLOCK_AUDIOPLAY?= /usr/bin/audioplay 69XLOCK_AUDIOPLAY?= /usr/bin/audioplay
67CONFIGURE_ARGS+= --enable-def-play=${XLOCK_AUDIOPLAY:Q} 70CONFIGURE_ARGS+= --enable-def-play=${XLOCK_AUDIOPLAY:Q}
68.endif 71.endif
69 72
70.if empty(PKG_OPTIONS:Mxlockmore-dpms) 73.if empty(PKG_OPTIONS:Mxlockmore-dpms)
71CONFIGURE_ARGS+= --without-dpms 74CONFIGURE_ARGS+= --without-dpms
72.else 75.else
73. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a) 76. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
74BUILDLINK_TRANSFORM+= l:Xdpms:Xext 77BUILDLINK_TRANSFORM+= l:Xdpms:Xext
75. endif 78. endif
76DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib 79DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
cvs diff -r1.8 -r1.9 pkgsrc/x11/xlockmore/PLIST (expand / switch to unified diff)

--- 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 @@ @@ -1,11 +1,11 @@
1@comment $NetBSD: PLIST,v 1.8 2012/03/28 20:21:46 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.9 2012/12/13 14:31:03 is Exp $
2${LITE}bin/xglock 2${LITE}bin/xglock
3bin/xlock 3bin/xlock
4lib/X11/app-defaults/XLock 
5lib/X11/xlock/sounds/complete.au 4lib/X11/xlock/sounds/complete.au
6lib/X11/xlock/sounds/identify-please.au 5lib/X11/xlock/sounds/identify-please.au
7lib/X11/xlock/sounds/not-programmed.au 6lib/X11/xlock/sounds/not-programmed.au
8lib/X11/xlock/sounds/thank-you.au 7lib/X11/xlock/sounds/thank-you.au
9man/man1/xlock.1 8man/man1/xlock.1
10share/examples/xlock/pam.d/xlock-NetBSD 9share/examples/xlock/pam.d/xlock-NetBSD
 10share/examples/xlock/app-defaults/XLock
11${LITE}share/xlock/xglockrc 11${LITE}share/xlock/xglockrc
cvs diff -r1.18 -r1.19 pkgsrc/x11/xlockmore-lite/Makefile (expand / switch to unified diff)

--- 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,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.18 2012/10/28 20:21:12 is Exp $ 1# $NetBSD: Makefile,v 1.19 2012/12/13 14:31:03 is Exp $
2 2
3.include "../../x11/xlockmore/Makefile.common" 3.include "../../x11/xlockmore/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-lite-/} 5PKGNAME= ${DISTNAME:S/-/-lite-/}
6COMMENT= "lite" version of xlockmore 6COMMENT= "lite" version of xlockmore
7 7
 8PKGREVISION= 1
 9
8CONFIGURE_ARGS+= --without-xpm 10CONFIGURE_ARGS+= --without-xpm
9CONFIGURE_ARGS+= --without-gltt 11CONFIGURE_ARGS+= --without-gltt
10CONFIGURE_ARGS+= --without-ttf 12CONFIGURE_ARGS+= --without-ttf
11CONFIGURE_ARGS+= --without-freetype 13CONFIGURE_ARGS+= --without-freetype
12CONFIGURE_ARGS+= --without-opengl 14CONFIGURE_ARGS+= --without-opengl
13CONFIGURE_ARGS+= --without-magick 15CONFIGURE_ARGS+= --without-magick
14CONFIGURE_ARGS+= --without-mesa 16CONFIGURE_ARGS+= --without-mesa
15CONFIGURE_ARGS+= --without-rplay 17CONFIGURE_ARGS+= --without-rplay
16CONFIGURE_ARGS+= --without-esound 18CONFIGURE_ARGS+= --without-esound
17CONFIGURE_ARGS+= --without-gtk2 19CONFIGURE_ARGS+= --without-gtk2
18CONFIGURE_ARGS+= --without-gtk 20CONFIGURE_ARGS+= --without-gtk
19 21
20PLIST_SUBST+= LITE="@comment Not in lite version: " 22PLIST_SUBST+= LITE="@comment Not in lite version: "