Re: CVS commit: pkgsrc/www/z-push

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

In message <20160621171721.GA19024%britannica.bec.de@localhost>
        on Tue, 21 Jun 2016 19:17:21 +0200,
        Joerg Sonnenberger <joerg%bec.de@localhost> wrote:
>> Log Message:
>> Clean up .orig files after patch... makes things tidier.
I do not suggest that removing *.orig files in post-patch since it
make updating patches difficult.

> Now we get to:
> 
> ERROR: [check-interpreter.mk] The interpreter "/usr/bin/php" of "/data/scratch/www/z-push/work/.destdir/usr/pkg/share/z-push/tools/migrate-2.0.x-2.1.0.php" does not exist.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/z-push/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile    19 Jun 2016 22:16:48 -0000      1.2
+++ Makefile    27 Jun 2016 04:27:50 -0000
@@ -58,6 +58,7 @@
 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
@@ -71,11 +72,10 @@
 SUBST_VARS.state-dir=  ZPUSHSTATEDIR
 SUBST_MESSAGE.state-dir=Fixing Z-push state directory path.
 
-post-extract:
+pre-configure:
        ${CP} ${FILESDIR}/z-push.conf ${WRKDIR}/z-push.conf
-
-post-patch:
        ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+       ${CHMOD} -x ${WRKSRC}/lib/syncobjects/syncresolverecipient.php
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/config.php    \

-- 
Takahiro Kambe <taca%NetBSD.org@localhost>