summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/ap-php4/Makefile56
-rw-r--r--www/ap-php4/files/md53
-rw-r--r--www/ap-php4/files/patch-sum4
-rw-r--r--www/ap-php4/patches/patch-aa21
-rw-r--r--www/ap-php4/patches/patch-ab15
-rw-r--r--www/ap-php4/pkg/DESCR2
-rw-r--r--www/ap-php4/pkg/MESSAGE14
-rw-r--r--www/ap-php4/pkg/PLIST6
8 files changed, 19 insertions, 102 deletions
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index ce4031aed81..21123834549 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,54 +1,20 @@
-# $NetBSD: Makefile,v 1.2 2000/12/08 13:16:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.3 2000/12/17 09:26:08 jlam Exp $
-DISTNAME= php-4.0.3pl1
-PKGNAME= ap-${DISTNAME}
-CATEGORIES= www lang
-# Note the http address is written this way by purpose, so that bsd.pkg.mk DTRT
-MASTER_SITES= http://www.php.net/do_download.php?source_site=www.php.net&download_file= \
- ftp://ftp.php.net/pub/distributions/
+.include "../../www/php4/Makefile.common"
-MAINTAINER= jdolecek@netbsd.org
-HOMEPAGE= http://www.php.net/
+PKGNAME= ap-${DISTNAME}nb1
+CATEGORIES+= www lang
-DEPENDS+= apache-1.3.*:../../www/apache
-DEPENDS+= gdbm>=1.7.3:../../databases/gdbm
+MAINTAINER= jdolecek@netbsd.org
+HOMEPAGE= http://www.php.net/
-.include "../../mk/bsd.prefs.mk"
+DEPENDS+= php-${PHP_VERS}:../../www/php4
+DEPENDS+= apache>=1.3:../../www/apache
-.if ${OPSYS} == "SunOS"
-DEPENDS+= zlib-*:../../devel/zlib
-.endif
-
-USE_PERL5= yes
-USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
-# Here we configure only for what NetBSD ships. We add the rest via modules.
-# The --without-mysql is there to avoid using the bundled MySQL client library.
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+=--with-system-regex --without-gd \
- --with-gdbm=${PREFIX} \
- --with-yp --with-zlib --with-dbase --with-filepro \
- --with-config-file-path=${PREFIX}/etc \
- --with-exec-dir=${PREFIX}/libexec/php4 \
- --enable-track-vars --enable-force-cgi-redirect \
- --enable-discard-path --enable-memory-limit \
- --enable-sysvsem --enable-sysvshm \
- --enable-wddx --without-mysql \
- --with-apxs=${LOCALBASE}/sbin/apxs
-CONFIGURE_ENV+= PERL_PATH=${PERL5}
-
-MESSAGE_FILE=${WRKDIR}/.MESSAGE
-pre-install:
- ${SED} -e "s^%PREFIX%^$$PREFIX^" ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
+CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/.libs/libphp4.so \
- ${PREFIX}/lib/httpd/mod_php4.so
- ${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} ${WRKSRC}/.libs/libphp4.so \
+ ${PREFIX}/lib/httpd/mod_php4.so
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php4/files/md5 b/www/ap-php4/files/md5
deleted file mode 100644
index b9297452c42..00000000000
--- a/www/ap-php4/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.2 2000/12/08 13:16:13 wiz Exp $
-
-MD5 (php-4.0.3pl1.tar.gz) = 6969bc69588400557f70a014ab1536c1
diff --git a/www/ap-php4/files/patch-sum b/www/ap-php4/files/patch-sum
deleted file mode 100644
index 16d6758eb70..00000000000
--- a/www/ap-php4/files/patch-sum
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: patch-sum,v 1.3 2000/12/08 13:16:13 wiz Exp $
-
-MD5 (patch-aa) = e482b233021c7a3efc82e0ee4c1a3973
-MD5 (patch-ab) = 5f23b48e9a5a14d282b458831f6769f7
diff --git a/www/ap-php4/patches/patch-aa b/www/ap-php4/patches/patch-aa
deleted file mode 100644
index af833a23e4d..00000000000
--- a/www/ap-php4/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/12/08 13:16:13 wiz Exp $
-
---- configure.orig Sun Oct 15 13:47:10 2000
-+++ configure
-@@ -37830,6 +37830,7 @@
- fi
-
-
-+if false; then
- echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
- echo "configure:37835: checking for pam_start in -lpam" >&5
- ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
-@@ -37874,6 +37875,8 @@
- else
- echo "$ac_t""no" 1>&6
- fi
-+
-+fi # if false
-
-
- for ac_func in getcwd getwd
diff --git a/www/ap-php4/patches/patch-ab b/www/ap-php4/patches/patch-ab
deleted file mode 100644
index dfc2233b20d..00000000000
--- a/www/ap-php4/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/11/01 11:33:18 jdolecek Exp $
-
---- ext/standard/config.m4.orig Wed Nov 1 12:20:14 2000
-+++ ext/standard/config.m4 Wed Nov 1 12:20:36 2000
-@@ -120,10 +120,6 @@ main() {
-
- AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])])
-
--AC_CHECK_LIB(pam, pam_start, [
-- EXTRA_LIBS="$EXTRA_LIBS -lpam"
-- AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], [])
--
- AC_CHECK_FUNCS(getcwd getwd)
-
- AC_CRYPT_CAP
diff --git a/www/ap-php4/pkg/DESCR b/www/ap-php4/pkg/DESCR
index 14527807a53..e1b720a6020 100644
--- a/www/ap-php4/pkg/DESCR
+++ b/www/ap-php4/pkg/DESCR
@@ -2,3 +2,5 @@ PHP is an HTML-embedded scripting language. Much of its syntax is
borrowed from C, Java and Perl with a couple of unique PHP-specific
features thrown in. The goal of the language is to allow web
developers to write dynamically generated pages quickly.
+
+This package contains the dynamically loadable PHP4 Apache module.
diff --git a/www/ap-php4/pkg/MESSAGE b/www/ap-php4/pkg/MESSAGE
index 50122b4e324..88139a219f1 100644
--- a/www/ap-php4/pkg/MESSAGE
+++ b/www/ap-php4/pkg/MESSAGE
@@ -1,20 +1,16 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2000/10/25 13:42:49 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.3 2000/12/17 09:26:10 jlam Exp $
To add this to your Apache server, you will need to add the following
lines to the appropriate place in your httpd.conf file:
- LoadModule php4_module lib/httpd/mod_php4.so
+ LoadModule php4_module lib/httpd/mod_php4.so
- AddModule mod_php4.c
- AddType application/x-httpd-php .php
+ AddModule mod_php4.c
+ AddType application/x-httpd-php .php
You may also add following if you still use .php3 files:
- AddType application/x-httpd-php .php3
+ AddType application/x-httpd-php .php3
-Example configuration files suitable to be a basis for custom php.ini are
-at:
- %PREFIX%/etc/php.ini-dist
- %PREFIX%/etc/php.ini-optimized
===========================================================================
diff --git a/www/ap-php4/pkg/PLIST b/www/ap-php4/pkg/PLIST
index ce448dfaa4e..758839f1571 100644
--- a/www/ap-php4/pkg/PLIST
+++ b/www/ap-php4/pkg/PLIST
@@ -1,6 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/25 13:28:41 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/17 09:26:10 jlam Exp $
lib/httpd/mod_php4.so
-etc/php.ini-dist
-etc/php.ini-optimized
-share/php4/php4.gif
-@dirrm share/php4