diff options
Diffstat (limited to 'devel/gnome-vfs/files/patch-aa')
| -rw-r--r-- | devel/gnome-vfs/files/patch-aa | 90 |
1 files changed, 41 insertions, 49 deletions
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index 430f97e1c0d7..a5963d2046f2 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,65 +1,57 @@ $FreeBSD$ ---- configure.orig Thu Jan 24 10:25:14 2002 -+++ configure Thu Jan 24 10:38:00 2002 -@@ -5949,7 +5949,7 @@ - VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`" - VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`" - VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`" --VFS_GLIB_CONFIG="glib-config" -+VFS_GLIB_CONFIG="$GLIB_CONFIG" - - - -@@ -9854,8 +9854,8 @@ +--- configure 2002/02/16 13:00:43 1.1 ++++ configure 2002/02/16 13:03:25 +@@ -12056,8 +12056,8 @@ done fi --echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9859: checking for bzCompressInit in -lbz2" >&5 -+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9859: checking for BZ2_bzCompressInit in -lbz2" >&5 - ac_lib_var=`echo 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 -@@ -9868,10 +9868,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ +-echo "$as_me:12059: checking for bzCompressInit in -lbz2" >&5 +-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 ++echo "$as_me:12059: 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 +@@ -12073,11 +12073,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:9878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -10101,7 +10101,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; + } +@@ -12336,7 +12336,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" - cat > conftest.$ac_ext <<EOF - #line 10107 "configure" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" + cat >conftest.$ac_ext <<_ACEOF + #line 12341 "configure" #include "confdefs.h" -@@ -10135,7 +10135,7 @@ +@@ -12386,7 +12386,7 @@ EOF msg_openssl="yes" -- OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto -ldl" +- OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto" + OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo" - if true; then -@@ -10594,7 +10594,7 @@ - s%@GTK_CFLAGS@%$GTK_CFLAGS%g - s%@GTK_LIBS@%$GTK_LIBS%g - s%@cflags_set@%$cflags_set%g --s%@PTHREAD_LIB@%$PTHREAD_LIB%g -+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIBS%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g - s%@MSGFMT@%$MSGFMT%g + HAVE_SSL_TRUE= +@@ -13170,7 +13170,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_LIB,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t + s,@ALLOCA@,$ALLOCA,;t t + s,@USE_NLS@,$USE_NLS,;t t |