2012/5/27 Antoine Jacoutot <ajacou...@bsdfrog.org>

> On Sun, May 27, 2012 at 09:35:13PM +0800, wen heping wrote:
> > I found no ports depends on pecl-zip in portstree. But I suggest add
>
> There are at least photoshow and owncloud that depend on it.
>

You are right.
And now I am sure only photoshow and owncloud that depend on it :)
Thanks!

I attached revised patch.

wen
Index: archivers/pecl-zip/Makefile
===================================================================
RCS file: archivers/pecl-zip/Makefile
diff -N archivers/pecl-zip/Makefile
--- archivers/pecl-zip/Makefile 19 Apr 2012 21:30:26 -0000      1.9
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-# $OpenBSD: Makefile,v 1.9 2012/04/19 21:30:26 sthen Exp $
-
-COMMENT=       PHP support for zip archives
-DISTNAME=      zip-1.10.2
-REVISION=      5
-CATEGORIES=    archivers
-
-# PHP
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=    Yes
-PERMIT_DISTFILES_CDROM=        Yes
-PERMIT_DISTFILES_FTP=  Yes
-
-WANTLIB=       z
-
-MODULES=       lang/php/pecl
-CONFIGURE_STYLE= gnu
-
-.include <bsd.port.mk>
Index: archivers/pecl-zip/distinfo
===================================================================
RCS file: archivers/pecl-zip/distinfo
diff -N archivers/pecl-zip/distinfo
--- archivers/pecl-zip/distinfo 16 Aug 2009 06:39:51 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-MD5 (zip-1.10.2.tgz) = CneSVTiPp8nqSz/OrVXMaQ==
-RMD160 (zip-1.10.2.tgz) = hnbs1N7TCCuNIs9zgQGa07eXhPs=
-SHA1 (zip-1.10.2.tgz) = GVl1H23sTqHkPxAjDD/KDPIGlrU=
-SHA256 (zip-1.10.2.tgz) = 1L1VrhmADr4gjivSM63NSr9RbUwFMCA92Le+hL4i35g=
-SIZE (zip-1.10.2.tgz) = 236912
Index: archivers/pecl-zip/pkg/DESCR
===================================================================
RCS file: archivers/pecl-zip/pkg/DESCR
diff -N archivers/pecl-zip/pkg/DESCR
--- archivers/pecl-zip/pkg/DESCR        16 Aug 2009 06:39:51 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-pecl-zip is a PHP extension for reading zip archives.
-
-Documentation is available online at:
-
-http://php.net/zip/
Index: archivers/pecl-zip/pkg/PLIST
===================================================================
RCS file: archivers/pecl-zip/pkg/PLIST
diff -N archivers/pecl-zip/pkg/PLIST
--- archivers/pecl-zip/pkg/PLIST        8 Jul 2011 18:25:40 -0000       1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/07/08 18:25:40 robert Exp $
-lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
-share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
-@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
Index: lang/php/Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.28
diff -u -r1.28 Makefile.inc
--- lang/php/Makefile.inc       28 Apr 2012 08:34:56 -0000      1.28
+++ lang/php/Makefile.inc       27 May 2012 12:53:44 -0000
@@ -300,6 +300,12 @@
 LIB_DEPENDS-xsl=       textproc/libxslt
 WANTLIB-xsl=           ${MODLIBICONV_WANTLIB} m xml2 z xslt>=3 exslt
 
+# zip
+MULTI_PACKAGES+=       -zip
+COMMENT-zip=           zip functions for php5
+CONFIGURE_ARGS+=       --enable-zip=shared,${LOCALBASE}
+WANTLIB-zip=           m z
+
 # some variables to substitute
 SUBST_VARS=    MODPHP_CONFIG_PATH PV ^MODULE_NAME
 PHP_VERSION=   ${V}
Index: lang/php/5.2/pkg/PLIST-zip
===================================================================
RCS file: lang/php/5.2/pkg/PLIST-zip
diff -N lang/php/5.2/pkg/PLIST-zip
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lang/php/5.2/pkg/PLIST-zip  27 May 2012 12:53:48 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@conflict php-zip->=5.2,<5.3
+@pkgpath www/php5/extensions,-zip
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Index: lang/php/5.3/pkg/PLIST-zip
===================================================================
RCS file: lang/php/5.3/pkg/PLIST-zip
diff -N lang/php/5.3/pkg/PLIST-zip
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lang/php/5.3/pkg/PLIST-zip  27 May 2012 12:53:48 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@conflict php-zip->=5.3,<5.4
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Index: lang/php/files/DESCR-zip
===================================================================
RCS file: lang/php/files/DESCR-zip
diff -N lang/php/files/DESCR-zip
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-zip    27 May 2012 12:53:48 -0000
@@ -0,0 +1,7 @@
+Zip is a file format used for data compression and archiving.
+A zip file contains one or more files that have been compressed,
+to reduce file size, or stored as is. The zip file format permits
+a number of compression algorithms.
+
+This PHP extension provides a processor independent API to Zip
+transformations.
Index: www/owncloud/Makefile
===================================================================
RCS file: /cvs/ports/www/owncloud/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/owncloud/Makefile       3 May 2012 07:20:42 -0000       1.5
+++ www/owncloud/Makefile       27 May 2012 14:28:26 -0000
@@ -38,7 +38,7 @@
 TINSTDIR=      ${TRUEPREFIX}/owncloud
 SUBST_VARS=    INSTDIR TINSTDIR
 
-RUN_DEPENDS=   archivers/pecl-zip \
+RUN_DEPENDS=   lang/php/${MODPHP_VERSION},-zip \
                lang/php/${MODPHP_VERSION},-curl \
                lang/php/${MODPHP_VERSION},-gd
 
Index: www/photoshow/Makefile
===================================================================
RCS file: /cvs/ports/www/photoshow/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/photoshow/Makefile      15 Mar 2012 13:38:33 -0000      1.3
+++ www/photoshow/Makefile      27 May 2012 14:30:42 -0000
@@ -27,7 +27,7 @@
 TINSTDIR=      ${TRUEPREFIX}/photoshow
 SUBST_VARS=    INSTDIR TINSTDIR
 
-RUN_DEPENDS=   archivers/pecl-zip
+RUN_DEPENDS=   lang/php/${MODPHP_VERSION},-zip
 
 do-install:
        cp -R ${WRKSRC} ${INSTDIR}

Reply via email to