Date: Tue, 18 Nov 2003 16:22:27 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nork@FreeBSD.org Subject: ports/59420: [Maintainer Update] Port: PHP 5 Message-ID: <200311181522.hAIFMR3U013419@armada.alexdupre.com> Resent-Message-ID: <200311181540.hAIFeEXM033436@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59420 >Category: ports >Synopsis: [Maintainer Update] Port: PHP 5 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Nov 18 07:40:14 PST 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Nov 13 00:04:58 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386 >Description: Add WITH_DEBUG knob and support for the new bsd.php.mk file. Forgotten in previous PR: add also BROKEN_WITH_PHP knob. >How-To-Repeat: >Fix: --- php5.diff begins here --- diff -ruN php5.orig/Makefile php5/Makefile --- php5.orig/Makefile Tue Nov 18 16:13:07 2003 +++ php5/Makefile Tue Nov 18 16:16:36 2003 @@ -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 @@ 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 @@ .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 @@ @${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 @@ .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 -ruN php5.orig/pkg-plist php5/pkg-plist --- php5.orig/pkg-plist Tue Nov 18 16:13:07 2003 +++ php5/pkg-plist Tue Nov 18 16:16:43 2003 @@ -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 --- php5.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311181522.hAIFMR3U013419>