diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-04 07:16:46 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-04 07:16:46 +0000 |
commit | e240641bba43d02765e51c574a785fc509c12943 (patch) | |
tree | 8c4d05d0a1c75a6d8cfcd1b07cd959b315e4956a /devel/gnome-vfs | |
parent | Update to 2.2.1. (diff) |
Update to 2.2.4.
Notes
Notes:
svn path=/head/; revision=78112
Diffstat (limited to 'devel/gnome-vfs')
-rw-r--r-- | devel/gnome-vfs/Makefile | 2 | ||||
-rw-r--r-- | devel/gnome-vfs/distinfo | 2 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-aa | 19 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-magic.c | 20 | ||||
-rw-r--r-- | devel/gnome-vfs/pkg-plist | 5 |
5 files changed, 36 insertions, 12 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 708c2dc48f4e..819529a16103 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 3aacf06aa806..58fcd076cb55 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.2.2.tar.bz2) = 02845c284b27d1bed89176b72cb17890 +MD5 (gnome2/gnome-vfs-2.2.4.tar.bz2) = 6f7e62ef65aa9690d25ed13e822e67d7 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index b8b7c365ee84..9cad28559cc4 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 13 09:43:49 2003 -+++ configure Tue Jan 14 00:48:38 2003 -@@ -8122,6 +8122,7 @@ +--- configure.orig Mon Mar 31 06:11:24 2003 ++++ configure Mon Mar 31 18:06:17 2003 +@@ -8344,6 +8344,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12680,8 +12681,8 @@ +@@ -13091,8 +13092,8 @@ done fi @@ -19,7 +19,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12697,11 +12698,11 @@ +@@ -13112,11 +13113,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,7 +33,7 @@ ; return 0; } -@@ -13245,7 +13246,7 @@ +@@ -13858,7 +13859,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41,8 +41,8 @@ + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" - #include "confdefs.h" -@@ -13296,9 +13297,9 @@ + /* confdefs.h. */ +@@ -13914,9 +13915,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -54,11 +54,10 @@ fi -@@ -14894,7 +14895,7 @@ +@@ -15904,6 +15905,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,@USE_NLS@,$USE_NLS,;t t diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-magic.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-magic.c new file mode 100644 index 000000000000..8c6f8de03c90 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-magic.c @@ -0,0 +1,20 @@ +--- libgnomevfs/gnome-vfs-mime-magic.c.orig Mon Mar 10 18:49:02 2003 ++++ libgnomevfs/gnome-vfs-mime-magic.c Mon Mar 10 18:49:06 2003 +@@ -759,6 +759,9 @@ + + if (g_utf8_get_char_validated(end, remaining_bytes) == -2) + return TRUE; ++ /* XXX This next section can't be used until FreeBSD gets a ++ * working wchar.h and wctype.h. */ ++#if 0 + else { + size_t wlen; + wchar_t wc; +@@ -802,6 +805,7 @@ + } + return TRUE; + } ++#endif + } + } + diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index e94dbe1d1266..4d619a3f8132 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -184,15 +184,18 @@ 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/bn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bs/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 +share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo @@ -207,6 +210,7 @@ share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo @@ -225,6 +229,7 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 |