diff options
| author | dirk <dirk@FreeBSD.org> | 2002-03-22 06:11:01 +0800 |
|---|---|---|
| committer | dirk <dirk@FreeBSD.org> | 2002-03-22 06:11:01 +0800 |
| commit | 1fffa6914018334f0f4f75113d78bbacef5d49a0 (patch) | |
| tree | f4e3f4a75a7c298c3014aea09f8b2b6278ad0b68 | |
| parent | a453ef126f6006f549f9469d98dae7331f96ffa1 (diff) | |
| download | freebsd-ports-gnome-1fffa6914018334f0f4f75113d78bbacef5d49a0.tar.gz freebsd-ports-gnome-1fffa6914018334f0f4f75113d78bbacef5d49a0.tar.zst freebsd-ports-gnome-1fffa6914018334f0f4f75113d78bbacef5d49a0.zip | |
- Cleaned up XML-related extensions
- Fixed / Updated iconv-biconv-giconv-libiconv library dependencies
PR: ports/36109
Submitted by: Alex Dupre <sysadmin@alexdupre.com>
| -rw-r--r-- | www/mod_php4/scripts/configure.php | 11 | ||||
| -rw-r--r-- | www/mod_php5/scripts/configure.php | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index cb0375a9796c..bd7b2e38dc16 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -143,9 +143,8 @@ while [ "$1" ]; do ;; \"SybaseDB\") echo "LIB_DEPENDS+= sybdb.1:\${PORTSDIR}/databases/freetds" - echo "LIB_DEPENDS+= giconv.2:\${PORTSDIR}/converters/libiconv" + echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv" echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}" - LIBS="${LIBS} -L\${LOCALBASE}/lib -lgiconv" if [ "$SYBASECT" ]; then echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc @@ -155,9 +154,8 @@ while [ "$1" ]; do ;; \"SybaseCT\") echo "LIB_DEPENDS+= ct.0:\${PORTSDIR}/databases/freetds" - echo "LIB_DEPENDS+= giconv.2:\${PORTSDIR}/converters/libiconv" + echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv" echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}" - LIBS="${LIBS} -L\${LOCALBASE}/lib -lgiconv" if [ "$SYBASEDB" ]; then echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc @@ -212,13 +210,12 @@ while [ "$1" ]; do ;; \"XML\") echo "LIB_DEPENDS+= expat.2:\${PORTSDIR}/textproc/expat2" - echo "CONFIGURE_ARGS+=--with-xml --with-expat-dir=\${LOCALBASE}" + echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}" XML=1 ;; \"XSLT\") echo "LIB_DEPENDS+= sablot.67:\${PORTSDIR}/textproc/sablotron" echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot" - echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}" if [ -z "$XML" ]; then set $* \"XML\" fi @@ -242,7 +239,7 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}" ;; \"iconv\") - echo "LIB_DEPENDS+= iconv.2:\${PORTSDIR}/converters/iconv" + echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv" echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}" ICONV=1 ;; diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index cb0375a9796c..bd7b2e38dc16 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -143,9 +143,8 @@ while [ "$1" ]; do ;; \"SybaseDB\") echo "LIB_DEPENDS+= sybdb.1:\${PORTSDIR}/databases/freetds" - echo "LIB_DEPENDS+= giconv.2:\${PORTSDIR}/converters/libiconv" + echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv" echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}" - LIBS="${LIBS} -L\${LOCALBASE}/lib -lgiconv" if [ "$SYBASECT" ]; then echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc @@ -155,9 +154,8 @@ while [ "$1" ]; do ;; \"SybaseCT\") echo "LIB_DEPENDS+= ct.0:\${PORTSDIR}/databases/freetds" - echo "LIB_DEPENDS+= giconv.2:\${PORTSDIR}/converters/libiconv" + echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv" echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}" - LIBS="${LIBS} -L\${LOCALBASE}/lib -lgiconv" if [ "$SYBASEDB" ]; then echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc @@ -212,13 +210,12 @@ while [ "$1" ]; do ;; \"XML\") echo "LIB_DEPENDS+= expat.2:\${PORTSDIR}/textproc/expat2" - echo "CONFIGURE_ARGS+=--with-xml --with-expat-dir=\${LOCALBASE}" + echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}" XML=1 ;; \"XSLT\") echo "LIB_DEPENDS+= sablot.67:\${PORTSDIR}/textproc/sablotron" echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot" - echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}" if [ -z "$XML" ]; then set $* \"XML\" fi @@ -242,7 +239,7 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}" ;; \"iconv\") - echo "LIB_DEPENDS+= iconv.2:\${PORTSDIR}/converters/iconv" + echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv" echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}" ICONV=1 ;; |