summaryrefslogtreecommitdiff
path: root/devel/gnomevfs2/files/patch-aa
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
commitc4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch)
tree3910aa2e83f782cec94f15b4547dadb741cd29ce /devel/gnomevfs2/files/patch-aa
parentAdd gnomekeyring, an API and daemon for managing lists of credentials. This (diff)
Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever. It fixes many bugs, and adds some features missing in previous FreeBSD ports. To help users upgrade from GNOME 2.4, we have constructed an upgrade FAQ at: http://www.freebsd.org/gnome/docs/faq26.html Please read it carefully. GNOME 2.6 packages are also available for all supported i386 versions of FreeBSD at: http://www.marcuscom.com/tinderbox/ The FreeBSD GNOME Team would like the thank the following users for their wonderful testing and patching efforts. We would especially like to thank Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen. Without these people, our team, and our team alumni, GNOME on FreeBSD would not be possible. Jeremy Messenger <mezz7@cox.net> Khairil Yusof <kaeru@pd.jaring.my> Koop Mast <kwm@rainbow-runner.nl> Simon Barner <barner@in.tum.de> Tom McLaughlin <tmclaugh@sdf.lonestar.org> Scott Dodson <sdodson@sdodson.com> Vladimir Grebenschikov <vova@sw.ru>
Notes
Notes: svn path=/head/; revision=106172
Diffstat (limited to 'devel/gnomevfs2/files/patch-aa')
-rw-r--r--devel/gnomevfs2/files/patch-aa107
1 files changed, 32 insertions, 75 deletions
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 303b8e8c5b40..8273ab3fee00 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,62 +1,31 @@
---- configure.orig Tue Mar 9 14:55:35 2004
-+++ configure Tue Mar 9 16:41:53 2004
-@@ -19711,6 +19711,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -24792,6 +24793,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24844,6 +24846,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24918,6 +24921,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24970,6 +24974,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25044,6 +25049,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-@@ -25104,6 +25110,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <unistd.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -26099,8 +26106,8 @@
+--- configure.orig Sun Feb 8 16:04:02 2004
++++ configure Sun Feb 8 16:04:36 2004
+@@ -22816,6 +22816,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++ ac_check_lib_save_LIBS=$LIBS
++ LIBS="-lintl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22898,6 +22900,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -22905,6 +22908,7 @@
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+ have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26400,8 @@
done
fi
@@ -67,7 +36,7 @@
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26119,11 +26126,11 @@
+@@ -26416,11 +26420,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -81,28 +50,16 @@
;
return 0;
}
-@@ -26917,7 +26924,7 @@
+@@ -27547,7 +27551,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"
++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26982,9 +26989,9 @@
-
- msg_openssl="yes"
- if test x$with_openssl_libs != x/usr/lib; then
-- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
-+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
- else
-- OPENSSL_LIBS="-lssl -lcrypto"
-+ OPENSSL_LIBS="-lssl -lcryptofoo"
- fi
-
-
-@@ -29285,6 +29292,7 @@
+@@ -30543,6 +30547,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t