[pkgsrc/trunk]: pkgsrc/mail mail/cyrus-imapd{, 23}: Remove work directory refe...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1174e0469976
branches:  trunk
changeset: 366402:1174e0469976
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Aug 14 15:25:36 2017 +0000

description:
mail/cyrus-imapd{,23}: Remove work directory references in scripts.

The installed cyradm shell script contained the path to the shell
in the tools directory instead of the system /bin/sh.  This
happened as part of the build process by the Perl MakeMaker system
used to build the Cyrus Perl modules.  Make the replacement at
post-build time to change it back to /bin/sh.

This fix was mirrored from the identical fix to the cyrus-imapd24
module by jnemeth%pkgsrc.org@localhost.

Bump the PKGREVISION of the cyrus-imapd and cyrus-imapd23 packages
due to the change in the installed script.

diffstat:

 mail/cyrus-imapd/Makefile   |  12 ++++++++++--
 mail/cyrus-imapd23/Makefile |  12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r c945b87465be -r 1174e0469976 mail/cyrus-imapd/Makefile
--- a/mail/cyrus-imapd/Makefile Mon Aug 14 15:25:20 2017 +0000
+++ b/mail/cyrus-imapd/Makefile Mon Aug 14 15:25:36 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2017/08/01 14:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2017/08/14 15:25:36 jlam Exp $
 
 DISTNAME=      cyrus-imapd-2.2.13p1
-PKGREVISION=   15
+PKGREVISION=   16
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
 MASTER_SITES+= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
@@ -127,6 +127,14 @@
 RCD_SCRIPTS=           cyrus
 FILES_SUBST+=          IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
 
+# Fix path to /bin/sh that was replaced by Perl's MakeMaker to
+# point to the shell in the tools directory.
+#
+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
diff -r c945b87465be -r 1174e0469976 mail/cyrus-imapd23/Makefile
--- a/mail/cyrus-imapd23/Makefile       Mon Aug 14 15:25:20 2017 +0000
+++ b/mail/cyrus-imapd23/Makefile       Mon Aug 14 15:25:36 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2017/08/01 14:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2017/08/14 15:25:36 jlam Exp $
 
 DISTNAME=      cyrus-imapd-2.3.18
-PKGREVISION=   22
+PKGREVISION=   23
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
 MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
@@ -65,6 +65,14 @@
 RCD_SCRIPTS=           cyrus
 FILES_SUBST+=          IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
 
+# Fix path to /bin/sh that was replaced by Perl's MakeMaker to
+# point to the shell in the tools directory.
+#
+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