aboutsummaryrefslogtreecommitdiff
path: root/devel/gnome-vfs
diff options
context:
space:
mode:
authorJean-Yves Lefort <jylefort@FreeBSD.org>2005-11-28 12:49:43 +0000
committerJean-Yves Lefort <jylefort@FreeBSD.org>2005-11-28 12:49:43 +0000
commit24563d9480f634ff998cace41f384c9d3909df72 (patch)
tree98e421e65576b6e171ccca3a3935f27ace907a10 /devel/gnome-vfs
parent9969531d0929fa07ff7dd61b0378659f4cf39564 (diff)
downloadports-24563d9480f634ff998cace41f384c9d3909df72.tar.gz
ports-24563d9480f634ff998cace41f384c9d3909df72.zip
Unbreak bzip2 support.
Notes
Notes: svn path=/head/; revision=149775
Diffstat (limited to 'devel/gnome-vfs')
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnome-vfs/files/patch-aa43
2 files changed, 10 insertions, 35 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 56cd876c36b4..f8f4b8af382c 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.12.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index caf6411ffeaa..0f976d16a464 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Tue Jun 1 03:53:13 2004
-+++ configure Tue Jun 1 03:53:13 2004
-@@ -22815,6 +22815,8 @@
+--- configure.orig Wed Oct 5 10:56:02 2005
++++ configure Mon Nov 28 13:34:48 2005
+@@ -23119,6 +23119,8 @@
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22897,6 +22899,7 @@
+@@ -23201,6 +23203,7 @@
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +17,7 @@
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -22904,6 +22907,7 @@
+@@ -24292,6 +24295,7 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -25,32 +25,7 @@
have_ngettext=yes
else
echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -26876,8 +26880,8 @@
- done
- fi
-
--echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+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
-@@ -26896,11 +26900,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;
- }
-@@ -28031,7 +28035,7 @@
+@@ -33558,7 +33562,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -59,7 +34,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29660,6 +29664,9 @@
+@@ -36964,6 +36968,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -69,7 +44,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
-@@ -29700,6 +29707,9 @@
+@@ -37005,6 +37012,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -79,7 +54,7 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
-@@ -31338,6 +31348,7 @@
+@@ -38439,6 +38449,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t