From 056c2c890a7e22161f223ea775664f60659234a4 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 10 Mar 2004 18:20:10 +0000
Subject: Remove PHP3 packages from pkgsrc as they're unmaintained by PHP folks
 and by pkgsrc folks.

---
 databases/Makefile              |   5 +-
 databases/php3-ldap/DESCR       |   2 -
 databases/php3-ldap/Makefile    |  16 --
 databases/php3-mysql/DESCR      |   2 -
 databases/php3-mysql/Makefile   |  20 ---
 databases/php3-pgsql/DESCR      |   2 -
 databases/php3-pgsql/Makefile   |  17 ---
 devel/Makefile                  |   3 +-
 devel/php3-pcre/DESCR           |   5 -
 devel/php3-pcre/Makefile        |  26 ----
 devel/php3-pcre/PLIST           |   2 -
 doc/CHANGES                     |  11 +-
 graphics/Makefile               |   3 +-
 graphics/php3-gd/DESCR          |   2 -
 graphics/php3-gd/Makefile       |  22 ---
 graphics/php3-gd/PLIST.extras   |   2 -
 net/Makefile                    |   3 +-
 net/php3-snmp/DESCR             |   2 -
 net/php3-snmp/Makefile          |  17 ---
 print/Makefile                  |   3 +-
 print/php3-pdflib/DESCR         |   2 -
 print/php3-pdflib/Makefile      |  22 ---
 www/Makefile                    |   4 +-
 www/ap-php3/DESCR               |   2 -
 www/ap-php3/MESSAGE             |  10 --
 www/ap-php3/Makefile            |  21 ---
 www/ap-php3/PLIST               |   2 -
 www/php3/DESCR                  |   2 -
 www/php3/MESSAGE                |   9 --
 www/php3/MESSAGE.module         |  10 --
 www/php3/Makefile               |  43 ------
 www/php3/Makefile.common        |  58 -------
 www/php3/Makefile.module        |  50 ------
 www/php3/PLIST                  |  19 ---
 www/php3/PLIST.module           |   2 -
 www/php3/distinfo               |  14 --
 www/php3/files/abstractions.c   |  30 ----
 www/php3/files/php3.ini.example |   3 -
 www/php3/patches/patch-aa       |  16 --
 www/php3/patches/patch-ab       |  29 ----
 www/php3/patches/patch-ac       |  27 ----
 www/php3/patches/patch-ad       |  13 --
 www/php3/patches/patch-af       |  35 -----
 www/php3/patches/patch-ag       |  14 --
 www/php3/patches/patch-ah       |  60 --------
 www/php3/patches/patch-ai       | 329 ----------------------------------------
 www/php3/patches/patch-aj       |  13 --
 www/php3/patches/patch-ak       |  40 -----
 48 files changed, 16 insertions(+), 1028 deletions(-)
 delete mode 100644 databases/php3-ldap/DESCR
 delete mode 100644 databases/php3-ldap/Makefile
 delete mode 100644 databases/php3-mysql/DESCR
 delete mode 100644 databases/php3-mysql/Makefile
 delete mode 100644 databases/php3-pgsql/DESCR
 delete mode 100644 databases/php3-pgsql/Makefile
 delete mode 100644 devel/php3-pcre/DESCR
 delete mode 100644 devel/php3-pcre/Makefile
 delete mode 100644 devel/php3-pcre/PLIST
 delete mode 100644 graphics/php3-gd/DESCR
 delete mode 100644 graphics/php3-gd/Makefile
 delete mode 100644 graphics/php3-gd/PLIST.extras
 delete mode 100644 net/php3-snmp/DESCR
 delete mode 100644 net/php3-snmp/Makefile
 delete mode 100644 print/php3-pdflib/DESCR
 delete mode 100644 print/php3-pdflib/Makefile
 delete mode 100644 www/ap-php3/DESCR
 delete mode 100644 www/ap-php3/MESSAGE
 delete mode 100644 www/ap-php3/Makefile
 delete mode 100644 www/ap-php3/PLIST
 delete mode 100644 www/php3/DESCR
 delete mode 100644 www/php3/MESSAGE
 delete mode 100644 www/php3/MESSAGE.module
 delete mode 100644 www/php3/Makefile
 delete mode 100644 www/php3/Makefile.common
 delete mode 100644 www/php3/Makefile.module
 delete mode 100644 www/php3/PLIST
 delete mode 100644 www/php3/PLIST.module
 delete mode 100644 www/php3/distinfo
 delete mode 100644 www/php3/files/abstractions.c
 delete mode 100644 www/php3/files/php3.ini.example
 delete mode 100644 www/php3/patches/patch-aa
 delete mode 100644 www/php3/patches/patch-ab
 delete mode 100644 www/php3/patches/patch-ac
 delete mode 100644 www/php3/patches/patch-ad
 delete mode 100644 www/php3/patches/patch-af
 delete mode 100644 www/php3/patches/patch-ag
 delete mode 100644 www/php3/patches/patch-ah
 delete mode 100644 www/php3/patches/patch-ai
 delete mode 100644 www/php3/patches/patch-aj
 delete mode 100644 www/php3/patches/patch-ak

diff --git a/databases/Makefile b/databases/Makefile
index 268fae742b7..795f3d8bb08 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2004/03/06 18:34:33 recht Exp $
+# $NetBSD: Makefile,v 1.121 2004/03/10 18:20:10 jlam Exp $
 #
 
 COMMENT=	Databases
@@ -66,9 +66,6 @@ SUBDIR+=	p5-gdbm
 SUBDIR+=	p5-perl-ldap
 SUBDIR+=	p5-postgresql
 SUBDIR+=	pgaccess
-SUBDIR+=	php3-ldap
-SUBDIR+=	php3-mysql
-SUBDIR+=	php3-pgsql
 SUBDIR+=	php4-dba
 SUBDIR+=	php4-dbase
 SUBDIR+=	php4-filepro
diff --git a/databases/php3-ldap/DESCR b/databases/php3-ldap/DESCR
deleted file mode 100644
index 66aabece2a8..00000000000
--- a/databases/php3-ldap/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to LDAP databases.
diff --git a/databases/php3-ldap/Makefile b/databases/php3-ldap/Makefile
deleted file mode 100644
index 691150b5bc3..00000000000
--- a/databases/php3-ldap/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:14 wiz Exp $
-
-MODNAME=		ldap
-CATEGORIES+=		databases
-PKGREVISION=		1
-COMMENT=		PHP3 extension for LDAP database access
-
-USE_BUILDLINK2=		yes
-
-.include "../../www/php3/Makefile.module"
-
-CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap}
-MOD_LIBS+=		-lldap -llber
-
-.include "../../databases/openldap/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php3-mysql/DESCR b/databases/php3-mysql/DESCR
deleted file mode 100644
index 23f8c25ea3d..00000000000
--- a/databases/php3-mysql/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to MySQL databases.
diff --git a/databases/php3-mysql/Makefile b/databases/php3-mysql/Makefile
deleted file mode 100644
index e8f338804f0..00000000000
--- a/databases/php3-mysql/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/03/14 19:37:35 jlam Exp $
-
-MODNAME=		mysql
-CATEGORIES+=		databases
-PKGREVISION=		# empty
-COMMENT=		PHP3 extension for MySQL database access
-
-USE_BUILDLINK2=		yes
-
-.include "../../www/php3/Makefile.module"
-
-BUILDLINK_DEPENDS.mysql-client=	mysql-client>=3.23.35
-
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
-MOD_CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-MOD_LDFLAGS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql ${RPATH_FLAG}${LOCALBASE}/lib/mysql
-MOD_LIBS+=		-lmysqlclient -lm
-
-.include "../../databases/mysql-client/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php3-pgsql/DESCR b/databases/php3-pgsql/DESCR
deleted file mode 100644
index 5ec666735fc..00000000000
--- a/databases/php3-pgsql/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to PostgreSQL databases.
diff --git a/databases/php3-pgsql/Makefile b/databases/php3-pgsql/Makefile
deleted file mode 100644
index b5253e5c322..00000000000
--- a/databases/php3-pgsql/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/01/05 20:14:25 jlam Exp $
-
-MODNAME=		pgsql
-CATEGORIES+=		databases
-PKGREVISION=		1
-COMMENT=		PHP3 extension for PostgreSQL database access
-
-USE_BUILDLINK2=		yes
-
-.include "../../www/php3/Makefile.module"
-
-CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-MOD_CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
-MOD_LIBS+=		-lpq -lcrypt
-
-.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/Makefile b/devel/Makefile
index 968830c6d0b..adfee415d3d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.473 2004/03/09 19:15:13 recht Exp $
+# $NetBSD: Makefile,v 1.474 2004/03/10 18:20:10 jlam Exp $
 #
 
 COMMENT=	Development utilities
@@ -354,7 +354,6 @@ SUBDIR+=	pccts
 SUBDIR+=	pcl-cvs
 SUBDIR+=	pcre
 SUBDIR+=	pedisassem
-SUBDIR+=	php3-pcre
 SUBDIR+=	php4-gettext
 SUBDIR+=	php4-gmp
 SUBDIR+=	php4-posix
diff --git a/devel/php3-pcre/DESCR b/devel/php3-pcre/DESCR
deleted file mode 100644
index 45199890608..00000000000
--- a/devel/php3-pcre/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides Perl-compatible regular expression support for PHP3.
-
-This package is a placeholder that only depends on the PHP3 package to
-signify that the base PHP3 package already has PCRE support.
diff --git a/devel/php3-pcre/Makefile b/devel/php3-pcre/Makefile
deleted file mode 100644
index 54091fdef02..00000000000
--- a/devel/php3-pcre/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:33:04 grant Exp $
-#
-# This package is a placeholder to signify that the base PHP3 package already
-# has the PCRE functionality.  It *must* have the same version number as the
-# PHP3 package.
-#
-DISTNAME=		php-pcre-${BASE_VERS}
-BASE_VERS=		3.0.18
-PKGREVISION=		1
-CATEGORIES=		www php3 devel
-DISTFILES=		# empty
-
-MAINTAINER=		jlam@NetBSD.org
-HOMEPAGE=		http://www.php.net/
-COMMENT=		PHP3 extension for Perl-compatible regular expressions
-
-DEPENDS+=		php-${BASE_VERS}nb2:../../www/php3
-
-EXTRACT_ONLY=		# empty
-NO_CHECKSUM=		# defined
-NO_CONFIGURE=		# defined
-NO_BUILD=		# defined
-
-do-install:		# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/php3-pcre/PLIST b/devel/php3-pcre/PLIST
deleted file mode 100644
index c3978bb4493..00000000000
--- a/devel/php3-pcre/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/10 13:05:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/doc/CHANGES b/doc/CHANGES
index 3f22654d770..5ef2501c92e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5191 2004/03/10 18:17:50 wiz Exp $
+$NetBSD: CHANGES,v 1.5192 2004/03/10 18:20:11 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1384,3 +1384,12 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated firefox-gtk2 to 0.8nb1 [taya 2004-03-10]
 	Updated doclifter to 1.8 [wiz 2004-03-10]
 	Updated capc-calc to 2.11.9.2 [wiz 2004-03-10]
+	Removed ap-php3 [jlam 2004-03-10]
+	Removed php3 [jlam 2004-03-10]
+	Removed php3-gd [jlam 2004-03-10]
+	Removed php3-ldap [jlam 2004-03-10]
+	Removed php3-mysql [jlam 2004-03-10]
+	Removed php3-pcre [jlam 2004-03-10]
+	Removed php3-pdflib [jlam 2004-03-10]
+	Removed php3-pgsql [jlam 2004-03-10]
+	Removed php3-snmp [jlam 2004-03-10]
diff --git a/graphics/Makefile b/graphics/Makefile
index 8cf70a067c6..782f92a2439 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.299 2004/03/07 08:23:14 hamajima Exp $
+# $NetBSD: Makefile,v 1.300 2004/03/10 18:20:10 jlam Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -178,7 +178,6 @@ SUBDIR+=	p5-PerlMagick
 SUBDIR+=	pgraf
 SUBDIR+=	photopc
 SUBDIR+=	php-jpgraph
-SUBDIR+=	php3-gd
 SUBDIR+=	php4-exif
 SUBDIR+=	php4-gd
 SUBDIR+=	phpsview
diff --git a/graphics/php3-gd/DESCR b/graphics/php3-gd/DESCR
deleted file mode 100644
index 4f588ce03a0..00000000000
--- a/graphics/php3-gd/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides GD graphics support for PHP3.
diff --git a/graphics/php3-gd/Makefile b/graphics/php3-gd/Makefile
deleted file mode 100644
index c05e3d66ac7..00000000000
--- a/graphics/php3-gd/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/06/25 22:52:55 jmc Exp $
-
-MODNAME=		gd
-CATEGORIES+=		graphics
-PKGREVISION=		2
-COMMENT=		PHP3 extension for GD graphics library
-
-USE_BUILDLINK2=		yes
-
-.include "../../www/php3/Makefile.module"
-
-CONFIGURE_ARGS+=	--with-gd
-MOD_LIBS+=		-lgd -lintl -ljpeg -lpng -lttf -lm -lz
-
-PLIST_SRC+=		${.CURDIR}/PLIST.extras
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/extra/gd/bdf2gdfont ${PREFIX}/bin
-
-.include "../../graphics/freetype-lib/buildlink2.mk"
-.include "../../graphics/gd/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php3-gd/PLIST.extras b/graphics/php3-gd/PLIST.extras
deleted file mode 100644
index 9f9c29f8a03..00000000000
--- a/graphics/php3-gd/PLIST.extras
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.extras,v 1.1.1.1 2002/01/10 13:06:44 jlam Exp $
-bin/bdf2gdfont
diff --git a/net/Makefile b/net/Makefile
index 842cbf40d05..481eac2f004 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.453 2004/03/07 18:46:45 minskim Exp $
+# $NetBSD: Makefile,v 1.454 2004/03/10 18:20:10 jlam Exp $
 #
 
 COMMENT=	Networking tools
@@ -224,7 +224,6 @@ SUBDIR+=	pchar
 SUBDIR+=	pconsole
 SUBDIR+=	pen
 SUBDIR+=	pfnet
-SUBDIR+=	php3-snmp
 SUBDIR+=	php4-ftp
 SUBDIR+=	php4-snmp
 SUBDIR+=	php4-sockets
diff --git a/net/php3-snmp/DESCR b/net/php3-snmp/DESCR
deleted file mode 100644
index 05f87c8128e..00000000000
--- a/net/php3-snmp/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to SNMP databases.
diff --git a/net/php3-snmp/Makefile b/net/php3-snmp/Makefile
deleted file mode 100644
index 44a55f0c470..00000000000
--- a/net/php3-snmp/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2002/04/20 18:46:08 fredb Exp $
-
-MODNAME=		snmp
-CATEGORIES+=		net
-PKGREVISION=		1
-COMMENT=		PHP3 extension for SNMP database access
-
-.include "../../www/php3/Makefile.module"
-
-DEPENDS+=		ucd-snmp-4.2.4*:../../net/ucd-snmp
-
-CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
-MOD_CPPFLAGS+=		-I${LOCALBASE}/include/ucd-snmp
-MOD_CPPFLAGS+=		-I${WRKSRC}/dl
-MOD_LIBS+=		-lsnmp
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/Makefile b/print/Makefile
index 49b67c91aa1..7a2cb16bd29 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2003/12/25 13:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.113 2004/03/10 18:20:11 jlam Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -74,7 +74,6 @@ SUBDIR+=	p5-PostScript-MailLabels
 SUBDIR+=	papersize
 SUBDIR+=	pcps
 SUBDIR+=	pdflib
-SUBDIR+=	php3-pdflib
 SUBDIR+=	php4-pdflib
 SUBDIR+=	pnm2ppa
 SUBDIR+=	pscal
diff --git a/print/php3-pdflib/DESCR b/print/php3-pdflib/DESCR
deleted file mode 100644
index 719309afaaf..00000000000
--- a/print/php3-pdflib/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to PDF library functions.
diff --git a/print/php3-pdflib/Makefile b/print/php3-pdflib/Makefile
deleted file mode 100644
index a9ca321c5dd..00000000000
--- a/print/php3-pdflib/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:52 reed Exp $
-
-MODNAME=		pdf
-CATEGORIES+=		print
-PKGREVISION=		3
-COMMENT=		PHP3 extension for PDFlib on-the-fly PDF generation
-
-USE_BUILDLINK2=		yes
-
-.include "../../www/php3/Makefile.module"
-
-PKGNAME=		php-pdflib-${BASE_VERS}
-
-CONFIGURE_ARGS+=	--with-pdflib=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-jpeg-dir=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-tiff-dir==${BUILDLINK_DIR}
-LIBS+=			-lpng -lz
-
-MOD_LIBS+=		-lpdf -lm -ltiff -ljpeg -lpng -lz
-
-.include "../../print/pdflib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/Makefile b/www/Makefile
index 3d1811ff302..d35148e8ca0 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.308 2004/03/09 18:40:58 wiz Exp $
+# $NetBSD: Makefile,v 1.309 2004/03/10 18:20:11 jlam Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -29,7 +29,6 @@ SUBDIR+=	ap-jserv
 SUBDIR+=	ap-layout
 SUBDIR+=	ap-mp3
 SUBDIR+=	ap-perl
-SUBDIR+=	ap-php3
 SUBDIR+=	ap-php4
 SUBDIR+=	ap-python
 SUBDIR+=	ap-ruby
@@ -190,7 +189,6 @@ SUBDIR+=	p5-libwww
 SUBDIR+=	pear-HTML_Common
 SUBDIR+=	pear-HTML_Select
 SUBDIR+=	php-FastTemplate
-SUBDIR+=	php3
 SUBDIR+=	php4
 SUBDIR+=	php4-apc
 SUBDIR+=	php4-curl
diff --git a/www/ap-php3/DESCR b/www/ap-php3/DESCR
deleted file mode 100644
index 6eec9293d68..00000000000
--- a/www/ap-php3/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module includes support for embedding PHP into the Apache web server.
diff --git a/www/ap-php3/MESSAGE b/www/ap-php3/MESSAGE
deleted file mode 100644
index 41bb312cc47..00000000000
--- a/www/ap-php3/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/08/26 00:12:51 grant Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule php3_module lib/httpd/mod_php3.so
-  AddType application/x-httpd-php3 .php3
-
-===========================================================================
diff --git a/www/ap-php3/Makefile b/www/ap-php3/Makefile
deleted file mode 100644
index ef0d0ab3d19..00000000000
--- a/www/ap-php3/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2003/08/23 14:22:43 grant Exp $
-#
-
-PKGNAME=		ap-php-${BASE_VERS}
-PKGREVISION=		1
-COMMENT=		Apache 1.x module for PHP3
-
-USE_BUILDLINK2=		yes
-
-.include "../../www/php3/Makefile.common"
-
-DEPENDS+=		php>=${BASE_VERS}:../../www/php3
-DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
-
-CPPFLAGS+=		-DPHP_INTERNAL_FUNCS
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/libphp3.so ${PREFIX}/lib/httpd/mod_php3.so
-
-.include "../../www/apache/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php3/PLIST b/www/ap-php3/PLIST
deleted file mode 100644
index 3a64b76e829..00000000000
--- a/www/ap-php3/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:51 zuntum Exp $
-lib/httpd/mod_php3.so
diff --git a/www/php3/DESCR b/www/php3/DESCR
deleted file mode 100644
index ad4220925cf..00000000000
--- a/www/php3/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This is the core support package with the CGI-based interpreter.
diff --git a/www/php3/MESSAGE b/www/php3/MESSAGE
deleted file mode 100644
index 9d13276d5d7..00000000000
--- a/www/php3/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 02:18:26 zuntum Exp $
-
-The documentation is not installed with this package.  For the PHP3 Manual,
-see the URL:
-
-    http://www.php.net/manual/
-
-===========================================================================
diff --git a/www/php3/MESSAGE.module b/www/php3/MESSAGE.module
deleted file mode 100644
index 24991ccfedf..00000000000
--- a/www/php3/MESSAGE.module
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.module,v 1.1 2002/01/10 13:17:11 jlam Exp $
-
-To enable this module, add the following to ${PKG_SYSCONFDIR}/php3.ini:
-
-    extension_dir=${PREFIX}/${PHP_EXTENSION_DIR}
-    extension=${MODNAME}.so
-
-and restart your PHP3-enabled HTTP server to load this module.
-===========================================================================
diff --git a/www/php3/Makefile b/www/php3/Makefile
deleted file mode 100644
index 07024e53517..00000000000
--- a/www/php3/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2003/01/28 22:04:30 jlam Exp $
-
-PKGNAME=		php-${BASE_VERS}
-PKGREVISION?=		2
-CATEGORIES+=		lang
-COMMENT=		HTML-embedded programming language
-
-.include "Makefile.common"
-
-USE_PERL5=		build
-
-CPPFLAGS+=		-DPHP_INTERNAL_FUNCS
-FILES_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
-
-.if ${OPSYS} == Linux
-LIBS+=	-lnsl
-.endif
-
-CGIDIR=			${PREFIX}/libexec/cgi-bin
-EGDIR=			${PREFIX}/share/examples/php3
-DATADIR=		${PREFIX}/share/php3
-
-USE_PKGINSTALL=		yes
-OWN_DIRS=		${PREFIX}/${PHP_EXTENSION_DIR}
-CONF_FILES=		${EGDIR}/php3.ini.example ${PKG_SYSCONFDIR}/php3.ini
-
-BUILD_DIRS=		${WRKSRC} ${WRKSRC}/convertor
-
-pre-install:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/php3.ini.example		\
-		> ${WRKDIR}/php3.ini.example
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/php ${CGIDIR}/php
-	${INSTALL_PROGRAM} ${WRKSRC}/convertor/convertor		\
-		${PREFIX}/bin/php2convert
-	${LN} -sf ${CGIDIR}/php ${PREFIX}/bin/php
-	${INSTALL_DATA_DIR} ${DATADIR} ${EGDIR}
-	cd ${WRKSRC}/extra/icons; ${INSTALL_DATA} * ${DATADIR}
-	cd ${WRKSRC}/examples; ${INSTALL_DATA} README* *.php3 ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/php3.ini.example ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/php3/Makefile.common b/www/php3/Makefile.common
deleted file mode 100644
index 92718469bc6..00000000000
--- a/www/php3/Makefile.common
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/17 22:55:59 grant Exp $
-
-DISTNAME=		php-${DIST_VERS}
-CATEGORIES+=		www php3
-MASTER_SITES=		http://www.php.net/distributions/ \
-			http://php3.de/distributions/ \
-			ftp://ftp.php.net/pub/distributions/
-
-MAINTAINER=		jlam@NetBSD.org
-HOMEPAGE=		http://www.php.net/
-
-# Version numbering scheme:
-#
-# DIST_VERS		version number on the php distfile
-# BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
-#
-DIST_VERS=		3.0.18
-BASE_VERS=		${DIST_VERS}
-
-DISTINFO_FILE=		${.CURDIR}/../../www/php3/distinfo
-FILESDIR?=		${.CURDIR}/../../www/php3/files
-PATCHDIR?=		${.CURDIR}/../../www/php3/patches
-
-# Location of installed PHP3 loadable modules under ${PREFIX}.
-PHP_EXTENSION_DIR=	lib/php3
-PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
-
-USE_BUILDLINK2=		# defined
-GNU_CONFIGURE=		# defined
-
-# Here we configure only for what NetBSD ships.  We add the rest via modules.
-CONFIGURE_ARGS+=	--without-gd
-CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}
-CONFIGURE_ARGS+=	--with-yp
-CONFIGURE_ARGS+=	--with-zlib
-CONFIGURE_ARGS+=	--with-dbase
-CONFIGURE_ARGS+=	--with-filepro
-
-CONFIGURE_ARGS+=	--with-config-file-path=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-exec-dir=${PREFIX}/libexec/php3
-CONFIGURE_ARGS+=	--with-system-regex
-
-CONFIGURE_ARGS+=	--enable-discard-path
-CONFIGURE_ARGS+=	--enable-force-cgi-redirect
-CONFIGURE_ARGS+=	--enable-memory-limit
-CONFIGURE_ARGS+=	--enable-sysvsem
-CONFIGURE_ARGS+=	--enable-sysvshm
-CONFIGURE_ARGS+=	--enable-track-vars
-
-CONFIGURE_ENV+=		PERL_PATH=${PERL5}
-
-post-extract: copy-abstractions-c
-
-copy-abstractions-c:
-	@${CP} ${FILESDIR}/abstractions.c ${WRKSRC}
-
-.include "../../databases/gdbm/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
diff --git a/www/php3/Makefile.module b/www/php3/Makefile.module
deleted file mode 100644
index 57f5a14e0fe..00000000000
--- a/www/php3/Makefile.module
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile.module,v 1.4 2002/09/04 14:47:41 agc Exp $
-
-.include "../../www/php3/Makefile.common"
-
-PKGNAME=		php-${MODNAME}-${BASE_VERS}
-PKGREVISION?=		# empty
-
-DEPENDS+=		php-${BASE_VERS}*:../../www/php3
-
-USE_PERL5=		build
-
-PKGMODNAME=		${MODNAME:S/-/_/}
-MODULESDIR=		${WRKSRC}/functions
-PLIST_SUBST+=		MODNAME=${PKGMODNAME}
-
-.include "../../mk/bsd.prefs.mk"
-
-# LD_SHAREABLE_FLAG is the flag to pass to "ld" to create a shared library
-# module.
-#
-.if ${OPSYS} == "SunOS"
-LD_SHAREABLE_FLAG=	-G
-.else
-LD_SHAREABLE_FLAG=	-Bshareable
-.endif
-
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
-
-MOD_CPPFLAGS+=		-I${WRKSRC} -I${MODULESDIR} -fPIC -DPIC -DCOMPILE_DL
-MOD_LDFLAGS+=		${LDFLAGS:S/-Wl,//g}
-MOD_LIBS+=		# empty
-
-PLIST_SRC=		${.CURDIR}/../../www/php3/PLIST.module
-MESSAGE_SRC=		${.CURDIR}/../../www/php3/MESSAGE.module
-MESSAGE_SUBST+=		MODNAME=${PKGMODNAME}
-MESSAGE_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
-
-do-build:
-	cd ${MODULESDIR};						\
-	${COMPILE.c} ${MOD_CPPFLAGS} ${PKGMODNAME}.c;			\
-	${LD} ${LD_SHAREABLE_FLAG} -o ${PKGMODNAME}.so ${PKGMODNAME}.o	\
-		${MOD_LDFLAGS} ${MOD_LIBS}
-
-do-install: do-module-install
-
-do-module-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR}
-	${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so			\
-		${PREFIX}/${PHP_EXTENSION_DIR}
diff --git a/www/php3/PLIST b/www/php3/PLIST
deleted file mode 100644
index d98463c4864..00000000000
--- a/www/php3/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/10 13:17:12 jlam Exp $
-bin/php
-bin/php2convert
-libexec/cgi-bin/php
-share/examples/php3/README.logging
-share/examples/php3/date.php3
-share/examples/php3/dir.php3
-share/examples/php3/log-db.php3
-share/examples/php3/log-footer.php3
-share/examples/php3/log-header.php3
-share/examples/php3/log-test.php3
-share/examples/php3/php3.ini.example
-share/php3/README
-share/php3/php2.gif
-share/php3/php3.gif
-share/php3/phpi.gif
-share/php3/phps.gif
-@dirrm share/examples/php3
-@dirrm share/php3
diff --git a/www/php3/PLIST.module b/www/php3/PLIST.module
deleted file mode 100644
index a5ee2b91778..00000000000
--- a/www/php3/PLIST.module
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.module,v 1.1 2002/01/10 13:17:12 jlam Exp $
-${PHP_EXTENSION_DIR}/${MODNAME}.so
diff --git a/www/php3/distinfo b/www/php3/distinfo
deleted file mode 100644
index 3f16086d90c..00000000000
--- a/www/php3/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/10/23 05:47:28 jlam Exp $
-
-SHA1 (php-3.0.18.tar.gz) = 49550006e1dbf8f792bc0b9499b3f0bd7b14427c
-Size (php-3.0.18.tar.gz) = 2219410 bytes
-SHA1 (patch-aa) = d094c6ed8c59765c30559be4f7ca2150e381fbfc
-SHA1 (patch-ab) = 3a186689ee39833b1748e8051f7615ba5cbd8719
-SHA1 (patch-ac) = 7f021f57c7c45b0ca7c41aa2c82a386372d6dbe3
-SHA1 (patch-ad) = ef3b13a0b7e75ab5cef39fdbd9ebdfbde1b484cf
-SHA1 (patch-af) = 96f39a63ae55daa1d1da0187868d7d4c9d94ec1c
-SHA1 (patch-ag) = 8a3c71c9ba82fd0dbb08f6e7727b626810eca7f4
-SHA1 (patch-ah) = f88ea107135580574777ed1dc2127c2b4efad6ba
-SHA1 (patch-ai) = ba18ee38a99475caa076e465049ea22c4f3dcc1e
-SHA1 (patch-aj) = 6dc9bf15d17e7fb2bcd2364528da6f90eb6fae3e
-SHA1 (patch-ak) = 09eab3fe8a567f98baad5d578cf3fbdc8f2abd11
diff --git a/www/php3/files/abstractions.c b/www/php3/files/abstractions.c
deleted file mode 100644
index 7d8048f1249..00000000000
--- a/www/php3/files/abstractions.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: abstractions.c,v 1.1 1999/05/03 19:45:44 tv Exp $	*/
-
-/*
- * This provides abstracted definitions for a few functions that are
- * "inlined" in normal statically-compiled PHP modules.  This way, any
- * dynamic module can be used with any PHP server interface (CGI, Apache, ...).
- */
-
-#define PHP_INTERNAL_FUNCS 1
-#include "php.h"
-
-void _php3_puts(const char *s) {
-	PUTS(s);
-}
-
-void _php3_putc(char c) {
-	PUTC(c);
-}
-
-int _php3_write(const void *a, int n) {
-	PHPWRITE(a, n);
-}
-
-void _php3_block_interruptions(void) {
-	BLOCK_INTERRUPTIONS;
-}
-
-void _php3_unblock_interruptions(void) {
-	UNBLOCK_INTERRUPTIONS;
-}
diff --git a/www/php3/files/php3.ini.example b/www/php3/files/php3.ini.example
deleted file mode 100644
index fc3d522eb96..00000000000
--- a/www/php3/files/php3.ini.example
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: php3.ini.example,v 1.2 2002/01/10 13:17:12 jlam Exp $
-
-extension_dir=@PREFIX@/@PHP_EXTENSION_DIR@
diff --git a/www/php3/patches/patch-aa b/www/php3/patches/patch-aa
deleted file mode 100644
index 62335b8a62e..00000000000
--- a/www/php3/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2000/04/13 09:51:23 tron Exp $
-
---- functions/dl.c.orig	Thu Mar 30 03:22:37 2000
-+++ functions/dl.c	Thu Apr 13 11:48:07 2000
-@@ -120,7 +120,11 @@
- #endif
- 		RETURN_FALSE;
- 	}
-+#ifdef __ELF__
- 	get_module = (php3_module_entry *(*)(void)) dlsym(handle, "get_module");
-+#else
-+	get_module = (php3_module_entry *(*)(void)) dlsym(handle, "_get_module");
-+#endif
- 	
- 	if (!get_module)
- 		get_module = (php3_module_entry *(*)(void)) dlsym(handle, "_get_module");
diff --git a/www/php3/patches/patch-ab b/www/php3/patches/patch-ab
deleted file mode 100644
index 7bb4a009501..00000000000
--- a/www/php3/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/10 13:17:12 jlam Exp $
-
---- php.h.orig	Mon Apr 10 12:29:36 2000
-+++ php.h
-@@ -326,6 +326,24 @@
- # endif
- #endif
- 
-+#ifndef PHP_INTERNAL_FUNCS
-+#undef PUTS
-+#undef PUTC
-+#undef PHPWRITE
-+#undef BLOCK_INTERRUPTIONS
-+#undef UNBLOCK_INTERRUPTIONS
-+extern PHPAPI void _php3_puts(const char *s);
-+extern PHPAPI void _php3_putc(char c);
-+extern PHPAPI int _php3_write(const void *a, int n);
-+extern PHPAPI void _php3_block_interruptions(void);
-+extern PHPAPI void _php3_unblock_interruptions(void);
-+#define PUTS(a) _php3_puts(a)
-+#define PUTC(a) _php3_putc(a)
-+#define PHPWRITE(a,n) _php3_write((a),(n))
-+#define BLOCK_INTERRUPTIONS _php3_block_interruptions()
-+#define UNBLOCK_INTERRUPTIONS _php3_unblock_interruptions()
-+#endif
-+
- #define E_ERROR 0x1
- #define E_WARNING 0x2
- #define E_PARSE 0x4
diff --git a/www/php3/patches/patch-ac b/www/php3/patches/patch-ac
deleted file mode 100644
index 86cf278612f..00000000000
--- a/www/php3/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/05/03 19:45:44 tv Exp $
-
---- tls.h.orig	Sun May  2 15:36:41 1999
-+++ tls.h	Sun May  2 15:38:32 1999
-@@ -120,9 +120,13 @@
- 	int php3_preprocess;
- #if APACHE
- 	request_rec *php3_rqst;
-+#else
-+	void *__php3_rqst;
- #endif
- #if USE_SAPI
- 	struct sapi_request_info *sapi_rqst;
-+#else
-+	void *__sapi_rqst;
- #endif
- #if WIN32|WINNT
- 	unsigned int wintimer_counter;
-@@ -177,6 +181,8 @@
- 	/*info.c*/
- #if APACHE
- 	module *top_module;
-+#else
-+	void *__top_module;
- #endif
- 	/*pageinfo.c*/
- 	long page_uid;
diff --git a/www/php3/patches/patch-ad b/www/php3/patches/patch-ad
deleted file mode 100644
index 0d3f9b4768d..00000000000
--- a/www/php3/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/01/10 13:17:12 jlam Exp $
-
---- Makefile.in.orig	Tue Oct  3 12:37:55 2000
-+++ Makefile.in
-@@ -63,7 +63,7 @@
-        snprintf.c php3_sprintf.c alloc.c list.c highlight.c debugger.c \
-        configuration-parser.tab.c configuration-scanner.c \
-        request_info.c safe_mode.c fopen-wrappers.c constants.c \
--       php3_realpath.c alloca.c php_compat.c
-+       php3_realpath.c alloca.c php_compat.c abstractions.c
- 
- OBJS = $(SOURCE:.c=.o) @LIBOBJS@
- 
diff --git a/www/php3/patches/patch-af b/www/php3/patches/patch-af
deleted file mode 100644
index e1fc21242d1..00000000000
--- a/www/php3/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/10/23 05:47:29 jlam Exp $
-
---- convertor/Makefile.orig	Mon Dec 15 16:56:47 1997
-+++ convertor/Makefile
-@@ -1,27 +1,17 @@
--convertor:	language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o
--	gcc -o convertor language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o
--
--language-parser.tab.c language-parser.tab.h:	language-parser.y token_cache.h
--	bison -p php -v -d language-parser.y
--
--language-scanner.c:		language-scanner.lex token_cache.h
--	flex -i -Pphp -olanguage-scanner.c language-scanner.lex
-+all: convertor
- 
-+convertor:	language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o
-+	${LINK.c} -o convertor language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o
- 
- language-parser.tab.o:	language-parser.tab.c token_cache.h
--	gcc -c language-parser.tab.c -o language-parser.tab.o
- 
- language-scanner.o:		language-scanner.c token_cache.h language-parser.tab.h
--	gcc -c language-scanner.c -o language-scanner.o
- 
- token_cache.o:	token_cache.c token_cache.h
--	gcc -c token_cache.c -o token_cache.o
- 
- main.o:		main.c token_cache.h
--	gcc -c main.c -o main.o
- 
- alloc.o:	alloc.c token_cache.h
--	gcc -c alloc.c -o alloc.o
- 
- clean:
- 	rm -f *.o *.tab.c *.output language-scanner.c convertor
diff --git a/www/php3/patches/patch-ag b/www/php3/patches/patch-ag
deleted file mode 100644
index 0f82725bd98..00000000000
--- a/www/php3/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/04/13 11:23:19 tron Exp $
-
---- convertor/alloc.c.orig	Tue Dec  7 12:16:24 1999
-+++ convertor/alloc.c	Tue Dec  7 12:16:24 1999
-@@ -33,9 +33,7 @@
- 
- #include "token_cache.h"
--#if WIN32|WINNT
- #include <stdlib.h>
- #include <malloc.h>
- #include <string.h>
--#endif
- 
- mem_header *head;
diff --git a/www/php3/patches/patch-ah b/www/php3/patches/patch-ah
deleted file mode 100644
index 9360d915006..00000000000
--- a/www/php3/patches/patch-ah
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ah,v 1.9 2002/01/10 13:17:12 jlam Exp $
-
---- configure.in.orig	Wed Jun 14 04:58:08 2000
-+++ configure.in
-@@ -75,7 +75,7 @@
- AC_MSG_RESULT($php_cv_cc_dashr)
- if test $php_cv_cc_dashr = "yes"; then
- 	ld_runpath_switch="-R"
--	apxs_runpath_switch="-Wl,-R'"
-+	apxs_runpath_switch="-Wl,-R"
- else
- 	AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
- 	AC_CACHE_VAL(php_cv_cc_rpath,[
-@@ -86,11 +86,11 @@
- 	AC_MSG_RESULT($php_cv_cc_rpath)
- 	if test $php_cv_cc_rpath = "yes"; then
- 		ld_runpath_switch="-Wl,-rpath,"
--		apxs_runpath_switch="-Wl,'-rpath "
-+		apxs_runpath_switch="-Wl,-rpath "
- 	else
- 		dnl something innocuous
- 		ld_runpath_switch="-L"
--		apxs_runpath_switch="-L'"
-+		apxs_runpath_switch="-L"
- 	fi
- fi
- 
-@@ -106,7 +106,7 @@
- AC_CHECK_SIZEOF(int, 4)
- 
- dnl AC_PROG_INSTALL
--AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
-+AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib)
- if test -n "$PROG_SENDMAIL"; then
-   AC_DEFINE(HAVE_SENDMAIL)
- fi
-@@ -115,10 +115,10 @@
- dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
- dnl and source packages.  This should be harmless on other OSs.
- dnl
--if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
--       CFLAGS="$CFLAGS -I/usr/pkg/include"
--       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
--fi
-+dnl if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
-+dnl        CFLAGS="$CFLAGS -I/usr/pkg/include"
-+dnl        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
-+dnl fi
- 
- AC_CHECK_FUNC(gethostent, [], [
-   AC_CHECK_LIB(nsl, gethostent, [
-@@ -305,7 +305,7 @@
- 	if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
- 		PHP_APXS_BROKEN=yes
- 	fi
--    PHP_LIBS=-L/usr/local/lib
-+    PHP_LIBS=
-     STRONGHOLD=
-     AC_DEFINE(APACHE)
-     AC_SUBST(APXS)
diff --git a/www/php3/patches/patch-ai b/www/php3/patches/patch-ai
deleted file mode 100644
index edbe17a2566..00000000000
--- a/www/php3/patches/patch-ai
+++ /dev/null
@@ -1,329 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2002/01/10 13:17:12 jlam Exp $
-
---- configure.orig	Fri Oct 20 12:05:17 2000
-+++ configure	Wed Jan  9 15:05:23 2002
-@@ -1459,7 +1459,7 @@
- echo "$ac_t""$php_cv_cc_dashr" 1>&6
- if test $php_cv_cc_dashr = "yes"; then
- 	ld_runpath_switch="-R"
--	apxs_runpath_switch="-Wl,-R'"
-+	apxs_runpath_switch="-Wl,-R"
- else
- 	echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
- echo "configure:1466: checking if compiler supports -Wl,-rpath," >&5
-@@ -1493,10 +1493,10 @@
- 	echo "$ac_t""$php_cv_cc_rpath" 1>&6
- 	if test $php_cv_cc_rpath = "yes"; then
- 		ld_runpath_switch="-Wl,-rpath,"
--		apxs_runpath_switch="-Wl,'-rpath "
-+		apxs_runpath_switch="-Wl,-rpath "
- 	else
- 				ld_runpath_switch="-L"
--		apxs_runpath_switch="-L'"
-+		apxs_runpath_switch="-L"
- 	fi
- fi
- 
-@@ -1626,7 +1626,7 @@
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib"
-+  ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib"
-   for ac_dir in $ac_dummy; do 
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1653,13 +1653,9 @@
- 
- fi
- 
--if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
--       CFLAGS="$CFLAGS -I/usr/pkg/include"
--       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
--fi
- 
- echo $ac_n "checking for gethostent""... $ac_c" 1>&6
--echo "configure:1663: checking for gethostent" >&5
-+echo "configure:1659: checking for gethostent" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostent'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4413,7 +4409,7 @@
- 	if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
- 		PHP_APXS_BROKEN=yes
- 	fi
--    PHP_LIBS=-L/usr/local/lib
-+    PHP_LIBS=
-     STRONGHOLD=
-     cat >> confdefs.h <<\EOF
- #define APACHE 1
-@@ -5199,7 +5195,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -5240,7 +5236,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -5281,7 +5277,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -5397,7 +5393,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -5514,7 +5510,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -5608,7 +5604,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -6246,7 +6242,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -7252,7 +7248,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -7372,7 +7368,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -7661,7 +7657,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -8065,7 +8061,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -8091,7 +8087,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -8883,7 +8879,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -9420,7 +9416,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -9556,7 +9552,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -9698,7 +9694,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -9848,7 +9844,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -10231,7 +10227,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -10311,7 +10307,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -10457,7 +10453,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -10612,7 +10608,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -11068,7 +11064,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -12871,7 +12867,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -13046,7 +13042,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -13235,7 +13231,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -13399,7 +13395,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -13563,7 +13559,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -13677,7 +13673,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -13772,7 +13768,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
-@@ -14020,7 +14016,7 @@
-     
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
diff --git a/www/php3/patches/patch-aj b/www/php3/patches/patch-aj
deleted file mode 100644
index 8325fc158b7..00000000000
--- a/www/php3/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/01/10 13:17:12 jlam Exp $
-
---- aclocal.m4.orig	Wed Jan  9 15:00:48 2002
-+++ aclocal.m4
-@@ -44,7 +44,7 @@
-     AC_PHP_ONCE(LIBPATH, $ai_p, [
-       EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-       if test -n "$APXS" ; then
--        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
-+        RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p"
-       else
-         RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-       fi
diff --git a/www/php3/patches/patch-ak b/www/php3/patches/patch-ak
deleted file mode 100644
index 3ebaa00cf11..00000000000
--- a/www/php3/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/02/28 15:07:18 jlam Exp $
-
---- functions/mime.c.orig	Mon Oct 16 21:30:59 2000
-+++ functions/mime.c	Thu Feb 28 09:20:34 2002
-@@ -1,4 +1,14 @@
- /*
-+ * This file is patched with the security fix for the file-upload bug
-+ * taken from:
-+ *
-+ *     http://www.php.net/do_download.php?download_file=mime.c.diff-3.0.gz
-+ *
-+ * and fixes the security problem noted in
-+ *
-+ *     http://security.e-matters.de/advisories/012002.html
-+ */
-+/*
-    +----------------------------------------------------------------------+
-    | PHP HTML Embedded Scripting Language Version 3.0                     |
-    +----------------------------------------------------------------------+
-@@ -85,7 +95,9 @@
- 					SAFE_RETURN;
- 				}
- 				loc = memchr(ptr, '\n', rem);
-+				rem -= loc - ptr;
- 				name = strstr(ptr, " name=");
-+				ptr = loc;
- 				if (name && name < loc) {
- 					name += 6;
- 					s = memchr(name, '\"', loc - name);
-@@ -138,6 +150,10 @@
- 						sprintf(lbuf, "%s_name[]", abuf);
- 						sbuf=estrdup(abuf);
- 					} else {
-+						if (abuf) {
-+							efree(abuf);
-+							abuf = NULL;
-+						}
- 						sprintf(lbuf, "%s_name", namebuf);
- 						sbuf=estrdup(namebuf);
- 					}
-- 
cgit v1.2.3