diff options
| author | marcus <marcus@FreeBSD.org> | 2008-08-03 14:57:47 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2008-08-03 14:57:47 +0800 |
| commit | 5da4fea1a58c03f19defc9fc84c465655b81ad09 (patch) | |
| tree | e9e7b5e7bc1c2877e09e453027be443ee5303b6e /x11 | |
| parent | 13fdfeb0ffccad15f0251ed6aaeebd38dd063206 (diff) | |
| download | freebsd-ports-gnome-5da4fea1a58c03f19defc9fc84c465655b81ad09.tar.gz freebsd-ports-gnome-5da4fea1a58c03f19defc9fc84c465655b81ad09.tar.zst freebsd-ports-gnome-5da4fea1a58c03f19defc9fc84c465655b81ad09.zip | |
* Automatically disable keyring if pam is disabled
* Remove .warning that confuses portupgrade
* Provide more helpful descriptions of options
* Break the build if PAM is enabled, define GNOME_SCREENSAVER_WITH_BROKEN_PAM
if you really want PAM.
PR: 126115
Submitted by: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-screensaver/Makefile | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 1663a4258d2b..a8b29b5c58a7 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -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: |