From 3680f27ebff58ece429c4e032f9ad84fb1372114 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Sat, 20 Nov 2010 15:37:08 +0000 Subject: Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this release can be found at http://library.gnome.org/misc/release-notes/2.32/ This will be the last release of the GNOME 2.x series, mainly a bugfix and bridge release to the first release of the GNOME 3.x series. This release features commits by avl, marcus, mezz and myself. The FreeBSD GNOME Team would like to thank the following contributors and testers for there help with this release: Zane C.B. romain@ Olaf Seibert DomiX Bapt jsa@ miwi@ Sergio de Almeida Lenzi Maxim Samsonov Kris Moore And pav@ for 2 exp-runs PR: ports/152255 ports/143260 ports/141033 ports/149629 ports/150350 ports/151523 With hat: gnome@ --- databases/libgda4/files/patch-configure | 62 +++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 14 deletions(-) (limited to 'databases/libgda4/files/patch-configure') diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure index 6e42fcfab8ff..cf6a34b0c4ae 100644 --- a/databases/libgda4/files/patch-configure +++ b/databases/libgda4/files/patch-configure @@ -1,14 +1,48 @@ ---- configure.orig 2010-06-23 23:07:54.000000000 +0200 -+++ configure 2010-06-23 23:09:57.000000000 +0200 -@@ -18629,9 +18629,9 @@ - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\${datadir}|"` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\${libdir}|"` - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +--- configure.orig 2010-11-14 17:29:29.000000000 +0100 ++++ configure 2010-11-14 17:33:39.000000000 +0100 +@@ -19487,9 +19487,9 @@ + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=$introspection_makefile +@@ -19586,7 +19586,7 @@ + echo "$LIBCRYPTO_PKG_ERRORS" >&5 + + if test "$enable_crypto" = "yes"; then +- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 ++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 + fi + have_crypto=no + +@@ -19594,7 +19594,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + if test "$enable_crypto" = "yes"; then +- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 ++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 + fi + have_crypto=no + +@@ -21772,6 +21772,15 @@ + fi + CFLAGS="$save_CFLAGS" + fi ++ else ++ if false; then ++ MDB_TRUE= ++ MDB_FALSE='#' ++else ++ MDB_TRUE='#' ++ MDB_FALSE= ++fi ++ + fi + + if test "$mdbtools_found" = "yes"; then -- cgit v1.2.3