php4-zip was replaced by php-zip, which can be used with both PHP4 and PHP5.

The PECL extension is preferred even for PHP4 (which has zip extension
bundled), since further maintenance is likely to be more active there.

4 files changed, 5 insertions, 22 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index f73dbec492f..c58b603da31 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2004/10/31 21:46:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.79 2004/11/06 18:32:19 jdolecek Exp $
 #
 
 COMMENT=	Archivers
@@ -49,7 +49,7 @@ SUBDIR+=	p7zip
 SUBDIR+=	par2
 SUBDIR+=	pax
 SUBDIR+=	php-bz2
-SUBDIR+=	php4-zip
+SUBDIR+=	php-zip
 SUBDIR+=	php-zlib
 SUBDIR+=	ppmd
 SUBDIR+=	ppunpack
diff --git a/archivers/php4-zip/DESCR b/archivers/php4-zip/DESCR
deleted file mode 100644
index bb73380c468..00000000000
--- a/archivers/php4-zip/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides ZIP archive handling support for PHP4.
diff --git a/archivers/php4-zip/Makefile b/archivers/php4-zip/Makefile
deleted file mode 100644
index 32b53bce8fc..00000000000
--- a/archivers/php4-zip/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2004/11/05 21:44:44 jdolecek Exp $
-
-MODNAME=		zip
-CATEGORIES+=		archivers
-PKGREVISION=		# empty
-COMMENT=		PHP4 extension for ZIP archive handling
-
-USE_BUILDLINK3=		YES
-
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
-
-PHP_VERSION_REQD=	4
-.include "../../lang/php/ext.mk"
-.include "../../archivers/zziplib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/php4-extensions/Makefile b/meta-pkgs/php4-extensions/Makefile
index 60b42681220..325e92ba0ed 100644
--- a/meta-pkgs/php4-extensions/Makefile
+++ b/meta-pkgs/php4-extensions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/11/05 21:04:38 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/06 18:35:19 jdolecek Exp $
 
 DISTNAME=	php-extensions-4.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	meta-pkgs www php
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -47,6 +47,7 @@ DEPENDS+=	php-sysvsem-4.3.*:../../devel/php-sysvsem
 DEPENDS+=	php-sysvshm-4.3.*:../../devel/php-sysvshm
 DEPENDS+=	php-wddx-4.3.*:../../textproc/php-wddx
 DEPENDS+=	php-yp-4.3.*:../../net/php-yp
+DEPENDS+=	php-zip-4.3.*:../../archivers/php-zip
 DEPENDS+=	php-zlib-4.3.*:../../archivers/php-zlib
 
 # PHP 4.x-only extensions
@@ -54,7 +55,6 @@ DEPENDS+=	php-apc-4.3.*:../../www/php4-apc
 DEPENDS+=	php-domxml-4.3.*:../../textproc/php4-domxml
 DEPENDS+=	php-pdflib-4.3.*:../../print/php4-pdflib
 DEPENDS+=	php-xslt-4.3.*:../../textproc/php4-xslt
-DEPENDS+=	php-zip-4.3.*:../../archivers/php4-zip
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes