CVS commit: [pkgsrc-2017Q2] pkgsrc/mail/cyrus-imapd24

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Aug 13 18:49:28 UTC 2017

Modified Files:
        pkgsrc/mail/cyrus-imapd24 [pkgsrc-2017Q2]: Makefile

Log Message:
Pullup ticket #5529 - requested by jnemeth
mail/cyrus-imapd24: build fix

Revisions pulled up:
- mail/cyrus-imapd24/Makefile                                   1.51

---
   Module Name:    pkgsrc
   Committed By:   jnemeth
   Date:           Mon Jul 31 05:13:49 UTC 2017

   Modified Files:
           pkgsrc/mail/cyrus-imapd24: Makefile

   Log Message:
   Fix up the path to /bin/sh in cyradm script.  The damage happens
   during the build stage, so can't use a simple REPLACE_SH.

   This is a build problem that likely is only detected when
   PKG_DEVELOPER=YES so bump PKGREVISION anyways.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.50.2.1 pkgsrc/mail/cyrus-imapd24/Makefile

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

Modified files:

Index: pkgsrc/mail/cyrus-imapd24/Makefile
diff -u pkgsrc/mail/cyrus-imapd24/Makefile:1.50 pkgsrc/mail/cyrus-imapd24/Makefile:1.50.2.1
--- pkgsrc/mail/cyrus-imapd24/Makefile:1.50     Sat Apr 22 21:03:41 2017
+++ pkgsrc/mail/cyrus-imapd24/Makefile  Sun Aug 13 18:49:28 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2017/04/22 21:03:41 adam Exp $
+# $NetBSD: Makefile,v 1.50.2.1 2017/08/13 18:49:28 bsiegert Exp $
 
 DISTNAME=      cyrus-imapd-2.4.18
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
 MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
@@ -66,6 +66,11 @@ FILES_SUBST+=                IMAPDCONF=${PKG_SYSCONFDI
 
 REPLACE_PERL+=         tools/rehash
 
+SUBST_CLASSES+=                sh
+SUBST_STAGE.sh=                post-build
+SUBST_FILES.sh=                perl/imap/blib/script/cyradm
+SUBST_SED.sh+=         -e 's|^\#!.*|\#!/bin/sh|'
+
 PERL5_PACKLIST= \
        auto/Cyrus/IMAP/.packlist                       \
        auto/Cyrus/SIEVE/managesieve/.packlist