diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-07 00:09:58 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-07 00:09:58 +0800 |
| commit | 22ac137ba106297b5a5e33a59c9e33f5d7f01036 (patch) | |
| tree | 016ffc877ad80886e1963990713f653c362e1a2c /x11/gnome-screensaver/Makefile | |
| parent | afe6ebdf34fb4a51823a931978ce122f2033eada (diff) | |
| download | marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.gz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.bz2 marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.lz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.xz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.zst marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.zip | |
Sync with ports, mostly OptionsNG conversion and some diff reductions.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18518 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-screensaver/Makefile')
| -rw-r--r-- | x11/gnome-screensaver/Makefile | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 73b8ac6e1..ab3c38dfb 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -19,9 +19,9 @@ CONFLICTS= gnome-screensaver-3.[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes USE_XORG= xtst xxf86vm +USES= gettext pathfix pkgconfig USE_GNOME= gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ @@ -41,12 +41,15 @@ SCREENSAVER_DIR= share/applications/screensavers XSCREENSAVER_EXCLUDE= "(popsquares.xml)" -OPTIONS= PAM "Pluggable Authentication Module support" on \ - KEYRING "Enable GnomeKeyring integration (needs PAM)" on -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= PAM KEYRING +OPTIONS_DEFAULT=PAM KEYRING +PAM_DESC= Pluggable Authentication Module support +KEYRING_DESC= GnomeKeyring integration (needs PAM) + +.include <bsd.port.options.mk> -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} RUN_DEPENDS+= pam_helper:${PORTSDIR}/security/pam_helper CONFIGURE_ARGS+= --enable-authentication-scheme=helper \ --with-passwd-helper=${LOCALBASE}/bin/pam_helper @@ -56,20 +59,15 @@ CONFIGURE_ARGS+= --disable-pam PLIST_SUB+= PAM="@comment " .endif -.if defined(WITH_KEYRING) && defined(WITH_PAM) +.if ${PORT_OPTIONS:MKEYRING} && ${PORT_OPTIONS:MPAM} SUB_LIST+= PAM_KEYRING= RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring .else SUB_LIST+= PAM_KEYRING=\# .endif -pre-everything:: -.if defined(WITHOUT_PAM) && defined(WITH_KEYRING) - @${ECHO_MSG} "Keyring integration is disabled because it needs PAM." -.endif - post-patch: -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ ${WRKSRC}/src/gs-auth-pam.c .endif @@ -90,8 +88,8 @@ post-install: ${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \ ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \ ${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} ${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |