Remove the --disable-locking, because it will disable PAM but it requires PAM

now. Upstream will need to fix it by remove lock optional or something else.
See here:

------------------------------------------
have_pam=no
if test "x$enable_locking" = "xyes"; then
AC_CHECK_LIB(pam, pam_start, have_pam=yes)
fi

if test "x$have_pam" = "xyes"; then
        AUTH_LIBS="${AUTH_LIBS} -lpam"
	[...]
else
	AC_MSG_ERROR("PAM libraries not found")
fi
------------------------------------------

You will have to disable the lock option in the screensaver perference in
GNOME to avoid stuck in lock. Remove PAM and gnome-keyring optionals as it
requires PAM now. They have removed non-PAM based authentication support.

http://bit.ly/gL8xc8


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15479 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 7 insertions, 36 deletions

diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
index c260c0184..460b2de08 100644
--- a/x11/gnome-screensaver3/Makefile
+++ b/x11/gnome-screensaver3/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.4 2011/03/09 15:59:43 kwm Exp $
+#   $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.5 2011/03/09 20:59:34 kwm Exp $
 #
 
 PORTNAME=	gnome-screensaver
@@ -18,6 +18,8 @@ COMMENT=	GNOME screen saver and locker
 LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 #RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
+RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper \
+		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -29,8 +31,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd3 \
 GNOME_DESKTOP_VERSION=3
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-# explicit disable locking, the new binary needs work. doesn't unlock.
-CONFIGURE_ARGS=	--disable-locking
+CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d
 
 MAN1=		gnome-screensaver-command.1 gnome-screensaver.1
 
@@ -42,37 +43,9 @@ SUB_FILES+=	gnome-screensaver.pam
 
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
-OPTIONS=	PAM "Pluggable Authentication Module support" on \
-		KEYRING "Enable GnomeKeyring integration (needs PAM)" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PAM)
-RUN_DEPENDS+=		pam_helper:${PORTSDIR}/security/pam_helper
-CONFIGURE_ARGS+=	--with-pam-prefix=${PREFIX}/etc/pam.d
-PLIST_SUB+=		PAM=""
-.else
-CONFIGURE_ARGS+=	--disable-pam
-PLIST_SUB+=		PAM="@comment "
-.endif
-
-.if defined(WITH_KEYRING) && defined(WITH_PAM)
-SUB_LIST+=		PAM_KEYRING=
-RUN_DEPENDS+=		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
-.else
-SUB_LIST+=		PAM_KEYRING=\#
-.endif
-
-pre-everything::
-.if defined(WITHOUT_PAM) && defined(WITH_KEYRING)
-	@${ECHO_MSG} "Keyring integration is disabled because it needs PAM."
-.endif
-
 post-patch:
-.if defined(WITH_PAM)
 	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
 		${WRKSRC}/src/gs-auth-pam.c
-.endif
 
 #pre-install:
 #	@${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
@@ -90,8 +63,6 @@ post-install:
 #		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
 #			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
 #			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
-.if defined(WITH_PAM)
 	${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gnome-screensaver3/files/gnome-screensaver.pam.in b/x11/gnome-screensaver3/files/gnome-screensaver.pam.in
index c2f8394ff..539ca0ee7 100644
--- a/x11/gnome-screensaver3/files/gnome-screensaver.pam.in
+++ b/x11/gnome-screensaver3/files/gnome-screensaver.pam.in
@@ -1,3 +1,3 @@
 auth		include		system
-%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
+auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
 account		include		system
diff --git a/x11/gnome-screensaver3/pkg-plist b/x11/gnome-screensaver3/pkg-plist
index 1880f2346..518510222 100644
--- a/x11/gnome-screensaver3/pkg-plist
+++ b/x11/gnome-screensaver3/pkg-plist
@@ -1,6 +1,6 @@
 bin/gnome-screensaver
 bin/gnome-screensaver-command
-%%PAM%%etc/pam.d/gnome-screensaver
+etc/pam.d/gnome-screensaver
 etc/xdg/autostart/gnome-screensaver.desktop
 libdata/pkgconfig/gnome-screensaver.pc
 libexec/gnome-screensaver-dialog