Update to 2.91.91.

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

4 files changed, 22 insertions, 64 deletions

diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
index 591b0c32d..37bb1c48a 100644
--- a/x11/gnome-screensaver3/Makefile
+++ b/x11/gnome-screensaver3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.2 2011/02/24 09:41:41 kwm Exp $
+#   $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.3 2011/03/08 20:12:35 kwm Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	2.91.90
+PORTVERSION=	2.91.91
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,7 +17,7 @@ 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=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -27,19 +27,16 @@ USE_XORG=	xtst xxf86vm
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd3 \
 		gnomedesktop3
 GNOME_DESKTOP_VERSION=3
-CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
-		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
-		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-screensaver-command.1 gnome-screensaver.1
 
-PLIST=	${WRKDIR}/pkg-plist
+#PLIST=	${WRKDIR}/pkg-plist
 SUB_FILES+=	gnome-screensaver.pam
 
-XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
-SCREENSAVER_DIR=	share/applications/screensavers
+#XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
+#SCREENSAVER_DIR=	share/applications/screensavers
 
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
@@ -50,8 +47,7 @@ OPTIONS=	PAM "Pluggable Authentication Module support" on \
 
 .if defined(WITH_PAM)
 RUN_DEPENDS+=		pam_helper:${PORTSDIR}/security/pam_helper
-CONFIGURE_ARGS+=	--enable-authentication-scheme=helper \
-			--with-passwd-helper=${LOCALBASE}/bin/pam_helper
+CONFIGURE_ARGS+=	--with-pam-prefix=${PREFIX}/etc/pam.d
 PLIST_SUB+=		PAM=""
 .else
 CONFIGURE_ARGS+=	--disable-pam
@@ -60,7 +56,7 @@ PLIST_SUB+=		PAM="@comment "
 
 .if defined(WITH_KEYRING) && defined(WITH_PAM)
 SUB_LIST+=		PAM_KEYRING=
-RUN_DEPENDS+=		gnome-keyring>=2.91.0:${PORTSDIR}/security/gnome-keyring3
+RUN_DEPENDS+=		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 .else
 SUB_LIST+=		PAM_KEYRING=\#
 .endif
@@ -76,22 +72,22 @@ post-patch:
 		${WRKSRC}/src/gs-auth-pam.c
 .endif
 
-pre-install:
-	@${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
-	@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
-		${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
-		${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
-		${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
-	@${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
+#pre-install:
+#	@${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
+#	@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
+#		${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
+#		${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
+#		${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
+#	@${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
 
 post-install:
 	${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
 	${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
-	${MKDIR} ${PREFIX}/${SCREENSAVER_DIR}
-	cd ${PREFIX}/${SCREENSAVER_DIR} && \
-		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
-			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
-			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
+#	${MKDIR} ${PREFIX}/${SCREENSAVER_DIR}
+#	cd ${PREFIX}/${SCREENSAVER_DIR} && \
+#		${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
diff --git a/x11/gnome-screensaver3/distinfo b/x11/gnome-screensaver3/distinfo
index 99e8444b5..a3033051e 100644
--- a/x11/gnome-screensaver3/distinfo
+++ b/x11/gnome-screensaver3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-screensaver-2.91.90.tar.bz2) = af65f01f831723ade18650caaa75dd1b1ee4391148f2c63fd061cf451f63bd99
-SIZE (gnome3/gnome-screensaver-2.91.90.tar.bz2) = 4814879
+SHA256 (gnome3/gnome-screensaver-2.91.91.tar.bz2) = 5611a47d46cdcb46b35bfc95d40ea5e0e27dbcc81a0dbd34628da8323d824cf9
+SIZE (gnome3/gnome-screensaver-2.91.91.tar.bz2) = 693788
diff --git a/x11/gnome-screensaver3/files/patch-src_gs-job.c b/x11/gnome-screensaver3/files/patch-src_gs-job.c
deleted file mode 100644
index 39e303d27..000000000
--- a/x11/gnome-screensaver3/files/patch-src_gs-job.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gs-job.c.orig	Wed Sep  7 09:23:59 2005
-+++ src/gs-job.c	Mon Sep 12 13:24:11 2005
-@@ -29,7 +29,8 @@
- #include <sys/wait.h>
- #include <errno.h>
- 
--#if defined(HAVE_SETPRIORITY) && defined(PRIO_PROCESS)
-+#if defined(HAVE_SETPRIORITY)
-+#include <sys/time.h>
- #include <sys/resource.h>
- #endif
- 
diff --git a/x11/gnome-screensaver3/pkg-plist b/x11/gnome-screensaver3/pkg-plist
index 47d0440a0..1880f2346 100644
--- a/x11/gnome-screensaver3/pkg-plist
+++ b/x11/gnome-screensaver3/pkg-plist
@@ -2,18 +2,8 @@ bin/gnome-screensaver
 bin/gnome-screensaver-command
 %%PAM%%etc/pam.d/gnome-screensaver
 etc/xdg/autostart/gnome-screensaver.desktop
-etc/xdg/menus/gnome-screensavers.menu
 libdata/pkgconfig/gnome-screensaver.pc
 libexec/gnome-screensaver-dialog
-libexec/gnome-screensaver-gl-helper
-libexec/gnome-screensaver/floaters
-libexec/gnome-screensaver/popsquares
-libexec/gnome-screensaver/slideshow
-share/applications/screensavers/cosmos-slideshow.desktop
-share/applications/screensavers/footlogo-floaters.desktop
-share/applications/screensavers/personal-slideshow.desktop
-share/applications/screensavers/popsquares.desktop
-share/desktop-directories/gnome-screensaver.directory
 share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
 share/locale/as/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ast/LC_MESSAGES/gnome-screensaver.mo
@@ -97,23 +87,7 @@ share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-share/backgrounds/cosmos/background-1.xml
-share/backgrounds/cosmos/blue-marble-west.jpg
-share/backgrounds/cosmos/cloud.jpg
-share/backgrounds/cosmos/comet.jpg
-share/backgrounds/cosmos/earth-horizon.jpg
-share/backgrounds/cosmos/galaxy-ngc3370.jpg
-share/backgrounds/cosmos/helix-nebula.jpg
-share/backgrounds/cosmos/jupiter.jpg
-share/backgrounds/cosmos/sombrero.jpg
-share/backgrounds/cosmos/whirlpool.jpg
-share/gnome-background-properties/cosmos.xml
-share/pixmaps/gnome-logo-white.svg
-@dirrm share/gnome-background-properties
-@dirrm share/backgrounds/cosmos
-@dirrmtry share/backgrounds
 @dirrmtry share/applications
-@dirrm libexec/gnome-screensaver
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES