diff options
author | James E. Housley <jeh@FreeBSD.org> | 2003-11-20 11:10:00 +0000 |
---|---|---|
committer | James E. Housley <jeh@FreeBSD.org> | 2003-11-20 11:10:00 +0000 |
commit | 8bbc9242c65475fd1f1c2f4f7821d61d1c99e24f (patch) | |
tree | 56138f445eaeb88df555225163b1f5b4fc371b53 | |
parent | A completely new bsd.php.mk file for checking and selecting dependencies (diff) |
Add WITH_DEBUG knob and support for the new bsd.php.mk file.
Forgotten in previous PR: add also BROKEN_WITH_PHP knob.
PR: 59418
Submitted by: MAINTAINER
Notes
Notes:
svn path=/head/; revision=94454
-rw-r--r-- | lang/php5/Makefile | 36 | ||||
-rw-r--r-- | lang/php5/pkg-plist | 1 | ||||
-rw-r--r-- | lang/php53/Makefile | 36 | ||||
-rw-r--r-- | lang/php53/pkg-plist | 1 |
4 files changed, 68 insertions, 6 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 8e6c686fc911..6db664cdd1b6 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -21,7 +21,7 @@ PORTNAME= php5 PORTVERSION= 5.0.0.a3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ http://it.php.net/distributions/:release \ @@ -86,6 +86,11 @@ CONFIGURE_ARGS+=--with-regex=apache EXT_DIR= 20020429 SAPI_FILE= "@comment " +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +EXT_DIR:= ${EXT_DIR}-debug +.endif + CONFLICTS= php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) @@ -401,7 +406,7 @@ CONFIGURE_ARGS+=--enable-posix .endif .if defined(WITH_POSTGRESQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7-client CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif @@ -614,13 +619,37 @@ pre-configure: @${ECHO_CMD} "" .endif -.if !defined(WITHOUT_CLI) post-build: + @${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_PORT=${.CURDIR}" >> ${WRKDIR}/php.conf +.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR) + @${ECHO_CMD} "PHP_PEAR=yes" >> ${WRKDIR}/php.conf +.else + @${ECHO_CMD} "PHP_PEAR=no" >> ${WRKDIR}/php.conf +.endif +.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=full" >> ${WRKDIR}/php.conf +.else +.if defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=cli" >> ${WRKDIR}/php.conf +.endif +.if !defined(WITHOUT_APACHE) && defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=mod" >> ${WRKDIR}/php.conf +.endif +.if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=cgi" >> ${WRKDIR}/php.conf +.endif +.endif +.if !defined(WITHOUT_CLI) @${ECHO_CMD} "You may run the tests from the PHP test framework, typing 'make test' now." @${ECHO_CMD} "(It is safe to ignore errors about timestamp-related tests," @${ECHO_CMD} "since they are due to the different FreeBSD mktime() implementation)." @${ECHO_CMD} "" +.endif +.if !defined(WITHOUT_CLI) test: all @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${.TARGET}) @@ -632,6 +661,7 @@ post-install: .endif @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc + @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc @${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php @${TOUCH} ${PREFIX}/include/php/ext/xml/expat/.php .if !defined(WITHOUT_APACHE) diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index 55b68d7d6a2a..c3f8b04e8357 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -3,6 +3,7 @@ bin/php-config bin/phpextdist bin/phpize +etc/php.conf etc/php.ini-dist etc/php.ini-recommended include/php/TSRM/TSRM.h diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 8e6c686fc911..6db664cdd1b6 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -21,7 +21,7 @@ PORTNAME= php5 PORTVERSION= 5.0.0.a3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ http://it.php.net/distributions/:release \ @@ -86,6 +86,11 @@ CONFIGURE_ARGS+=--with-regex=apache EXT_DIR= 20020429 SAPI_FILE= "@comment " +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +EXT_DIR:= ${EXT_DIR}-debug +.endif + CONFLICTS= php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) @@ -401,7 +406,7 @@ CONFIGURE_ARGS+=--enable-posix .endif .if defined(WITH_POSTGRESQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7-client CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif @@ -614,13 +619,37 @@ pre-configure: @${ECHO_CMD} "" .endif -.if !defined(WITHOUT_CLI) post-build: + @${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_PORT=${.CURDIR}" >> ${WRKDIR}/php.conf +.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR) + @${ECHO_CMD} "PHP_PEAR=yes" >> ${WRKDIR}/php.conf +.else + @${ECHO_CMD} "PHP_PEAR=no" >> ${WRKDIR}/php.conf +.endif +.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=full" >> ${WRKDIR}/php.conf +.else +.if defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=cli" >> ${WRKDIR}/php.conf +.endif +.if !defined(WITHOUT_APACHE) && defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=mod" >> ${WRKDIR}/php.conf +.endif +.if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI) + @${ECHO_CMD} "PHP_SAPI=cgi" >> ${WRKDIR}/php.conf +.endif +.endif +.if !defined(WITHOUT_CLI) @${ECHO_CMD} "You may run the tests from the PHP test framework, typing 'make test' now." @${ECHO_CMD} "(It is safe to ignore errors about timestamp-related tests," @${ECHO_CMD} "since they are due to the different FreeBSD mktime() implementation)." @${ECHO_CMD} "" +.endif +.if !defined(WITHOUT_CLI) test: all @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${.TARGET}) @@ -632,6 +661,7 @@ post-install: .endif @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc + @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc @${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php @${TOUCH} ${PREFIX}/include/php/ext/xml/expat/.php .if !defined(WITHOUT_APACHE) diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist index 55b68d7d6a2a..c3f8b04e8357 100644 --- a/lang/php53/pkg-plist +++ b/lang/php53/pkg-plist @@ -3,6 +3,7 @@ bin/php-config bin/phpextdist bin/phpize +etc/php.conf etc/php.ini-dist etc/php.ini-recommended include/php/TSRM/TSRM.h |