Clean up some of the configuration, build, and install of php3.

5 files changed, 23 insertions, 20 deletions

diff --git a/www/ap-php3/Makefile b/www/ap-php3/Makefile
index ba7f5f12aad..dad8b7ba260 100644
--- a/www/ap-php3/Makefile
+++ b/www/ap-php3/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/03 19:51:26 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/03 21:32:46 tv Exp $
 #
 
 PKGNAME=	ap-${DISTNAME}
 
-FILESDIR=	${PKGSRCDIR}/www/php3/files
-PATCHDIR=	${PKGSRCDIR}/www/php3/patches
-
 DEPENDS+=	apache-1.3.6p0:../../www/apache
 
 USE_PERL5=	yes
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 5afb31720da..214845b990f 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/05/03 19:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/03 21:32:46 tv Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -14,10 +14,12 @@ PHP_VERSION=	3.0.7
 
 .if defined(BUILDING_EXTENSION_MODULE) || defined(BUILDING_SERVER_MODULE)
 DEPENDS+=	php-${PHP_VERSION}:../../www/php3
+FILESDIR?=	${PKGSRCDIR}/www/php3/files
+PATCHDIR?=	${PKGSRCDIR}/www/php3/patches
 .endif
 
-.if !defined(BUILDING_EXTENSION_MODULE)
 # Here we configure only for what NetBSD ships.  We add the rest via modules.
+GNU_CONFIGURE=  YES
 CONFIGURE_ARGS+=--with-system-regex --without-gd \
 		--with-yp --with-zlib --with-dbase --with-filepro \
 		--with-config-file-path=${PREFIX}/etc \
@@ -26,9 +28,8 @@ CONFIGURE_ARGS+=--with-system-regex --without-gd \
 		--enable-discard-path --enable-memory-limit \
 		--enable-sysvsem --enable-sysvshm
 
-GNU_CONFIGURE=  YES
-LDFLAGS=	-Wl,-R${PREFIX}/lib/php3
-CONFIGURE_ENV=	CPPFLAGS="-DPHP_INTERNAL_FUNCS"
+.if !defined(BUILDING_EXTENSION_MODULE)
+CONFIGURE_ENV+=	CPPFLAGS="-DPHP_INTERNAL_FUNCS"
 
 post-extract:
 	@${CP} ${FILESDIR}/abstractions.c ${WRKSRC}
@@ -38,14 +39,10 @@ post-build:
 	@cd ${WRKSRC}/convertor && ${MAKE}
 
 # The PHP includes are not easily detachable from the source tree in this
-# release, so we extract the PHP sources with every module, and only install
-# config.h so that `./configure' need not be run every time.
+# release, so we extract the PHP sources with every module.
 # This should improve in PHP 3.1 or 4.0.
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/php3 ${PREFIX}/include/php3
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} config.h ${PREFIX}/include/php3/
 	${INSTALL_PROGRAM} ${WRKSRC}/php ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/convertor/convertor \
 		${PREFIX}/bin/php2convert
@@ -59,6 +56,10 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php3
 	${INSTALL_DATA} ${WRKSRC}/examples/README* ${WRKSRC}/examples/*.php3 \
 		${PREFIX}/share/examples/php3/
+	@${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/php3.ini.example \
+		> ${WRKDIR}/php3.ini.example
+	${INSTALL_DATA} ${WRKDIR}/php3.ini.example ${PREFIX}/etc/
+	@[ -f ${PREFIX}/etc/php3.ini ] || ${CP} ${PREFIX}/etc/php3.ini.example ${PREFIX}/etc/php3.ini
 .endif
 .endif
 
diff --git a/www/php3/files/php3.ini.example b/www/php3/files/php3.ini.example
new file mode 100644
index 00000000000..67b4896b473
--- /dev/null
+++ b/www/php3/files/php3.ini.example
@@ -0,0 +1,3 @@
+#	$NetBSD: php3.ini.example,v 1.1 1999/05/03 21:35:06 tv Exp $
+
+extension_dir=@PREFIX@/lib/php3
diff --git a/www/php3/pkg/MESSAGE b/www/php3/pkg/MESSAGE
index 19a5dfdf673..1cc9f342763 100644
--- a/www/php3/pkg/MESSAGE
+++ b/www/php3/pkg/MESSAGE
@@ -1,6 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 1999/05/03 19:45:45 tv Exp $
+$NetBSD: MESSAGE,v 1.4 1999/05/03 21:32:46 tv Exp $
 
-Commands for global initialization of PHP3 may be placed in the file
-PREFIX/etc/php3.ini (where php3 is installed in PREFIX/bin/php).
+The documentation is not instaled with this package.  For the PHP3 Manual,
+see the URL:
+
+    http://www.php.net/manual/
 ===========================================================================
diff --git a/www/php3/pkg/PLIST b/www/php3/pkg/PLIST
index ac68fe3d983..9df3f5d2570 100644
--- a/www/php3/pkg/PLIST
+++ b/www/php3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/05/03 19:45:45 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/05/03 21:32:46 tv Exp $
 bin/dbfadd
 bin/dbfcreat
 bin/dbfdel
@@ -10,7 +10,8 @@ bin/dbfscan
 bin/dbftst
 bin/php
 bin/php2convert
-include/php3/config.h
+etc/php3.ini.example
+@exec [ -f %D/etc/php3.ini ] || cp %D/etc/php3.ini.example %D/etc/php3.ini
 libexec/cgi-bin/php
 share/examples/php3/README.logging
 share/examples/php3/date.php3
@@ -25,7 +26,6 @@ share/php3/php3.gif
 share/php3/phpi.gif
 share/php3/phps.gif
 @exec mkdir -p %D/lib/php3
-@dirrm include/php3
 @dirrm lib/php3
 @dirrm share/examples/php3
 @dirrm share/php3