From 020c38101d810988ea98fa8ef21ff553bcc5eb3a Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Tue, 2 Mar 2010 14:46:51 +0000
Subject: Switch to use zip extension bundled with php 5.2.13 which is internal
 version 1.8.11.

Changes are unknown, please refer PHP's changes.
---
 archivers/php-zip/Makefile | 11 ++++++++---
 archivers/php-zip/distinfo |  5 -----
 2 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 archivers/php-zip/distinfo

(limited to 'archivers/php-zip')

diff --git a/archivers/php-zip/Makefile b/archivers/php-zip/Makefile
index 4bf536823f6..5fc9d21a5f2 100644
--- a/archivers/php-zip/Makefile
+++ b/archivers/php-zip/Makefile
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.10 2009/08/12 02:38:24 dsainty Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/02 14:46:51 taca Exp $
 
 MODNAME=		zip
-PECL_VERSION=		1.8.10
 CATEGORIES+=		archivers
 COMMENT=		PHP extension for ZIP archive handling
 
-CONFLICTS=	php-zip-[0-9]*
+CONFLICTS=		php-zip-[0-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFIGURE_ARGS+=	--enable-zip
 CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib}
 
+# Remove these PKGNAME tweak after PHP 5.2.14 release
+.include "../../lang/php/phpversion.mk"
+.if ${PKG_PHP_VERSION} == "5"
+PKGNAME:=		${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.1.8.11
+.endif
+
 .include "../../lang/php/ext.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/php-zip/distinfo b/archivers/php-zip/distinfo
deleted file mode 100644
index cec1c5da993..00000000000
--- a/archivers/php-zip/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2009/08/12 02:38:24 dsainty Exp $
-
-SHA1 (php-zip/zip-1.8.10.tgz) = e4280bfdfecbeedc16e0528bfbda2254a70d5918
-RMD160 (php-zip/zip-1.8.10.tgz) = 424e2401e6ce473c158038b0b6dd4432a3b81364
-Size (php-zip/zip-1.8.10.tgz) = 66972 bytes
-- 
cgit v1.2.3