Update to 2.1.4.

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

2 files changed, 39 insertions, 51 deletions

diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index ba7b8d4fc..e8b4cc7d0 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Nov 27 13:59:40 2002
-+++ configure	Fri Nov 29 14:00:09 2002
-@@ -5729,6 +5729,7 @@
+--- configure.orig	Mon Dec  9 06:29:09 2002
++++ configure	Tue Dec 10 12:50:07 2002
+@@ -7251,6 +7251,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,42 +8,41 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9419,9 +9420,9 @@
+@@ -12192,8 +12193,8 @@
    done
  fi
  
--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
+-echo "$as_me:12195: 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 $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
-@@ -9433,10 +9434,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12209,11 +12210,11 @@
+ #endif
  /* 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; }
- 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
+    builtin and then its argument prototype would still apply.  */
+-char bzCompressInit ();
++char BZ2_bzCompressInit ();
+ int
+ main ()
+ {
+-bzCompressInit ();
++BZ2_bzCompressInit ();
+   ;
+   return 0;
+ }
+@@ -12546,7 +12547,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 <<EOF
- #line 9737 "configure"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ #line 12551 "configure"
  #include "confdefs.h"
-@@ -9766,9 +9767,9 @@
+@@ -12597,9 +12598,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -53,14 +52,14 @@
 -                	OPENSSL_LIBS="-lssl -lcrypto"
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
- 		
  
-@@ -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
+ if true; then
+@@ -13794,7 +13795,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
diff --git a/devel/gnome-vfs/files/patch-intltool-merge.in b/devel/gnome-vfs/files/patch-intltool-merge.in
deleted file mode 100644
index 1b244d7bc..000000000
--- a/devel/gnome-vfs/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) 
-     {