Update to 2.1.91.

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

12 files changed, 84 insertions, 66 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index babceaf6e..f5a9b8310 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.1.6
+PORTVERSION=	2.1.91
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.1
@@ -38,5 +38,7 @@ post-patch:
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 8624f0d69..51f42aa2a 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.1.6.tar.bz2) = 3b2fac675bba39c73faf94bf412e3ed5
+MD5 (gnome2/gnome-vfs-2.1.91.tar.bz2) = 610236aee0e6e59a19d7c6f47ed0a5cb
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index e8b4cc7d0..b8b7c365e 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Dec  9 06:29:09 2002
-+++ configure	Tue Dec 10 12:50:07 2002
-@@ -7251,6 +7251,7 @@
+--- configure.orig	Mon Jan 13 09:43:49 2003
++++ configure	Tue Jan 14 00:48:38 2003
+@@ -8122,6 +8122,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12192,8 +12193,8 @@
+@@ -12680,8 +12681,8 @@
    done
  fi
  
--echo "$as_me:12195: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12195: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:$LINENO: 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
  else
-@@ -12209,11 +12210,11 @@
+@@ -12697,11 +12698,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +33,16 @@
    ;
    return 0;
  }
-@@ -12546,7 +12547,7 @@
+@@ -13245,7 +13246,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&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 12551 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -12597,9 +12598,9 @@
+@@ -13296,9 +13297,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -53,13 +53,13 @@
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
  
- if true; then
-@@ -13794,7 +13795,7 @@
+ 
+@@ -14894,7 +14895,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_LIBS,;t t
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
+ s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index cade41342..3c0b987bb 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Fri Nov 29 13:34:31 2002
-+++ Makefile.in	Fri Nov 29 13:34:59 2002
-@@ -171,7 +171,7 @@
+--- Makefile.in.orig	Tue Jan 14 00:48:58 2003
++++ Makefile.in	Tue Jan 14 00:50:11 2003
+@@ -177,7 +177,6 @@
+ 	schemas					\
+ 	devel-docs				\
+ 	doc					\
+-	test					\
+ 	monikers				\
+ 	po
  
- SUBDIRS_GNOME = monikers doc schemas
- 
--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/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index 122991c9d..6e6adc745 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- 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 @@
+--- libgnomevfs/Makefile.in.orig	Tue Jan 14 00:50:29 2003
++++ libgnomevfs/Makefile.in	Tue Jan 14 00:51:03 2003
+@@ -341,7 +341,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
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
index c9cffae7a..39d34d557 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,6 +1,14 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Sun May  5 17:01:22 2002
-+++ libgnomevfs/gnome-vfs-utils.c	Sun May  5 17:02:24 2002
-@@ -774,7 +774,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Dec 20 16:15:06 2002
++++ libgnomevfs/gnome-vfs-utils.c	Tue Jan 14 00:54:10 2003
+@@ -40,6 +40,7 @@
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -861,7 +862,7 @@
  	paths = g_strsplit (gnome_var, ":", 0); 
  
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index babceaf6e..f5a9b8310 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.1.6
+PORTVERSION=	2.1.91
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.1
@@ -38,5 +38,7 @@ post-patch:
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 8624f0d69..51f42aa2a 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.1.6.tar.bz2) = 3b2fac675bba39c73faf94bf412e3ed5
+MD5 (gnome2/gnome-vfs-2.1.91.tar.bz2) = 610236aee0e6e59a19d7c6f47ed0a5cb
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index e8b4cc7d0..b8b7c365e 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Dec  9 06:29:09 2002
-+++ configure	Tue Dec 10 12:50:07 2002
-@@ -7251,6 +7251,7 @@
+--- configure.orig	Mon Jan 13 09:43:49 2003
++++ configure	Tue Jan 14 00:48:38 2003
+@@ -8122,6 +8122,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12192,8 +12193,8 @@
+@@ -12680,8 +12681,8 @@
    done
  fi
  
--echo "$as_me:12195: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12195: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:$LINENO: 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
  else
-@@ -12209,11 +12210,11 @@
+@@ -12697,11 +12698,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +33,16 @@
    ;
    return 0;
  }
-@@ -12546,7 +12547,7 @@
+@@ -13245,7 +13246,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&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 12551 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -12597,9 +12598,9 @@
+@@ -13296,9 +13297,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -53,13 +53,13 @@
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
  
- if true; then
-@@ -13794,7 +13795,7 @@
+ 
+@@ -14894,7 +14895,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_LIBS,;t t
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
+ s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index cade41342..3c0b987bb 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Fri Nov 29 13:34:31 2002
-+++ Makefile.in	Fri Nov 29 13:34:59 2002
-@@ -171,7 +171,7 @@
+--- Makefile.in.orig	Tue Jan 14 00:48:58 2003
++++ Makefile.in	Tue Jan 14 00:50:11 2003
+@@ -177,7 +177,6 @@
+ 	schemas					\
+ 	devel-docs				\
+ 	doc					\
+-	test					\
+ 	monikers				\
+ 	po
  
- SUBDIRS_GNOME = monikers doc schemas
- 
--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-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 122991c9d..6e6adc745 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- 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 @@
+--- libgnomevfs/Makefile.in.orig	Tue Jan 14 00:50:29 2003
++++ libgnomevfs/Makefile.in	Tue Jan 14 00:51:03 2003
+@@ -341,7 +341,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
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index c9cffae7a..39d34d557 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,6 +1,14 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Sun May  5 17:01:22 2002
-+++ libgnomevfs/gnome-vfs-utils.c	Sun May  5 17:02:24 2002
-@@ -774,7 +774,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Dec 20 16:15:06 2002
++++ libgnomevfs/gnome-vfs-utils.c	Tue Jan 14 00:54:10 2003
+@@ -40,6 +40,7 @@
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -861,7 +862,7 @@
  	paths = g_strsplit (gnome_var, ":", 0); 
  
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {