3 files changed, 26 insertions, 10 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 85c84cc859db..2f16db01e622 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,15 +3,14 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.23 2005/11/03 19:04:24 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.36 2006/04/13 07:52:40 bland Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	0.0.24
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
@@ -22,11 +21,10 @@ RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus
 CONFIGURE_ARGS=	--disable-pam \
-		--with-gdm-config=${X11BASE}/etc/gdm/gdm.conf \
+		--with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -41,7 +39,7 @@ XSCREENSAVER_DIR=	${X11BASE}/share/xscreensaver/config
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Does not build on 4.X"
+BROKEN=	Does not build on 4.X
 .endif
 
 post-patch:
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 8cc7b9e172f7..e61ff6d26ce8 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-screensaver-0.0.24.tar.bz2) = 767ac5360e7ba1c218cad725b21f78e1
-SHA256 (gnome-screensaver-0.0.24.tar.bz2) = f846cc6a04edbe47f283c0199cfb1e36b61667f8e0698da818d69fa0e71e4b11
-SIZE (gnome-screensaver-0.0.24.tar.bz2) = 1880715
+MD5 (gnome-screensaver-2.14.1.tar.bz2) = 59181612c8a5c8be7f0a392baba5245d
+SHA256 (gnome-screensaver-2.14.1.tar.bz2) = a29fb020d036a430f5975c07fb058df32b8ed36d9709239c54ce3493941cb95d
+SIZE (gnome-screensaver-2.14.1.tar.bz2) = 1913984
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index b28466983a84..48be81fe6464 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -2,6 +2,7 @@ bin/gnome-screensaver
 bin/gnome-screensaver-command
 bin/gnome-screensaver-preferences
 etc/xdg/menus/gnome-screensavers.menu
+libdata/pkgconfig/gnome-screensaver.pc
 libexec/gnome-screensaver-dialog
 libexec/gnome-screensaver/floaters
 libexec/gnome-screensaver/popsquares
@@ -24,26 +25,40 @@ share/gnome/pixmaps/backgrounds/cosmos/sombrero.jpg
 share/gnome/pixmaps/backgrounds/cosmos/whirlpool.jpg
 share/gnome/pixmaps/gnome-logo-white.svg
 share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
+share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ca/LC_MESSAGES/gnome-screensaver.mo
 share/locale/cs/LC_MESSAGES/gnome-screensaver.mo
+share/locale/cy/LC_MESSAGES/gnome-screensaver.mo
+share/locale/da/LC_MESSAGES/gnome-screensaver.mo
 share/locale/de/LC_MESSAGES/gnome-screensaver.mo
+share/locale/dz/LC_MESSAGES/gnome-screensaver.mo
+share/locale/el/LC_MESSAGES/gnome-screensaver.mo
 share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo
 share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo
 share/locale/es/LC_MESSAGES/gnome-screensaver.mo
+share/locale/et/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fi/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
+share/locale/hi/LC_MESSAGES/gnome-screensaver.mo
 share/locale/hu/LC_MESSAGES/gnome-screensaver.mo
 share/locale/it/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ja/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ka/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
 share/locale/lt/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/no/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
+share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
@@ -51,7 +66,10 @@ share/locale/th/LC_MESSAGES/gnome-screensaver.mo
 share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
 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
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/pixmaps/backgrounds/cosmos
 @dirrm share/gnome/pixmaps/backgrounds
 @dirrm libexec/gnome-screensaver