From 6d0b9e61ce8c7cc8b540123f8af9d2e08a1cf847 Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Wed, 28 Jul 2004 08:59:35 +0000
Subject: [PATCH] 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>
---
 Mk/bsd.php.mk        | 19 +++++++++++++------
 lang/php4/Makefile   |  4 ++--
 lang/php4/pkg-plist  |  2 --
 lang/php5/Makefile   |  4 ++--
 lang/php5/pkg-plist  |  2 --
 lang/php53/Makefile  |  4 ++--
 lang/php53/pkg-plist |  2 --
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index dda8b27c3010..39978ea48094 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -197,8 +197,9 @@ do-install:
 		> ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
 	@${ECHO_CMD} \#include \"ext/${PHP_MODNAME}/config.h\" \
 		>> ${PREFIX}/include/php/ext/php_config.h
+	@${MKDIR} ${PREFIX}/etc/php
 	@${ECHO_CMD} extension=${PHP_MODNAME}.so \
-		>> ${PREFIX}/etc/php.ini
+		>> ${PREFIX}/etc/php/extensions.ini
 
 add-plist-info: add-plist-phpext
 add-plist-phpext:
@@ -218,13 +219,19 @@ add-plist-phpext:
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@exec echo extension=${PHP_MODNAME}.so >> %D/etc/php.ini" \
+	@${ECHO_CMD} "@exec mkdir -p %D/etc/php" \
 		>> ${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}
-	@${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}
-	@${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}
 
 security-check: php-ini
@@ -232,7 +239,7 @@ security-check: php-ini
 php-ini:
 	@${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} ""
 	@${ECHO_CMD} "extension=${PHP_MODNAME}.so"
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index f66f3cce3276..7e0e66039807 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php4
 PORTVERSION=	4.3.8
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -30,6 +30,7 @@ USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
+		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all
 
 .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-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
-	@${TOUCH} ${PREFIX}/etc/php.ini
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index 6123c9682e99..755bd01c976e 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -3,8 +3,6 @@ bin/php-config
 bin/phpextdist
 bin/phpize
 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-recommended
 include/php/TSRM/TSRM.h
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index a9b6c5d4c999..8716e51689fb 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -30,6 +30,7 @@ USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
+		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
@@ -195,7 +196,6 @@ post-install:
 	@${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}/etc/php.ini
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index f3e4da96b9b1..7b97bd15ffb4 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -3,8 +3,6 @@ bin/php-config
 bin/phpextdist
 bin/phpize
 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-recommended
 include/php/TSRM/TSRM.h
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index a9b6c5d4c999..8716e51689fb 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -30,6 +30,7 @@ USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
+		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
@@ -195,7 +196,6 @@ post-install:
 	@${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}/etc/php.ini
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index f3e4da96b9b1..7b97bd15ffb4 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -3,8 +3,6 @@ bin/php-config
 bin/phpextdist
 bin/phpize
 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-recommended
 include/php/TSRM/TSRM.h