Update to 2.3.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@868 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 26 insertions, 70 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 533536896..1286fbd6b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.3.0
-#PORTREVISION=	0
-PORTREVISION=	1
+PORTVERSION=	2.3.3
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -30,7 +28,6 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 58d2cc8cd..1418b8261 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-2.3.0.tar.bz2) = 3bf454e05d128b4b9ae62334f0c81c49
+MD5 (gnome2/libgnome-2.3.3.tar.bz2) = 8c088aed81efd274c5c0c07f0e05034a
diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
index d8569e65c..173f6be7e 100644
--- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
+++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
@@ -1,21 +1,11 @@
---- help-converters/gnome-vfs-module/Makefile.in.orig	Tue Nov  5 00:53:20 2002
-+++ help-converters/gnome-vfs-module/Makefile.in	Tue Nov  5 00:56:05 2002
-@@ -138,15 +138,15 @@
+--- help-converters/gnome-vfs-module/Makefile.in.orig	Sat Jun 14 04:50:22 2003
++++ help-converters/gnome-vfs-module/Makefile.in	Sat Jun 14 05:06:51 2003
+@@ -146,7 +146,7 @@
  cxxflags_set = @cxxflags_set@
  gnomelocaledir = @gnomelocaledir@
  
--INCLUDES = \
--	-I$(top_srcdir)					\
-+INCLUDES =	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" \
-+	-DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) \
- 	$(HELP_VFS_MODULE_CFLAGS)		\
-     -DSERVERDIR=\"$(libexecdir)\"
+-INCLUDES =  	-I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
++INCLUDES =  	-I$(top_srcdir)		-DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\"				$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
  
  
  modules_LTLIBRARIES = libvfs-help.la
- 
--module_flags = -export_dynamic -avoid-version
-+module_flags = -export_dynamic -avoid-version -module
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- libvfs_help_la_SOURCES = \
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 21a31faff..4a73422b2 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,11 +1,11 @@
---- libgnome/Makefile.in.orig	Tue Nov  5 00:56:43 2002
-+++ libgnome/Makefile.in	Tue Nov  5 00:58:40 2002
-@@ -149,6 +149,8 @@
+--- libgnome/Makefile.in.orig	Sat Jun 14 05:07:39 2003
++++ libgnome/Makefile.in	Sat Jun 14 05:10:06 2003
+@@ -156,7 +156,7 @@
+ 
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
  
- INCLUDES = \
-+	-DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \
-+	-DX11BASE="\"$(X11BASE)"\"				\
- 	-I..							\
- 	-I$(srcdir)/..						\
- 	$(WARN_CFLAGS)						\
+-INCLUDES =  	-I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
++INCLUDES =  	-DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\" -I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
+ 
+ 
+ libgnome_2_la_SOURCES =  	libgnometypebuiltins.h		libgnometypebuiltins.c		gnome-config.c			gnome-sound.c			gnome-triggers.c		gnome-triggersP.h		gnome-program.c			gnome-help.c			gnome-exec.c			gnome-gconf.c			gnome-gconfP.h			gnome-i18n.c			gnome-i18nP.h			gnome-url.c			gnome-util.c			gnome-score.c			gnome-init.c
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index ef80f5873..05e5f8a21 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,4 +1,3 @@
-etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
@@ -15,16 +14,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/server-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
@@ -42,16 +32,7 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/server-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/start-here/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/system-settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown/%gconf.xml
 etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_applications_browser.schemas
 etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
@@ -87,7 +68,7 @@ lib/bonobo/monikers/libmoniker_extra_2.so
 lib/gnome-vfs-2.0/modules/libvfs-help.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.300
+lib/libgnome-2.so.303
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
 libexec/gnome2-db2html
@@ -115,8 +96,8 @@ share/doc/libgnome/right.png
 share/doc/libgnome/up.png
 share/doc/libgnome/x1296.html
 share/doc/libgnome/x2754.html
-share/doc/libgnome/x3411.html
-share/doc/libgnome/x4196.html
+share/doc/libgnome/x3428.html
+share/doc/libgnome/x4213.html
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
@@ -125,9 +106,11 @@ share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 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/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
+share/locale/cy/LC_MESSAGES/libgnome-2.0.mo
 share/locale/da/LC_MESSAGES/libgnome-2.0.mo
 share/locale/de/LC_MESSAGES/libgnome-2.0.mo
 share/locale/el/LC_MESSAGES/libgnome-2.0.mo
@@ -138,11 +121,13 @@ share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/he/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnome-2.0.mo
 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/ko/LC_MESSAGES/libgnome-2.0.mo
@@ -162,6 +147,8 @@ share/locale/ro/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
+share/locale/sr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
@@ -174,16 +161,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/system-settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/start-here
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/server-settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
@@ -200,16 +178,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/server-settings
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/preferences
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound