CVS commit: pkgsrc/www/z-push

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Jun 30 03:17:52 UTC 2016

Modified Files:
        pkgsrc/www/z-push: Makefile

Log Message:
Fix build problem with PKG_DEVELOPER=YES.

* Replace interpreter of tools/migrate-2.0.x-2.1.0.php, too.
* Change post-patch target to pre-configure for easier maintenance of
  patch files.
* Drop execute bit from lib/syncobjects/syncresolverecipient.php.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/z-push/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/z-push/Makefile
diff -u pkgsrc/www/z-push/Makefile:1.2 pkgsrc/www/z-push/Makefile:1.3
--- pkgsrc/www/z-push/Makefile:1.2      Sun Jun 19 22:16:48 2016
+++ pkgsrc/www/z-push/Makefile  Thu Jun 30 03:17:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/19 22:16:48 jym Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/30 03:17:52 taca Exp $
 #
 
 DISTNAME=      z-push-${ZPUSH_VERSION}
@@ -58,6 +58,7 @@ REPLACE.php.new=      ${PREFIX}/bin/php
 REPLACE_FILES.php=     z-push-admin.php
 REPLACE_FILES.php+=    z-push-top.php
 REPLACE_FILES.php+=    backend/zarafa/listfolders.php
+REPLACE_FILES.php+=    tools/migrate-2.0.x-2.1.0.php
 
 SUBST_CLASSES+=                conf
 SUBST_STAGE.conf=      pre-configure
@@ -74,8 +75,9 @@ SUBST_MESSAGE.state-dir=Fixing Z-push st
 post-extract:
        ${CP} ${FILESDIR}/z-push.conf ${WRKDIR}/z-push.conf
 
-post-patch:
+pre-configure:
        ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+       ${CHMOD} -x ${WRKSRC}/lib/syncobjects/syncresolverecipient.php
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/config.php    \