Update to 2.1.1.

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

6 files changed, 36 insertions, 37 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index a9f9154e9..e3e3b9413 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index a6d944915..1bd82d62f 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-2.1.0.tar.bz2) = 68bfa4cbe375894abee9fdbe8cfc9ef8
+MD5 (gnome2/libgnome-2.1.1.tar.bz2) = 36b9b6061317539c34340b952ca825fa
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure
index c444fc7c7..c7384c11e 100644
--- a/x11/libgnome/files/patch-configure
+++ b/x11/libgnome/files/patch-configure
@@ -1,19 +1,11 @@
 --- configure.orig	Mon May 13 13:03:40 2002
 +++ configure	Sun May 26 03:43:23 2002
-@@ -7186,6 +7186,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7471,7 +7472,7 @@
- LIBGNOME_AGE=0
+@@ -8336,7 +8336,7 @@
+
  
    case $host in
 -  *-linux-gnu | *-irix6*)
 +  *-linux-gnu | *-irix6* | *-freebsd*)
- cat >>confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
  #define HAVE_MAN_WHEREIS 1
- EOF
+ _ACEOF
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 d2267d824..d8569e65c 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,11 +1,15 @@
---- help-converters/gnome-vfs-module/Makefile.in.orig	Wed Aug  7 01:46:48 2002
-+++ help-converters/gnome-vfs-module/Makefile.in	Wed Aug  7 01:49:21 2002
-@@ -138,12 +138,12 @@
+--- 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 @@
  cxxflags_set = @cxxflags_set@
  gnomelocaledir = @gnomelocaledir@
  
--INCLUDES =  	-I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
-+INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
+-INCLUDES = \
+-	-I$(top_srcdir)					\
++INCLUDES =	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" \
++	-DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) \
+ 	$(HELP_VFS_MODULE_CFLAGS)		\
+     -DSERVERDIR=\"$(libexecdir)\"
  
  
  modules_LTLIBRARIES = libvfs-help.la
@@ -14,4 +18,4 @@
 +module_flags = -export_dynamic -avoid-version -module
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
  
- libvfs_help_la_SOURCES =  	help-method.c		help-method.h		
+ libvfs_help_la_SOURCES = \
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 68d1ba1f3..21a31faff 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/x11/libgnome/files/patch-libgnome::Makefile.in,v 1.3 2002/04/26 10:34:49 sobomax Exp $
-
---- libgnome/Makefile.in.orig	Fri Apr 26 13:14:03 2002
-+++ libgnome/Makefile.in	Fri Apr 26 13:14:03 2002
-@@ -149,7 +149,7 @@
- 
+--- 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 @@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
  
--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
+ INCLUDES = \
++	-DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \
++	-DX11BASE="\"$(X11BASE)"\"				\
+ 	-I..							\
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index cf74b24d1..f800676ba 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,3 +1,4 @@
+etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
@@ -25,6 +26,7 @@ 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/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
@@ -82,10 +84,14 @@ include/libgnome-2.0/libgnome/gnome-url.h
 include/libgnome-2.0/libgnome/gnome-util.h
 include/libgnome-2.0/libgnome/libgnome.h
 include/libgnome-2.0/libgnome/libgnometypebuiltins.h
+lib/bonobo/monikers/libmoniker_extra_2.a
+lib/bonobo/monikers/libmoniker_extra_2.la
 lib/bonobo/monikers/libmoniker_extra_2.so
+lib/gnome-vfs-2.0/modules/libvfs-help.a
+lib/gnome-vfs-2.0/modules/libvfs-help.la
 lib/gnome-vfs-2.0/modules/libvfs-help.so
 lib/libgnome-2.a
-lib/libgnome-2.so
+lib/libgnome-2.la
 lib/libgnome-2.so.0
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
@@ -108,10 +114,10 @@ share/doc/libgnome/libgnome-gnome-url.html
 share/doc/libgnome/libgnome-gnome-util.html
 share/doc/libgnome/libgnome-libgnometypebuiltins.html
 share/doc/libgnome/libgnome.html
-share/doc/libgnome/x1311.html
-share/doc/libgnome/x2881.html
-share/doc/libgnome/x3341.html
-share/doc/libgnome/x4188.html
+share/doc/libgnome/x1296.html
+share/doc/libgnome/x2754.html
+share/doc/libgnome/x3211.html
+share/doc/libgnome/x3996.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