From 6f587238da20ab9b942df2c60d5d79d69b360160 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 3 Aug 2008 23:26:52 +0000 Subject: Sync with the FreeBSD ports tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11200 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-screensaver/Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'x11') diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 2a8dfa912..9d951c797 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.90 2008/07/23 19:07:09 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.91 2008/07/27 20:32:19 marcus Exp $ # PORTNAME= gnome-screensaver @@ -42,26 +42,35 @@ SCREENSAVER_DIR= share/applications/screensavers XSCREENSAVER_EXCLUDE= "(popsquares.xml)" -OPTIONS= PAM "Pluggable Authentication Module support" off \ - KEYRING "Enable GnomeKeyring/PAM integration" off +OPTIONS= PAM "Pluggable Authentication Module support (broken!)" off \ + KEYRING "Enable GnomeKeyring integration (needs PAM)" off .include .if defined(WITH_PAM) +# Currently semi-broken: http://bugzilla.gnome.org/show_bug.cgi?id=370847 +# Our default pam_unix will not be able to authenticate +# Define GNOME_SCREENSAVER_WITH_BROKEN_PAM only if you know what you are doing. +.if !defined(GNOME_SCREENSAVER_WITH_BROKEN_PAM) +IGNORE= PAM support is partially broken. Please read Makefile +.endif CONFIGURE_ARGS+= --enable-pam PLIST_SUB+= PAM="" -.if defined(WITH_KEYRING) +.else +CONFIGURE_ARGS+= --disable-pam +PLIST_SUB+= PAM="@comment " +.endif + +.if defined(WITH_KEYRING) && defined(WITH_PAM) SUB_LIST+= PAM_KEYRING= RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring .else SUB_LIST+= PAM_KEYRING=\# .endif -.else -CONFIGURE_ARGS+= --disable-pam -PLIST_SUB+= PAM="@comment " -.if defined(WITH_KEYRING) -.warning Option KEYRING needs PAM, but PAM is disabled. -.endif + +pre-everything:: +.if defined(WITHOUT_PAM) && defined(WITH_KEYRING) + @${ECHO_MSG} "Keyring integration is disabled because it needs PAM." .endif post-patch: -- cgit v1.2.3