diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-03-11 20:35:07 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-03-11 20:35:07 +0000 |
| commit | 50ae5fa2f3c68c7e4e53db017860e18eecaa3391 (patch) | |
| tree | b42869c23a274efbea1f371ff341d1fa3e55997a /devel/gnome-vfs/files | |
| parent | 61f3012796bd57adc13da59d677de0f04d9a59f5 (diff) | |
| download | FreeBSD-ports-50ae5fa2f3c68c7e4e53db017860e18eecaa3391.zip FreeBSD-ports-50ae5fa2f3c68c7e4e53db017860e18eecaa3391.tar.gz | |
Bring up already ported portion on GNOME2 development platform on par with
GNOME2 beta2 release.
Diffstat (limited to 'devel/gnome-vfs/files')
| -rw-r--r-- | devel/gnome-vfs/files/patch-aa | 20 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-intltool-merge.in | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index e6ade3b..bd10b13 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,20 +1,20 @@ $FreeBSD$ ---- configure.orig Wed Feb 27 12:00:58 2002 -+++ configure Wed Feb 27 12:02:16 2002 -@@ -11963,8 +11963,8 @@ +--- configure.orig Mon Mar 11 21:42:05 2002 ++++ configure Mon Mar 11 21:42:37 2002 +@@ -11993,8 +11993,8 @@ done fi --echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5 +-echo "$as_me:11996: checking for bzCompressInit in -lbz2" >&5 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 -+echo "$as_me:11966: checking for BZ2_bzCompressInit in -lbz2" >&5 ++echo "$as_me:11996: 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 -@@ -11980,11 +11980,11 @@ +@@ -12010,11 +12010,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -28,16 +28,16 @@ $FreeBSD$ ; return 0; } -@@ -12296,7 +12296,7 @@ +@@ -12326,7 +12326,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 <<_ACEOF - #line 12301 "configure" + #line 12331 "configure" #include "confdefs.h" -@@ -12347,9 +12347,9 @@ +@@ -12377,9 +12377,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -49,7 +49,7 @@ $FreeBSD$ fi if true; then -@@ -13227,7 +13227,7 @@ +@@ -13259,7 +13259,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnome-vfs/files/patch-intltool-merge.in b/devel/gnome-vfs/files/patch-intltool-merge.in index 3d34ddf..d5a424f 100644 --- a/devel/gnome-vfs/files/patch-intltool-merge.in +++ b/devel/gnome-vfs/files/patch-intltool-merge.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- intltool-merge.in.orig Mon Feb 11 23:40:38 2002 -+++ intltool-merge.in Wed Feb 27 12:03:10 2002 -@@ -287,7 +287,7 @@ +--- intltool-merge.in.orig Sun Mar 10 01:56:09 2002 ++++ intltool-merge.in Mon Mar 11 21:43:48 2002 +@@ -290,7 +290,7 @@ if (lc $encoding eq "utf-8") { open PO_FILE, "<$po_file"; } else { -- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|"; -+ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|"; +- my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; ++ my $iconv = $ENV{"INTLTOOL_ICONV"} || "giconv"; + open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } } else { - open PO_FILE, "<$po_file"; |
