diff options
| author | dirk <dirk@FreeBSD.org> | 2003-02-05 14:13:21 +0000 |
|---|---|---|
| committer | dirk <dirk@FreeBSD.org> | 2003-02-05 14:13:21 +0000 |
| commit | cea4afd38a4876ce1b846ec38f96d6bc6b91bf23 (patch) | |
| tree | f797b939392bbaa86379020b761f98bf625400fd | |
| parent | 5acb4ea7fa5b57e098bd023a03ab7a9deb20eea4 (diff) | |
| download | FreeBSD-ports-cea4afd38a4876ce1b846ec38f96d6bc6b91bf23.zip FreeBSD-ports-cea4afd38a4876ce1b846ec38f96d6bc6b91bf23.tar.gz | |
Help "make describe" to find dependencies properly.
Requested by: kris
| -rw-r--r-- | www/mod_php4/Makefile | 8 | ||||
| -rw-r--r-- | www/mod_php4/scripts/configure.php | 5 | ||||
| -rw-r--r-- | www/mod_php5/Makefile | 8 | ||||
| -rw-r--r-- | www/mod_php5/scripts/configure.php | 5 |
4 files changed, 26 insertions, 0 deletions
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 22cdf24..b767a45 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -99,4 +99,12 @@ post-clean: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +# XXX: +# Has to be kept in sync with the defaults in configure.php +.ifndef(WITHOUT_MYSQL) +.ifmake describe +LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +.endif +.endif + .include <bsd.port.mk> diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 2230696e..6729ade 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -166,6 +166,7 @@ while [ "$1" ]; do \"MySQL\") echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}" + MYSQL=1 ;; \"PostgreSQL\") echo "POSTGRESQL_PORT?= databases/postgresql7" @@ -363,3 +364,7 @@ done if [ "${LIBS}" ]; then echo "CONFIGURE_ENV+= LIBS='${LIBS}'" fi + +if [ -z "${MYSQL}" ]; then + echo "WITHOUT_MYSQL= 1" +fi diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 22cdf24..b767a45 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -99,4 +99,12 @@ post-clean: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +# XXX: +# Has to be kept in sync with the defaults in configure.php +.ifndef(WITHOUT_MYSQL) +.ifmake describe +LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +.endif +.endif + .include <bsd.port.mk> diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 2230696e..6729ade 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -166,6 +166,7 @@ while [ "$1" ]; do \"MySQL\") echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}" + MYSQL=1 ;; \"PostgreSQL\") echo "POSTGRESQL_PORT?= databases/postgresql7" @@ -363,3 +364,7 @@ done if [ "${LIBS}" ]; then echo "CONFIGURE_ENV+= LIBS='${LIBS}'" fi + +if [ -z "${MYSQL}" ]; then + echo "WITHOUT_MYSQL= 1" +fi |
