summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-08-04 07:26:52 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-08-04 07:26:52 +0800
commit6f587238da20ab9b942df2c60d5d79d69b360160 (patch)
tree6d87f9cc736e321fe5cb1cd3aefe95662943d6b5
parent2df875ebfd013d0689d6c56c19e525612a26ddbf (diff)
downloadmarcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.tar
marcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.tar.gz
marcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.tar.bz2
marcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.tar.lz
marcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.tar.xz
marcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.tar.zst
marcuscom-ports-6f587238da20ab9b942df2c60d5d79d69b360160.zip
Sync with the FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11200 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome-screensaver/Makefile29
1 files changed, 19 insertions, 10 deletions
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 <marcus@FreeBSD.org>
#
# $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 <bsd.port.pre.mk>
.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: