Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD.  This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.

But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:

Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>

Enjoy!

Approved by:	portmgr (implicit, kris)

4 files changed, 90 insertions, 28 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 20ac6e499dfc..efc70f133bde 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,37 +3,42 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.36 2006/04/13 07:52:40 bland Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.58 2006/10/07 19:45:39 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	2.14.3
+PORTVERSION=	2.16.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
-LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus
-CONFIGURE_ARGS=	--with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
+CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
-		--with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks
+		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-
 GCONF_SCHEMAS=	gnome-screensaver.schemas
 
 PLIST=	${WRKDIR}/pkg-plist
 
-XSCREENSAVER_DIR=	${X11BASE}/share/xscreensaver/config
+XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
+SCREENSAVER_DIR=	share/gnome/applications/screensavers
+
+XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
 OPTIONS=	PAM "Pluggable Authentication Module support" off
 
@@ -47,25 +52,20 @@ BROKEN=	Does not build on 4.X
 CONFIGURE_ARGS+=	--disable-pam
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/configure
-
 pre-install:
 	@${CP} ${.CURDIR}/pkg-plist ${PLIST}
 	@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
-		${SED} -e 's:^:share/gnome/gnome-screensaver/themes/xscreensaver/:' | \
+		${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
+		${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
 		${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
-	@${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes/xscreensaver >> ${PLIST}
-	@${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes >> ${PLIST}
-	@${ECHO_CMD} @dirrm share/gnome/gnome-screensaver >> ${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}/share/gnome/gnome-screensaver/themes/xscreensaver
-	cd ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver && \
+	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
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index ea6585adfd5b..ed227ab528a8 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-screensaver-2.14.3.tar.bz2) = 2ed0b9322d284bb1739e037165ca94f2
-SHA256 (gnome-screensaver-2.14.3.tar.bz2) = 3e3fea74513361ec07ee97472be98b8df3749bd09289bcf72a341d0fbc53cdd1
-SIZE (gnome-screensaver-2.14.3.tar.bz2) = 1934769
+MD5 (gnome2/gnome-screensaver-2.16.1.tar.bz2) = af29aeb60a9908f6562664962129ff88
+SHA256 (gnome2/gnome-screensaver-2.16.1.tar.bz2) = 574dd2a987375e0087831e23d650862d5064fdfd43f951f426084cd57cdad2a9
+SIZE (gnome2/gnome-screensaver-2.16.1.tar.bz2) = 2008446
diff --git a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
new file mode 100644
index 000000000000..94d68b8f3a57
--- /dev/null
+++ b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
@@ -0,0 +1,11 @@
+--- src/gs-auth-pam.c.orig	Mon Aug 14 19:57:29 2006
++++ src/gs-auth-pam.c	Mon Aug 14 20:07:43 2006
+@@ -204,7 +204,7 @@ pam_conversation (int                   
+                         if (res) {
+                                 reply [replies].resp_retcode = PAM_SUCCESS;
+                         } else {
+-                                reply [replies].resp_retcode = PAM_INCOMPLETE;
++                                reply [replies].resp_retcode = PAM_TRY_AGAIN;
+                         }
+                 }
+         }
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 4d07d26f2189..04c2d2d912db 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -4,16 +4,18 @@ bin/gnome-screensaver-preferences
 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/gnome/applications/gnome-screensaver-preferences.desktop
+share/gnome/applications/screensavers/cosmos-slideshow.desktop
+share/gnome/applications/screensavers/footlogo-floaters.desktop
+share/gnome/applications/screensavers/personal-slideshow.desktop
+share/gnome/applications/screensavers/popsquares.desktop
 share/gnome/desktop-directories/gnome-screensaver.directory
 share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
-share/gnome/gnome-screensaver/themes/cosmos-slideshow.desktop
-share/gnome/gnome-screensaver/themes/footlogo-floaters.desktop
-share/gnome/gnome-screensaver/themes/personal-slideshow.desktop
-share/gnome/gnome-screensaver/themes/popsquares.desktop
+share/gnome/gnome-screensaver/lock-dialog-default.glade
 share/gnome/pixmaps/backgrounds/cosmos/cloud.jpg
 share/gnome/pixmaps/backgrounds/cosmos/comet.jpg
 share/gnome/pixmaps/backgrounds/cosmos/earth-horizon.jpg
@@ -26,6 +28,7 @@ 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/bn_IN/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
@@ -37,6 +40,8 @@ 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/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/gl/LC_MESSAGES/gnome-screensaver.mo
@@ -52,28 +57,74 @@ 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/lv/LC_MESSAGES/gnome-screensaver.mo
+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/nb/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
-share/locale/no/LC_MESSAGES/gnome-screensaver.mo
+share/locale/or/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/ru/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sl/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
+share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
 share/locale/th/LC_MESSAGES/gnome-screensaver.mo
+share/locale/tr/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 share/gnome/gnome-screensaver
 @dirrm libexec/gnome-screensaver
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN