Sun Mar 11 03:22:09 2012 UTC ()
Add pam option.  Not enabled by default so no PKGREVISION.


(markd)
diff -r1.62 -r1.63 pkgsrc/x11/xlockmore/Makefile.common
cvs diff -r1.62 -r1.63 pkgsrc/x11/xlockmore/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile.common 2012/02/18 23:50:33 1.62
+++ pkgsrc/x11/xlockmore/Makefile.common 2012/03/11 03:22:09 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.62 2012/02/18 23:50:33 elric Exp $ 1# $NetBSD: Makefile.common,v 1.63 2012/03/11 03:22:09 markd 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.38 11DISTNAME= xlockmore-5.38
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/
@@ -19,27 +19,27 @@ HOMEPAGE= http://www.tux.org/~bagleyd/xl @@ -19,27 +19,27 @@ HOMEPAGE= http://www.tux.org/~bagleyd/xl
19 19
20CONFLICTS+= xlockmore-[0-9]* xlockmore-lite-[0-9]* 20CONFLICTS+= xlockmore-[0-9]* xlockmore-lite-[0-9]*
21 21
22DISTINFO_FILE?= ${.CURDIR}/../xlockmore/distinfo 22DISTINFO_FILE?= ${.CURDIR}/../xlockmore/distinfo
23PATCHDIR?= ${.CURDIR}/../xlockmore/patches 23PATCHDIR?= ${.CURDIR}/../xlockmore/patches
24PLIST_SRC?= ${.CURDIR}/../xlockmore/PLIST 24PLIST_SRC?= ${.CURDIR}/../xlockmore/PLIST
25 25
26PKG_DESTDIR_SUPPORT= user-destdir 26PKG_DESTDIR_SUPPORT= user-destdir
27PKG_INSTALLATION_TYPES= overwrite pkgviews 27PKG_INSTALLATION_TYPES= overwrite pkgviews
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore 31PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore
32PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms 32PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms pam
33.if ${OPSYS} == "NetBSD" 33.if ${OPSYS} == "NetBSD"
34PKG_SUPPORTED_OPTIONS+= oss 34PKG_SUPPORTED_OPTIONS+= oss
35.endif 35.endif
36PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms 36PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms
37PKG_OPTIONS_LEGACY_VARS+=XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root 37PKG_OPTIONS_LEGACY_VARS+=XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root
38PKG_OPTIONS_LEGACY_VARS+=XLOCK_NO_DPMS:-xlockmore-dpms 38PKG_OPTIONS_LEGACY_VARS+=XLOCK_NO_DPMS:-xlockmore-dpms
39 39
40.include "../../mk/bsd.options.mk" 40.include "../../mk/bsd.options.mk"
41 41
42USE_LANGUAGES= c c++ 42USE_LANGUAGES= c c++
43USE_TOOLS+= xmkmf 43USE_TOOLS+= xmkmf
44USE_X11BASE= YES 44USE_X11BASE= YES
45 45
@@ -70,41 +70,49 @@ CONFIGURE_ARGS+= --enable-def-play=${XLO @@ -70,41 +70,49 @@ CONFIGURE_ARGS+= --enable-def-play=${XLO
70CONFIGURE_ARGS+= --without-dpms 70CONFIGURE_ARGS+= --without-dpms
71.else 71.else
72. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a) 72. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
73BUILDLINK_TRANSFORM+= l:Xdpms:Xext 73BUILDLINK_TRANSFORM+= l:Xdpms:Xext
74. endif 74. endif
75DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib 75DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
76CONFIGURE_ENV+= ac_cv_path_dpms=${DPMS_ENV:Q} 76CONFIGURE_ENV+= ac_cv_path_dpms=${DPMS_ENV:Q}
77.endif 77.endif
78 78
79.if empty(PKG_OPTIONS:Mxlockmore-allow-root) 79.if empty(PKG_OPTIONS:Mxlockmore-allow-root)
80CONFIGURE_ARGS+= --disable-allow-root 80CONFIGURE_ARGS+= --disable-allow-root
81.endif 81.endif
82 82
 83.if !empty(PKG_OPTIONS:Mpam)
 84. include "../../mk/pam.buildlink3.mk"
 85CONFIGURE_ARGS+= --enable-pam
 86.else
 87CONFIGURE_ARGS+= --disable-pam
 88.endif
 89
83# 90#
84# Special permissions of bin/xlock if any. 91# Special permissions of bin/xlock if any.
85# 92#
86.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || \ 93.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || \
87 ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS" 94 ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
88SPECIAL_PERMS+= bin/xlock ${SETUID_ROOT_PERMS} 95SPECIAL_PERMS+= bin/xlock ${SETUID_ROOT_PERMS}
89.elif ${OPSYS} == "Linux" 96.elif ${OPSYS} == "Linux"
90# setgid shadow should be enough for modern Linux 97# setgid shadow should be enough for modern Linux
91SPECIAL_PERMS+= bin/xlock ${REAL_ROOT_USER} shadow 2511 98SPECIAL_PERMS+= bin/xlock ${REAL_ROOT_USER} shadow 2511
92.endif 99.endif
93 100
94# XXX framework bug: while we don't need it, this would kill 101# XXX framework bug: while we don't need it, this would kill
95# the inherited full dependency 102# the inherited full dependency
96#BUILDLINK_DEPMETHOD.libXt?= build 103#BUILDLINK_DEPMETHOD.libXt?= build
97 104
 105.include "../../graphics/ImageMagick/buildlink3.mk"
98.include "../../x11/libICE/buildlink3.mk" 106.include "../../x11/libICE/buildlink3.mk"
99.include "../../x11/libSM/buildlink3.mk" 107.include "../../x11/libSM/buildlink3.mk"
100.include "../../x11/libX11/buildlink3.mk" 108.include "../../x11/libX11/buildlink3.mk"
101.include "../../x11/libXext/buildlink3.mk" 109.include "../../x11/libXext/buildlink3.mk"
102.include "../../x11/libXinerama/buildlink3.mk" 110.include "../../x11/libXinerama/buildlink3.mk"
103.include "../../x11/libXt/buildlink3.mk" 111.include "../../x11/libXt/buildlink3.mk"
104.include "../../x11/xextproto/buildlink3.mk" 112.include "../../x11/xextproto/buildlink3.mk"
105 113
106XINERAMA_ENV= no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib 114XINERAMA_ENV= no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib
107CONFIGURE_ENV+= ac_cv_path_xinerama=${XINERAMA_ENV:Q} 115CONFIGURE_ENV+= ac_cv_path_xinerama=${XINERAMA_ENV:Q}
108 116
109# Set the complete paths to the sound files and set the default xlock 117# Set the complete paths to the sound files and set the default xlock
110# mode/screensaver. 118# mode/screensaver.