Register extensions in etc/php/extensions.ini instead of etc/php.ini

and add etc/php to the config scan path.

Suggested by:	Kenneth Vestergaard Schmidt <kvs@pil.dk>
This commit is contained in:
Alex Dupre 2004-07-28 08:59:35 +00:00
parent 17b081e986
commit 6d0b9e61ce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=114918
7 changed files with 19 additions and 18 deletions

View file

@ -197,8 +197,9 @@ do-install:
> ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h > ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
@${ECHO_CMD} \#include \"ext/${PHP_MODNAME}/config.h\" \ @${ECHO_CMD} \#include \"ext/${PHP_MODNAME}/config.h\" \
>> ${PREFIX}/include/php/ext/php_config.h >> ${PREFIX}/include/php/ext/php_config.h
@${MKDIR} ${PREFIX}/etc/php
@${ECHO_CMD} extension=${PHP_MODNAME}.so \ @${ECHO_CMD} extension=${PHP_MODNAME}.so \
>> ${PREFIX}/etc/php.ini >> ${PREFIX}/etc/php/extensions.ini
add-plist-info: add-plist-phpext add-plist-info: add-plist-phpext
add-plist-phpext: add-plist-phpext:
@ -218,13 +219,19 @@ add-plist-phpext:
>> ${TMPPLIST} >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \ @${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \
>> ${TMPPLIST} >> ${TMPPLIST}
@${ECHO_CMD} "@exec echo extension=${PHP_MODNAME}.so >> %D/etc/php.ini" \ @${ECHO_CMD} "@exec mkdir -p %D/etc/php" \
>> ${TMPPLIST} >> ${TMPPLIST}
@${ECHO_CMD} "@unexec cp %D/etc/php.ini %D/etc/php.ini.orig" \ @${ECHO_CMD} "@exec echo extension=${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \
>> ${TMPPLIST} >> ${TMPPLIST}
@${ECHO_CMD} "@unexec grep -v ${PHP_MODNAME}\\\.so %D/etc/php.ini.orig > %D/etc/php.ini || true" \ @${ECHO_CMD} "@unexec cp %D/etc/php/extensions.ini %D/etc/php/extensions.ini.orig" \
>> ${TMPPLIST} >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rm %D/etc/php.ini.orig" \ @${ECHO_CMD} "@unexec grep -v ${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec rm %D/etc/php/extensions.ini.orig" \
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
>> ${TMPPLIST} >> ${TMPPLIST}
security-check: php-ini security-check: php-ini
@ -232,7 +239,7 @@ security-check: php-ini
php-ini: php-ini:
@${ECHO_CMD} "****************************************************************************" @${ECHO_CMD} "****************************************************************************"
@${ECHO_CMD} "" @${ECHO_CMD} ""
@${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php.ini" @${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/extensions.ini"
@${ECHO_CMD} "configuration file to automatically load the installed extension:" @${ECHO_CMD} "configuration file to automatically load the installed extension:"
@${ECHO_CMD} "" @${ECHO_CMD} ""
@${ECHO_CMD} "extension=${PHP_MODNAME}.so" @${ECHO_CMD} "extension=${PHP_MODNAME}.so"

View file

@ -7,7 +7,7 @@
PORTNAME= php4 PORTNAME= php4
PORTVERSION= 4.3.8 PORTVERSION= 4.3.8
PORTREVISION?= 1 PORTREVISION?= 2
CATEGORIES?= lang devel www CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
http://downloads.php.net/ilia/:rc \ http://downloads.php.net/ilia/:rc \
@ -30,6 +30,7 @@ USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-versioning \ CONFIGURE_ARGS= --enable-versioning \
--enable-memory-limit \ --enable-memory-limit \
--with-layout=GNU \ --with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all --disable-all
.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
@ -190,7 +191,6 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
@${TOUCH} ${PREFIX}/etc/php.ini
@${TOUCH} ${PREFIX}/include/php/ext/php_config.h @${TOUCH} ${PREFIX}/include/php/ext/php_config.h
.if defined(WITH_APACHE) .if defined(WITH_APACHE)
@${CAT} ${PKGMESSAGE} @${CAT} ${PKGMESSAGE}

View file

@ -3,8 +3,6 @@ bin/php-config
bin/phpextdist bin/phpextdist
bin/phpize bin/phpize
etc/php.conf etc/php.conf
@exec touch %D/etc/php.ini
@unexec [ -s %D/etc/php.ini ] || rm %D/etc/php.ini
etc/php.ini-dist etc/php.ini-dist
etc/php.ini-recommended etc/php.ini-recommended
include/php/TSRM/TSRM.h include/php/TSRM/TSRM.h

View file

@ -7,7 +7,7 @@
PORTNAME= php5 PORTNAME= php5
PORTVERSION= 5.0.0 PORTVERSION= 5.0.0
PORTREVISION?= 1 PORTREVISION?= 2
CATEGORIES?= lang devel www CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
http://downloads.php.net/ilia/:rc \ http://downloads.php.net/ilia/:rc \
@ -30,6 +30,7 @@ USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-versioning \ CONFIGURE_ARGS= --enable-versioning \
--enable-memory-limit \ --enable-memory-limit \
--with-layout=GNU \ --with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \ --disable-all \
--enable-libxml \ --enable-libxml \
--with-libxml-dir=${LOCALBASE} \ --with-libxml-dir=${LOCALBASE} \
@ -195,7 +196,6 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
@${TOUCH} ${PREFIX}/etc/php.ini
@${TOUCH} ${PREFIX}/include/php/ext/php_config.h @${TOUCH} ${PREFIX}/include/php/ext/php_config.h
.if defined(WITH_APACHE) .if defined(WITH_APACHE)
@${CAT} ${PKGMESSAGE} @${CAT} ${PKGMESSAGE}

View file

@ -3,8 +3,6 @@ bin/php-config
bin/phpextdist bin/phpextdist
bin/phpize bin/phpize
etc/php.conf etc/php.conf
@exec touch %D/etc/php.ini
@unexec [ -s %D/etc/php.ini ] || rm %D/etc/php.ini
etc/php.ini-dist etc/php.ini-dist
etc/php.ini-recommended etc/php.ini-recommended
include/php/TSRM/TSRM.h include/php/TSRM/TSRM.h

View file

@ -7,7 +7,7 @@
PORTNAME= php5 PORTNAME= php5
PORTVERSION= 5.0.0 PORTVERSION= 5.0.0
PORTREVISION?= 1 PORTREVISION?= 2
CATEGORIES?= lang devel www CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
http://downloads.php.net/ilia/:rc \ http://downloads.php.net/ilia/:rc \
@ -30,6 +30,7 @@ USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-versioning \ CONFIGURE_ARGS= --enable-versioning \
--enable-memory-limit \ --enable-memory-limit \
--with-layout=GNU \ --with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \ --disable-all \
--enable-libxml \ --enable-libxml \
--with-libxml-dir=${LOCALBASE} \ --with-libxml-dir=${LOCALBASE} \
@ -195,7 +196,6 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
@${TOUCH} ${PREFIX}/etc/php.ini
@${TOUCH} ${PREFIX}/include/php/ext/php_config.h @${TOUCH} ${PREFIX}/include/php/ext/php_config.h
.if defined(WITH_APACHE) .if defined(WITH_APACHE)
@${CAT} ${PKGMESSAGE} @${CAT} ${PKGMESSAGE}

View file

@ -3,8 +3,6 @@ bin/php-config
bin/phpextdist bin/phpextdist
bin/phpize bin/phpize
etc/php.conf etc/php.conf
@exec touch %D/etc/php.ini
@unexec [ -s %D/etc/php.ini ] || rm %D/etc/php.ini
etc/php.ini-dist etc/php.ini-dist
etc/php.ini-recommended etc/php.ini-recommended
include/php/TSRM/TSRM.h include/php/TSRM/TSRM.h