[PATCH] x11/xscreensaver-gnome: pam option is broken

[Marcin Wisnicki]

>Submitter-Id:	current-users
>Originator:	Marcin Wisnicki
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] x11/xscreensaver-gnome: pam option is broken
>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 #13: Sun Jul  6 16:19:06 CEST
>Description:
There is an obvious mistake in WITH_PAM case, which in addition to disabling
pam support causes plist breakage.

While there, enable PAM by default. PLEASE do not reject this unless you have
a good technical reason to do so. PAM is a stable and standard component of
FreeBSD base system since years. It is unconditionally enabled in x11/gdm.

Also, remove kerberos option, it's misleading and deprecated. More than likely
any user of Kerberos will prefer to do it through PAM.

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

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

--- xscreensaver-gnome-5.05_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-10 01:40:06.000000000 +0200
+++ /usr/ports/x11/xscreensaver-gnome/Makefile	2008-07-14 17:45:04.000000000 +0200
@@ -8,7 +8,7 @@
 
 PORTNAME?=	xscreensaver-gnome
 PORTVERSION=	5.05
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -36,8 +36,7 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-OPTIONS?=	PAM "Pluggable Authentication Module support" off \
-		KERBEROS "Add support for kerberos" off \
+OPTIONS?=	PAM "Pluggable Authentication Module support" on \
 		ALL_FORTUNES "Enable support for all fortunes" off \
 		SETUID_HACKS "Install sonar hack suid so it can ping" off
 
@@ -89,18 +88,12 @@
 
 .if defined(WITH_PAM)
 PLIST_SUB+=		PAM=""
-CONFIGURE_ARGS+=	--without-pam
+CONFIGURE_ARGS+=	--with-pam
 .else
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=		PAM="@comment "
 .endif
 
-.if defined(WITH_KERBEROS)
-CONFIGURE_ARGS+=	--with-kerberos
-.else
-CONFIGURE_ARGS+=	--without-kerberos
-.endif
-
 .if defined(WITH_SETUID_HACKS)
 CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
--- xscreensaver-gnome-5.05_1.patch ends here ---