mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-15 03:14:23 +00:00
4f9e6e3da5
- Use libxml2 in USE_GNOME (instead of LIB_DEPENDS) - Use USE_PYTHON_BUILD instead of USE_PYTHON - bump PORTREVISION PR: ports/115457 Submitted by: maintainer (Gea-Suan Lin)
82 lines
5.2 KiB
Plaintext
82 lines
5.2 KiB
Plaintext
--- configure.orig 2007-08-03 10:03:45.000000000 +0800
|
|
+++ configure 2007-08-03 10:08:48.000000000 +0800
|
|
@@ -21215,8 +21215,8 @@
|
|
PHP4_INCLUDES=`$PHP4_CONFIG --includes`
|
|
PHP4_LDFLAGS=`$PHP4_CONFIG --ldflags`
|
|
PHP4_LIBS=`$PHP4_CONFIG --libs`
|
|
- PHP4_UNPREFIXED_EXTENSION_DIR=`$PHP4_CONFIG --extension-dir | $SED 's/\/usr//g'`
|
|
PHP4_PREFIX=`$PHP4_CONFIG --prefix`
|
|
+ PHP4_UNPREFIXED_EXTENSION_DIR=`$PHP4_CONFIG --extension-dir | $SED "s,^$PHP4_PREFIX,,g"`
|
|
else
|
|
# We assume PHP are in /usr/local directory.
|
|
if test $MINGW -eq 1; then
|
|
@@ -21446,8 +21446,8 @@
|
|
PHP5_INCLUDES=`$PHP5_CONFIG --includes`
|
|
PHP5_LDFLAGS=`$PHP5_CONFIG --ldflags`
|
|
PHP5_LIBS=`$PHP5_CONFIG --libs`
|
|
- PHP5_UNPREFIXED_EXTENSION_DIR=`$PHP5_CONFIG --extension-dir | $SED 's/\/usr//g'`
|
|
PHP5_PREFIX=`$PHP5_CONFIG --prefix`
|
|
+ PHP5_UNPREFIXED_EXTENSION_DIR=`$PHP5_CONFIG --extension-dir | $SED "s,^$PHP5_PREFIX,,g"`
|
|
else
|
|
# We assume PHP are in /usr/local directory.
|
|
if test $MINGW -eq 1; then
|
|
@@ -22477,12 +22477,12 @@
|
|
pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
|
|
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
|
|
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; then
|
|
- pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
|
|
+ pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -22495,12 +22495,12 @@
|
|
pkg_cv_LASSO_LIBS="$LASSO_LIBS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
|
|
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
|
|
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; then
|
|
- pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
|
|
+ pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -22519,14 +22519,14 @@
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
|
|
+ LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
|
|
else
|
|
- LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
|
|
+ LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$LASSO_PKG_ERRORS" >&5
|
|
|
|
- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
|
|
+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
|
|
|
|
$LASSO_PKG_ERRORS
|
|
|
|
@@ -22537,7 +22537,7 @@
|
|
and LASSO_LIBS to avoid the need to call pkg-config.
|
|
See the pkg-config man page for more details.
|
|
" >&5
|
|
-echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
|
|
+echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
|
|
|
|
$LASSO_PKG_ERRORS
|
|
|