summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/php4/Makefile20
-rw-r--r--www/php4/files/patch-sum4
-rw-r--r--www/php4/patches/patch-aa12
-rw-r--r--www/php4/pkg/MESSAGE7
-rw-r--r--www/php4/pkg/PLIST8
5 files changed, 33 insertions, 18 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile
index ed0f1a64d67..f2efb7abb32 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/17 17:18:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2000/12/17 21:33:55 jlam Exp $
.include "../../www/php4/Makefile.common"
@@ -9,24 +9,22 @@ HOMEPAGE= http://www.php.net/
CONFLICTS+= ap-php-4.0.3pl1
-EXTRACT_ELEMENTS= ${DISTNAME}/php.ini-dist
-EXTRACT_ELEMENTS+= ${DISTNAME}/php.ini-optimized
-EXTRACT_ELEMENTS+= ${DISTNAME}/php4.gif
-
MESSAGE_FILE= ${WRKDIR}/.MESSAGE
-# This package only installs some PHP4-related files, and doesn't require
-# any of these steps.
-#
-NO_PATCH= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
+BINDIR= ${PREFIX}/bin
+CGIDIR= ${PREFIX}/libexec/cgi-bin
+LIBDIR= ${PREFIX}/lib
pre-install:
${SED} -e "s,@PREFIX@,${PREFIX},g" \
< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
do-install:
+ ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/php ${BINDIR}
+ ${INSTALL_DATA_DIR} ${CGIDIR}
+ ${RM} -f ${CGIDIR}/php
+ ${LN} -sf ../../bin/php ${CGIDIR}/php
+ ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libphp4.la ${LIBDIR}
${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/etc
${INSTALL_DATA_DIR} ${PREFIX}/share/php4
diff --git a/www/php4/files/patch-sum b/www/php4/files/patch-sum
index e0f09958e16..5b00fcc704a 100644
--- a/www/php4/files/patch-sum
+++ b/www/php4/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/12/17 18:59:44 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/17 21:33:55 jlam Exp $
-MD5 (patch-aa) = bb987cfec61be0c240bbb97903ac201f
+MD5 (patch-aa) = 08bfae1d2a0b86ad501fd83023733f8a
MD5 (patch-ab) = 5f23b48e9a5a14d282b458831f6769f7
MD5 (patch-ac) = b33a7b6413fb5c850ebbb4c21f04b4d4
MD5 (patch-ad) = 02ba8252507ae8ad10cbae33ce313142
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
index f5844594781..8eadee87d05 100644
--- a/www/php4/patches/patch-aa
+++ b/www/php4/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/12/17 17:18:02 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2000/12/17 21:33:55 jlam Exp $
--- configure.orig Sun Oct 15 07:47:10 2000
+++ configure
@@ -28,3 +28,13 @@ $NetBSD: patch-aa,v 1.2 2000/12/17 17:18:02 jlam Exp $
for ac_func in getcwd getwd
+@@ -44218,9 +44221,6 @@
+
+ $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
+ SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
+- else
+- PHP_COMPILE='$(COMPILE) -c $< && touch $@'
+- CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@'
+ fi
+ fi
+
diff --git a/www/php4/pkg/MESSAGE b/www/php4/pkg/MESSAGE
index c47374d77a0..626b8ebc121 100644
--- a/www/php4/pkg/MESSAGE
+++ b/www/php4/pkg/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2000/12/17 21:33:55 jlam Exp $
Example configuration files suitable as a basis for a custom php.ini may
be found at:
@@ -7,6 +7,7 @@ be found at:
@PREFIX@/etc/php.ini-dist
@PREFIX@/etc/php.ini-optimized
-To process PHP scripts, you will need a PHP-enabled HTTP server, e.g.
-www/ap-php4.
+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 ffb44564517..65e93e62cd2 100644
--- a/www/php4/pkg/PLIST
+++ b/www/php4/pkg/PLIST
@@ -1,5 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/17 21:33:55 jlam Exp $
+bin/php
etc/php.ini-dist
etc/php.ini-optimized
+lib/libphp4.a
+lib/libphp4.la
+lib/libphp4.so.0.0
+libexec/cgi-bin/php
share/php4/php4.gif
@dirrm share/php4
+@unexec rmdir -p %D/libexec/cgi-bin 2>/dev/null || true