Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

3 files changed, 40 insertions, 12 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 4656b6c54206..8deb19ee081c 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.31 2007/03/12 19:28:27 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.47 2007/10/15 17:36:20 mezz Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,16 +17,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+    		gcrypt.13:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 7be87150cd2d..d390c1f0bcd0 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.8.1.tar.bz2) = 24b15dedcf40c1c60d0fb989370d80ff
-SHA256 (gnome2/gnome-keyring-0.8.1.tar.bz2) = ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
-SIZE (gnome2/gnome-keyring-0.8.1.tar.bz2) = 448558
+MD5 (gnome2/gnome-keyring-2.20.1.tar.bz2) = 16eb73c4a23db11ee8f20a731cf2a92b
+SHA256 (gnome2/gnome-keyring-2.20.1.tar.bz2) = 69208630af42bc3eb7561161067e24eb6bfb8afc2eb73e526efd0bbe337868f8
+SIZE (gnome2/gnome-keyring-2.20.1.tar.bz2) = 546007
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 65d9dffbcaef..bde5f3d2a70e 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,12 +1,29 @@
 bin/gnome-keyring-daemon
+include/gnome-keyring-1/gnome-keyring-memory.h
+include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
+lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
+lib/security/pam_gnome_keyring.a
+lib/security/pam_gnome_keyring.la
+lib/security/pam_gnome_keyring.so
 libdata/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
 %%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/gnome-keyring-gnome-keyring.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-generic-callbacks.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyring-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyrings.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html
 %%DOCSDIR%%/gnome-keyring.devhelp
 %%DOCSDIR%%/gnome-keyring.devhelp2
 %%DOCSDIR%%/home.png
@@ -19,6 +36,7 @@ libexec/gnome-keyring-ask
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
@@ -60,6 +78,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring.mo
 share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
@@ -68,6 +87,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
 share/locale/ro/LC_MESSAGES/gnome-keyring.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring.mo
+share/locale/si/LC_MESSAGES/gnome-keyring.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
@@ -75,6 +95,7 @@ share/locale/sr/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring.mo
+share/locale/te/LC_MESSAGES/gnome-keyring.mo
 share/locale/th/LC_MESSAGES/gnome-keyring.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring.mo
@@ -84,13 +105,20 @@ share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm %%DOCSDIR%%
+@dirrmtry lib/security
 @dirrm include/gnome-keyring-1
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@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
@@ -99,3 +127,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin