ap-php4 and ap-php5 replaced by ap-php

9 files changed, 2 insertions, 119 deletions

diff --git a/www/Makefile b/www/Makefile
index a0f205d2d82..30b5f3fdecc 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.353 2004/11/01 21:44:21 jdolecek Exp $
+# $NetBSD: Makefile,v 1.354 2004/11/04 18:43:47 jdolecek Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -28,8 +28,7 @@ SUBDIR+=	ap-jserv
 SUBDIR+=	ap-layout
 SUBDIR+=	ap-mp3
 SUBDIR+=	ap-perl
-SUBDIR+=	ap-php4
-SUBDIR+=	ap-php5
+SUBDIR+=	ap-php
 SUBDIR+=	ap-python
 SUBDIR+=	ap-ruby
 SUBDIR+=	ap-ssl
diff --git a/www/ap-php4/DESCR b/www/ap-php4/DESCR
deleted file mode 100644
index 8c1c0753446..00000000000
--- a/www/ap-php4/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-PHP is an HTML-embedded scripting language. It is modular, with
-some object-oriented features. Much of its syntax is borrowed from
-C, Java and Perl with a couple of unique PHP-specific features
-thrown in.  The language is designed 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/MESSAGE b/www/ap-php4/MESSAGE
deleted file mode 100644
index 984ba5a552a..00000000000
--- a/www/ap-php4/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/12/17 20:10:41 jdolecek Exp $
-
-In order to use this module in your Apache 1.x installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule php4_module lib/httpd/mod_php4.so
-  AddType application/x-httpd-php .php
-
-You may also add following if you still use .php3 files:
-
-  AddType application/x-httpd-php .php3
-
-For Apache 2.x installation, you need following:
-
-  LoadModule php4_module lib/httpd/mod_php4.so
-  AddHandler application/x-httpd-php .php
-
-You may also add following if you still use .php3 files:
-
-  AddHandler application/x-httpd-php .php3
-
-===========================================================================
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
deleted file mode 100644
index fc77089838e..00000000000
--- a/www/ap-php4/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.38 2004/10/03 00:18:24 tv Exp $
-#
-
-PKGNAME=		ap-php-${PHP_BASE_VERS}
-COMMENT=		Apache (${PKG_APACHE}) module for PHP4
-
-USE_BUILDLINK3=		YES
-APACHE_MODULE=		YES
-SHLIBTOOL_OVERRIDE=	libtool
-
-.include "../../www/php4/Makefile.php"
-
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
-
-do-install:
-	if [ -f ${WRKSRC}/.libs/libphp4.so ]; then		\
-		${INSTALL_DATA} ${WRKSRC}/.libs/libphp4.so	\
-			${PREFIX}/lib/httpd/mod_php4.so;	\
-	elif [ -f ${WRKSRC}/libs/libphp4.so ]; then		\
-		${INSTALL_DATA} ${WRKSRC}/libs/libphp4.so	\
-			${PREFIX}/lib/httpd/mod_php4.so;	\
-	fi
-
-.include "../../www/php4/buildlink3.mk"
-.include "../../mk/apache.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php4/PLIST b/www/ap-php4/PLIST
deleted file mode 100644
index 283532c25e0..00000000000
--- a/www/ap-php4/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/31 21:49:15 jdolecek Exp $
-lib/httpd/mod_php5.so
diff --git a/www/ap-php5/DESCR b/www/ap-php5/DESCR
deleted file mode 100644
index f82b82ad5bc..00000000000
--- a/www/ap-php5/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-PHP is an HTML-embedded scripting language. It is modular, with
-some object-oriented features. Much of its syntax is borrowed from
-C, Java and Perl with a couple of unique PHP-specific features
-thrown in.  The language is designed to allow web developers to
-write dynamically generated pages quickly.
-
-This package contains the dynamically loadable PHP5 Apache module.
diff --git a/www/ap-php5/MESSAGE b/www/ap-php5/MESSAGE
deleted file mode 100644
index 28ee1e29036..00000000000
--- a/www/ap-php5/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/10/31 21:51:07 jdolecek Exp $
-
-In order to use this module in your Apache 1.x installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule php5_module lib/httpd/mod_php5.so
-  AddType application/x-httpd-php .php
-
-You may also add following if you still use .php3 files:
-
-  AddType application/x-httpd-php .php3
-
-For Apache 2.x installation, you need following:
-
-  LoadModule php5_module lib/httpd/mod_php5.so
-  AddHandler application/x-httpd-php .php
-
-You may also add following if you still use .php3 files:
-
-  AddHandler application/x-httpd-php .php3
-
-===========================================================================
diff --git a/www/ap-php5/Makefile b/www/ap-php5/Makefile
deleted file mode 100644
index ca2d2aff6f7..00000000000
--- a/www/ap-php5/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 21:51:07 jdolecek Exp $
-#
-
-PKGNAME=		ap-php-${PHP5_VERSION}
-PKGREVISION=		# empty
-COMMENT=		Apache (${PKG_APACHE}) module for PHP5
-
-USE_BUILDLINK3=		YES
-APACHE_MODULE=		YES
-SHLIBTOOL_OVERRIDE=	libtool
-
-.include "../../lang/php5/Makefile.common"
-
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
-
-do-install:
-	if [ -f ${WRKSRC}/libs/libphp5.so ]; then		\
-		${INSTALL_LIB} ${WRKSRC}/libs/libphp5.so	\
-			${PREFIX}/lib/httpd/mod_php5.so;        \
-	fi
-
-.include "../../lang/php5/buildlink3.mk"
-.include "../../mk/apache.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php5/PLIST b/www/ap-php5/PLIST
deleted file mode 100644
index cb5d73515f2..00000000000
--- a/www/ap-php5/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/31 21:51:07 jdolecek Exp $
-lib/httpd/mod_php5.so