Update to 2.1.3.1.

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

8 files changed, 82 insertions, 91 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index e11265bde..2df733c1f 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.3.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.1
@@ -16,7 +15,6 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2
 LIB_DEPENDS=	gconf-2.5:${PORTSDIR}/devel/gconf2 \
 		bonobo-2.0:${PORTSDIR}/devel/libbonobo
 
@@ -30,7 +28,7 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 1903f7109..22545facb 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.1.3.tar.bz2) = 807d42925b4ea0fc33448561fdb2e08b
+MD5 (gnome2/gnome-vfs-2.1.3.1.tar.bz2) = f28f83a450cb2f770f3ec604329b5fe3
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 8cb4f90e3..ba7b8d4fc 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,24 +1,6 @@
---- configure.orig	Sat Nov  2 03:18:30 2002
-+++ configure	Wed Nov 13 13:33:48 2002
-@@ -261,7 +261,7 @@
- : ${ac_max_here_lines=38}
- 
- ac_unique_file="libgnomevfs/gnome-vfs.h"
--ac_subdirs_all="$ac_subdirs_all gob"
-+ac_subdirs_all="$ac_subdirs_all"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-@@ -1666,7 +1666,7 @@
- 
- touch NOINST_GOB
- 
--subdirs="$subdirs gob"
-+subdirs="$subdirs"
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -7268,6 +7268,7 @@
+--- configure.orig	Wed Nov 27 13:59:40 2002
++++ configure	Fri Nov 29 14:00:09 2002
+@@ -5729,6 +5729,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -26,41 +8,42 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12208,8 +12209,8 @@
+@@ -9419,9 +9420,9 @@
    done
  fi
  
--echo "$as_me:12211: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12211: checking for BZ2_bzCompressInit in -lbz2" >&5
-+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
- if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
+-echo "configure:9424: checking for bzCompressInit in -lbz2" >&5
+-ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
++echo "configure:9424: checking for BZ2_bzCompressInit in -lbz2" >&5
++ac_lib_var=`echo bz2'_'BZ2_bzCompressInit | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12225,11 +12226,11 @@
- #endif
+@@ -9433,10 +9434,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char bzCompressInit ();
-+char BZ2_bzCompressInit ();
- int
- main ()
- {
--bzCompressInit ();
-+BZ2_bzCompressInit ();
-   ;
-   return 0;
- }
-@@ -12562,7 +12563,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+     builtin and then its argument prototype would still apply.  */
+-char bzCompressInit();
++char BZ2_bzCompressInit();
  
+ int main() {
+-bzCompressInit()
++BZ2_bzCompressInit()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:9443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9731,7 +9732,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
- 		cat >conftest.$ac_ext <<_ACEOF
- #line 12567 "configure"
+ 		cat > conftest.$ac_ext <<EOF
+ #line 9737 "configure"
  #include "confdefs.h"
-@@ -12613,9 +12614,9 @@
+@@ -9766,9 +9767,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -70,14 +53,14 @@
 -                	OPENSSL_LIBS="-lssl -lcrypto"
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
+ 		
  
- if true; then
-@@ -13810,7 +13811,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
--s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t
-+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIB,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
- s,@USE_NLS@,$USE_NLS,;t t
+@@ -10598,7 +10599,7 @@
+ s%@ORBIT_IDL@%$ORBIT_IDL%g
+ s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g
+ s%@WARN_CFLAGS@%$WARN_CFLAGS%g
+-s%@PTHREAD_LIB@%$PTHREAD_LIB%g
++s%@PTHREAD_LIB@%$BSD_PTHREAD_LIBS%g
+ s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@USE_NLS@%$USE_NLS%g
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index dbbed495f..cade41342 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,16 +1,11 @@
---- Makefile.in.orig	Wed Nov 13 13:29:42 2002
-+++ Makefile.in	Wed Nov 13 13:33:11 2002
-@@ -171,13 +171,11 @@
+--- Makefile.in.orig	Fri Nov 29 13:34:31 2002
++++ Makefile.in	Fri Nov 29 13:34:59 2002
+@@ -171,7 +171,7 @@
+ 
  SUBDIRS_GNOME = monikers doc schemas
  
- SUBDIRS = \
--	gob					\
- 	libgnomevfs				\
- 	modules					\
- 	schemas					\
- 	devel-docs				\
- 	doc					\
--	test					\
- 	monikers				\
- 	po
+-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
++SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
+ 
  
+ EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
diff --git a/devel/gnomevfs2/files/patch-intltool-merge.in b/devel/gnomevfs2/files/patch-intltool-merge.in
new file mode 100644
index 000000000..1b244d7bc
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-intltool-merge.in
@@ -0,0 +1,11 @@
+--- intltool-merge.in.orig	Fri Nov 29 13:54:19 2002
++++ intltool-merge.in	Fri Nov 29 13:54:30 2002
+@@ -461,7 +461,7 @@
+ {
+     my ($pre_encoded) = @_;
+ 
+-    my @list_of_chars = unpack ('U*', $pre_encoded);
++    my @list_of_chars = unpack ('C*', $pre_encoded);
+ 
+     if ($PASS_THROUGH_ARG) 
+     {
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index a013d0a77..122991c9d 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,20 +1,11 @@
---- libgnomevfs/Makefile.in.orig	Wed Nov 13 13:29:42 2002
-+++ libgnomevfs/Makefile.in	Wed Nov 13 13:32:39 2002
-@@ -335,7 +335,7 @@
- 
+--- libgnomevfs/Makefile.in.orig	Fri Nov 29 13:41:05 2002
++++ libgnomevfs/Makefile.in	Fri Nov 29 13:41:33 2002
+@@ -215,7 +215,7 @@
+ # CLEANFILES = $(BUILT_SOURCES)
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- 	gnome-vfs-file-size.h
- 
-@@ -935,7 +935,7 @@
- 
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
  
- %.c %.h: %.gob
--	$(top_srcdir)/gob/src/gob2 $<
-+	%%LOCALBASE%%/bin/gob2 $<
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c
new file mode 100644
index 000000000..a07d0bc81
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c
@@ -0,0 +1,11 @@
+--- modules/vfolder/vfolder-info.c.orig	Fri Nov 29 13:40:11 2002
++++ modules/vfolder/vfolder-info.c	Fri Nov 29 13:40:19 2002
+@@ -1721,7 +1721,7 @@
+ 
+ 			for (i = 0; ppath[i] != NULL; i++) {
+ 				dir = g_build_filename (ppath[i], 
+-							"/share/applications/",
++							"/share/gnome/applications/",
+ 							NULL);
+ 				id = itemdir_new (info, 
+ 						  dir, 
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index f7e06f449..f3cb53988 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -22,7 +22,6 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-metadata.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
@@ -51,6 +50,7 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
+lib/gnome-vfs-2.0/modules/libconsole.so
 lib/gnome-vfs-2.0/modules/libextfs.so
 lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.so
@@ -87,7 +87,7 @@ libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
 share/doc/gnome-vfs-2.0/advanced-operations.html
-share/doc/gnome-vfs-2.0/c9746.html
+share/doc/gnome-vfs-2.0/c9466.html
 share/doc/gnome-vfs-2.0/data-types.html
 share/doc/gnome-vfs-2.0/directory-operations.html
 share/doc/gnome-vfs-2.0/file-operations.html
@@ -129,6 +129,7 @@ share/doc/gnome-vfs-2.0/modules.html
 share/doc/gnome-vfs-2.0/writing-modules.html
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -159,6 +160,7 @@ share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo