7 files changed, 17 insertions, 15 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f457279962cf..336db2cf0b75 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	2.30.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 1b5ee9c05a40..1bb5a5cb8d9c 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-applets
 PORTVERSION=	2.32.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index e6e3ef81a210..c7bc3f8b127a 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.30.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,15 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 CONFLICTS=	gnome-screensaver-3.[0-9]*
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xtst xxf86vm
-USES=		pathfix gettext gmake pkgconfig
+USES=		pathfix gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
@@ -45,7 +44,6 @@ OPTIONS_DEFAULT=PAM KEYRING
 PAM_DESC=	Pluggable Authentication Module support
 KEYRING_DESC=	GnomeKeyring integration (needs PAM)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPAM}
@@ -85,15 +83,14 @@ pre-install:
 	@${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} && \
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
+	cd ${STAGEDIR}${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 ${PORT_OPTIONS:MPAM}
-	${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver
+	${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam \
+		${STAGEDIR}${PREFIX}/etc/pam.d/gnome-screensaver
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 37a47c3b6d1f..90c066328f18 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -5,11 +5,16 @@ bin/gnome-screensaver-preferences
 etc/xdg/autostart/gnome-screensaver.desktop
 etc/xdg/menus/gnome-screensavers.menu
 libdata/pkgconfig/gnome-screensaver.pc
+@mode 4555
 libexec/gnome-screensaver-dialog
+@mode
 libexec/gnome-screensaver-gl-helper
 libexec/gnome-screensaver/floaters
 libexec/gnome-screensaver/popsquares
 libexec/gnome-screensaver/slideshow
+man/man1/gnome-screensaver-command.1.gz
+man/man1/gnome-screensaver-preferences.1.gz
+man/man1/gnome-screensaver.1.gz
 share/applications/gnome-screensaver-preferences.desktop
 share/applications/screensavers/cosmos-slideshow.desktop
 share/applications/screensavers/footlogo-floaters.desktop
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index fa98ce4198b1..f806186d29c7 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	2.32.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index e1fe448a3b2d..0f7e01742e14 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmatekbd
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 84f5adaf050c..6a37596b8078 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mate-applets
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate