[PATCH] x11/xscreensaver-gnome: [SUMMARIZE CHANGES]

[Marcin Wisnicki]

>Submitter-Id:	current-users
>Originator:	Marcin Wisnicki
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] x11/xscreensaver-gnome: [SUMMARIZE CHANGES]
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 7.0-STABLE i386
>Environment:
System: FreeBSD ghost.pnet.one.pl 7.0-STABLE FreeBSD 7.0-STABLE #15: Fri Jul 25 18:16:53 CEST 2008
>Description:
- mention dependency of KEYRING on PAM in its description
- force PAM when KEYRING is enabled
- remove .warning that confuses portupgrade

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- xscreensaver-gnome-5.06_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/xscreensaver-gnome.orig/Makefile /usr/ports/x11/xscreensaver-gnome/Makefile
--- /usr/ports/x11/xscreensaver-gnome.orig/Makefile	2008-07-27 22:21:19.000000000 +0200
+++ /usr/ports/x11/xscreensaver-gnome/Makefile	2008-07-31 04:13:38.000000000 +0200
@@ -37,7 +37,7 @@
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS?=	PAM "Pluggable Authentication Module support" on \
-		KEYRING "Enable GnomeKeyring/PAM integration" on \
+		KEYRING "Enable GnomeKeyring integration (needs PAM)" on \
 		ALL_FORTUNES "Enable support for all fortunes" off \
 		SETUID_HACKS "Install sonar hack suid so it can ping" off
 
@@ -90,22 +90,20 @@
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
 
-.if defined(WITH_PAM)
+.if defined(WITH_PAM) || defined(WITH_KEYRING)
 CONFIGURE_ARGS+=	--with-pam
 PLIST_SUB+=		PAM=""
+.else
+CONFIGURE_ARGS+=	--without-pam
+PLIST_SUB+=		PAM="@comment "
+.endif
+
 .if defined(WITH_KEYRING)
 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+=	--without-pam
-PLIST_SUB+=		PAM="@comment "
-.if defined(WITH_KEYRING)
-.warning Option KEYRING needs PAM, but PAM is disabled.
-.endif
-.endif
 
 .if defined(WITH_SETUID_HACKS)
 CONFIGURE_ARGS+=	--with-setuid-hacks
--- xscreensaver-gnome-5.06_1.patch ends here ---