diff options
-rw-r--r-- | www/php4/Makefile | 12 | ||||
-rw-r--r-- | www/php4/Makefile.common | 19 | ||||
-rw-r--r-- | www/php4/Makefile.module | 5 | ||||
-rw-r--r-- | www/php4/pkg/MESSAGE | 11 | ||||
-rw-r--r-- | www/php4/pkg/PLIST | 11 |
5 files changed, 35 insertions, 23 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile index e27e6a7dfb8..10346289c5a 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/03/01 18:18:17 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/04/30 03:25:15 jlam Exp $ .include "../../www/php4/Makefile.common" @@ -9,13 +9,15 @@ COMMENT= PHP4: Hypertext Preprocessor CONFLICTS+= ap-php-4.0.3pl1 +EGDIR= ${PREFIX}/share/examples/php + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin ${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php ${TOUCH} ${PREFIX}/${PHP_EXTENSION_DIR}/.directory - ${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/etc - ${INSTALL_DATA_DIR} ${PREFIX}/share/php4 - ${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php4 + ${INSTALL_DATA_DIR} ${EGDIR} + cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-optimized ${EGDIR} + ${INSTALL_DATA_DIR} ${PREFIX}/share/php + ${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php .include "../../mk/bsd.pkg.mk" diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 731d46146bb..9bdc76303b4 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2001/03/01 18:18:17 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2001/04/30 03:25:15 jlam Exp $ DISTNAME= php-${PHP_DIST_VERS} PHP_DIST_VERS= 4.0.4pl1 @@ -29,6 +29,15 @@ PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +.include "../../mk/bsd.prefs.mk" + +PHP_CONFDIR?= ${LOCALBASE}/etc +MESSAGE_SUBST+= PHP_CONFDIR=${PHP_CONFDIR} + +.if ${OPSYS} == "SunOS" +DEPENDS+= zlib-*:../../devel/zlib +.endif + # Here we configure only for what NetBSD ships. We add the rest via modules. # GNU_CONFIGURE= # defined @@ -47,7 +56,7 @@ CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} CONFIGURE_ARGS+= --with-gettext=${GETTEXTDIR} CONFIGURE_ARGS+= --with-yp --with-zlib -CONFIGURE_ARGS+= --with-config-file-path=${PREFIX}/etc +CONFIGURE_ARGS+= --with-config-file-path=${PHP_CONFDIR} CONFIGURE_ARGS+= --with-system-regex CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 CONFIGURE_ARGS+= --enable-track-vars @@ -64,12 +73,6 @@ CONFIGURE_ARGS+= --enable-wddx CONFIGURE_ARGS+= --with-dbase CONFIGURE_ARGS+= --with-filepro -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -DEPENDS+= zlib-*:../../devel/zlib -.endif - pre-configure: pre-common-configure pre-common-configure: diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index 1e92173c11f..ac74e520246 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.3 2001/03/01 18:18:17 jlam Exp $ +# $NetBSD: Makefile.module,v 1.4 2001/04/30 03:25:16 jlam Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -25,6 +25,9 @@ MESSAGE_SUBST+= MODNAME=${MODNAME} \ PLIST_SRC= ${.CURDIR}/../../www/php4/pkg/PLIST.module +# Ensure we export symbols in the linked shared objects. +LDFLAGS+= -Wl,-E + do-build: @cd ${EXTDIR}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_TARGET} diff --git a/www/php4/pkg/MESSAGE b/www/php4/pkg/MESSAGE index 745b23b834e..384a71535fc 100644 --- a/www/php4/pkg/MESSAGE +++ b/www/php4/pkg/MESSAGE @@ -1,14 +1,17 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:47 wiz Exp $ +$NetBSD: MESSAGE,v 1.4 2001/04/30 03:25:16 jlam Exp $ + +Before using PHP, you must first create the configuration file: + + ${PHP_CONFDIR}/php.ini Example configuration files suitable as a basis for a custom php.ini may be found at: - ${PREFIX}/etc/php.ini-dist - ${PREFIX}/etc/php.ini-optimized + ${PREFIX}/share/examples/php/php.ini-dist + ${PREFIX}/share/examples/php/php.ini-optimized To process PHP scripts, you will need a PHP-enabled HTTP server. You may either configure the HTTP server to use PHP as a CGI program, or install a PHP module for your HTTP server, e.g. ap-php4. - =========================================================================== diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST index a286b43797b..13b608e0bad 100644 --- a/www/php4/pkg/PLIST +++ b/www/php4/pkg/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.6 2001/01/25 17:18:08 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/04/30 03:25:16 jlam Exp $ bin/pear bin/php bin/php-config bin/phpextdist bin/phpize -etc/php.ini-dist -etc/php.ini-optimized include/php/acconfig.h include/php/php_version.h include/php/TSRM/TSRM.h @@ -190,9 +188,12 @@ lib/php/build/rules_pear.mk lib/php/build/shtool lib/php/extensions/no-debug-non-zts-20001214/.directory libexec/cgi-bin/php -share/php4/php4.gif -@dirrm share/php4 +share/examples/php/php.ini-dist +share/examples/php/php.ini-optimized +share/php/php4.gif +@dirrm share/php @unexec rmdir -p %D/libexec/cgi-bin 2>/dev/null || true +@dirrm share/examples/php @dirrm lib/php/extensions/no-debug-non-zts-20001214 @dirrm lib/php/extensions @dirrm lib/php/build |