From a91d27a99fc62dd4c2251b3b38fa072e009f8ed8 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 10 Dec 2002 19:04:32 +0000 Subject: Update to 2.1.4. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@248 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnomevfs2/Makefile | 2 +- devel/gnomevfs2/distinfo | 2 +- devel/gnomevfs2/files/patch-aa | 79 +++++++++++++-------------- devel/gnomevfs2/files/patch-intltool-merge.in | 11 ---- devel/gnomevfs2/pkg-plist | 39 ++++++++++++- 5 files changed, 79 insertions(+), 54 deletions(-) delete mode 100644 devel/gnomevfs2/files/patch-intltool-merge.in (limited to 'devel/gnomevfs2') diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 2df733c1f..385cd7ee1 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.1.3.1 +PORTVERSION= 2.1.4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.1 diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 22545facb..2f588a969 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.1.3.1.tar.bz2) = f28f83a450cb2f770f3ec604329b5fe3 +MD5 (gnome2/gnome-vfs-2.1.4.tar.bz2) = 29a275f5aa41810591063066561e2fe3 diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index ba7b8d4fc..e8b4cc7d0 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/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 <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/gnomevfs2/files/patch-intltool-merge.in b/devel/gnomevfs2/files/patch-intltool-merge.in deleted file mode 100644 index 1b244d7bc..000000000 --- a/devel/gnomevfs2/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) - { diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index f3cb53988..320a08e4a 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -50,7 +50,6 @@ 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 @@ -86,11 +85,23 @@ lib/vfs/2.0/extfs/zoo 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/about.html share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.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/everything-else.html share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html @@ -122,6 +133,31 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/x27.html share/doc/gnome-vfs-2.0/index.html share/doc/gnome-vfs-2.0/index.sgml share/doc/gnome-vfs-2.0/mime-registry.html @@ -132,6 +168,7 @@ 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/cs/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo -- cgit v1.2.3