3 files changed, 24 insertions, 11 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 2f6d1e58a864..6e335094dedd 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,19 +3,19 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.80 2007/09/18 16:46:42 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.83 2008/03/11 03:13:07 mezz Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 USE_BZIP2=	yes
@@ -23,14 +23,17 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
-		libgnomekbd
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd
 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"
+
 GCONF_SCHEMAS=	gnome-screensaver.schemas
+MAN1=		gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
+		gnome-screensaver.1
+
 
 PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index e83e9955e264..8ebc79dc6df6 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = d166a3ebf69289331b2ebcf5c0187fd9
-SHA256 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
-SIZE (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 2013842
+MD5 (gnome2/gnome-screensaver-2.22.0.tar.bz2) = 3f307d340d511c97192a9dc9b83a69f5
+SHA256 (gnome2/gnome-screensaver-2.22.0.tar.bz2) = e6d66ad1092babe5b9a1ded2a50464e21206fa42a922ea1de0c688e764e05bfb
+SIZE (gnome2/gnome-screensaver-2.22.0.tar.bz2) = 2038929
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index fd8810021e01..7d0f70fd54b7 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -17,6 +17,8 @@ share/desktop-directories/gnome-screensaver.directory
 %%DATADIR%%/gnome-screensaver-preferences.glade
 %%DATADIR%%/lock-dialog-default.glade
 share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
+share/locale/as/LC_MESSAGES/gnome-screensaver.mo
+share/locale/be/LC_MESSAGES/gnome-screensaver.mo
 share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
@@ -36,6 +38,7 @@ share/locale/eu/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fa/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fi/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ga/LC_MESSAGES/gnome-screensaver.mo
 share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
 share/locale/he/LC_MESSAGES/gnome-screensaver.mo
@@ -53,9 +56,11 @@ share/locale/mg/LC_MESSAGES/gnome-screensaver.mo
 share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
 share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
 share/locale/or/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
@@ -91,8 +96,10 @@ share/pixmaps/backgrounds/cosmos/sombrero.jpg
 share/pixmaps/backgrounds/cosmos/whirlpool.jpg
 share/pixmaps/gnome-logo-white.svg
 @dirrm share/pixmaps/backgrounds/cosmos
-@dirrm share/pixmaps/backgrounds
+@dirrmtry share/pixmaps/backgrounds
 @dirrm %%DATADIR%%
+@dirrm share/applications/screensavers
+@dirrmtry share/applications
 @dirrm libexec/gnome-screensaver
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -102,6 +109,8 @@ share/pixmaps/gnome-logo-white.svg
 @dirrmtry share/locale/si
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -112,4 +121,5 @@ share/pixmaps/gnome-logo-white.svg
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as