5 files changed, 70 insertions, 21 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 7f7d6cd64bae..9f75d138d598 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/Makefile,v 1.78 2006/04/13 07:52:41 bland Exp $
+#   $MCom: ports/x11/libgnome/Makefile,v 1.86 2006/09/04 18:09:21 marcus Exp $
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.14.1
-PORTREVISION?=	1
+PORTVERSION=	2.16.0
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -30,8 +30,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack esound \
 		gnomevfs2 libxslt ltverhack referencehack
 USE_BISON=	yes
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_XLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 42ba5385693f..b1d8dd00d5ff 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.14.1.tar.bz2) = bf53815df10db62bbf00defd4100b8d8
-SHA256 (gnome2/libgnome-2.14.1.tar.bz2) = 4d091bd00e01392d65a856ca5b9fe648025c5988c844d58b25341a275b760fa7
-SIZE (gnome2/libgnome-2.14.1.tar.bz2) = 995007
+MD5 (gnome2/libgnome-2.16.0.tar.bz2) = b3f030f6c677b0e1bcfca7c7e58d6c4a
+SHA256 (gnome2/libgnome-2.16.0.tar.bz2) = 78a2d66bea1d856f06fbd3348abceded8975f09c767a17f58e1d9cd8011ab710
+SIZE (gnome2/libgnome-2.16.0.tar.bz2) = 1011194
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-libgnome_gnome-util.c
index ceb23de357f2..1a7e49a84512 100644
--- a/x11/libgnome/files/patch-ag
+++ b/x11/libgnome/files/patch-libgnome_gnome-util.c
@@ -1,19 +1,19 @@
---- libgnome/gnome-util.c	2002/03/19 17:16:21	1.1
-+++ libgnome/gnome-util.c	2002/03/19 17:21:31
-@@ -67,11 +67,11 @@
- 	static char *shells [] = {
+--- libgnome/gnome-util.c.orig	Mon Jul 10 15:25:22 2006
++++ libgnome/gnome-util.c	Mon Jul 10 15:25:55 2006
+@@ -79,11 +79,11 @@
+ 	const char shells [][14] = {
  		/* Note that on some systems shells can also
  		 * be installed in /usr/bin */
 -		"/bin/bash", "/usr/bin/bash",
 -		"/bin/zsh", "/usr/bin/zsh",
 -		"/bin/tcsh", "/usr/bin/tcsh",
 -		"/bin/ksh", "/usr/bin/ksh",
--		"/bin/csh", "/bin/sh", NULL
-+		"/bin/csh", "/bin/sh",
+-		"/bin/csh", "/bin/sh"
 +		LOCALBASE "/bin/bash",
 +		LOCALBASE "/bin/zsh",
 +		LOCALBASE "/bin/ksh",
 +		0
++
  	};
  
  	if (geteuid () == getuid () &&
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 7377058cd835..c1cc3758947a 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.4 2005/11/16 00:04:58 ahze Exp $
+#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.7 2006/07/23 17:22:34 mezz Exp $
 #
 # Restore gconf keys of gnomevfs2.
 
@@ -9,11 +9,11 @@ if [ "$2" != "POST-DEINSTALL" ]; then
 	exit 0
 fi
 
-SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_default_applications.schemas
+SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_default_applications.schemas
 
 if [ -f ${SCHEMAS} ]; then
-	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
-	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+	env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \
+	%%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
 		> /dev/null || /usr/bin/true
 fi
 
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 36702bbf30a3..246d33231ca7 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -31,6 +31,7 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/be/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bs/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnome-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
@@ -57,6 +58,7 @@ share/locale/id/LC_MESSAGES/libgnome-2.0.mo
 share/locale/is/LC_MESSAGES/libgnome-2.0.mo
 share/locale/it/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ka/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
@@ -69,7 +71,6 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
-share/locale/no/LC_MESSAGES/libgnome-2.0.mo
 share/locale/or/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -97,9 +98,57 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
+@dirrm include/libgnome-2.0/libgnome
+@dirrm include/libgnome-2.0
+@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/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@dirrm include/libgnome-2.0/libgnome
-@dirrm include/libgnome-2.0
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@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/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@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/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
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be