CVS commit: pkgsrc/mail

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Mon Aug 14 15:25:36 UTC 2017

Modified Files:
        pkgsrc/mail/cyrus-imapd: Makefile
        pkgsrc/mail/cyrus-imapd23: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/mail/cyrus-imapd/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/mail/cyrus-imapd23/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-imapd/Makefile
diff -u pkgsrc/mail/cyrus-imapd/Makefile:1.108 pkgsrc/mail/cyrus-imapd/Makefile:1.109
--- pkgsrc/mail/cyrus-imapd/Makefile:1.108      Tue Aug  1 14:59:01 2017
+++ pkgsrc/mail/cyrus-imapd/Makefile    Mon Aug 14 15:25:36 2017
@@ -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 @@ CONF_FILES+=               ${EGDIR}/normal.conf ${PKG
 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

Index: pkgsrc/mail/cyrus-imapd23/Makefile
diff -u pkgsrc/mail/cyrus-imapd23/Makefile:1.46 pkgsrc/mail/cyrus-imapd23/Makefile:1.47
--- pkgsrc/mail/cyrus-imapd23/Makefile:1.46     Tue Aug  1 14:59:01 2017
+++ pkgsrc/mail/cyrus-imapd23/Makefile  Mon Aug 14 15:25:36 2017
@@ -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 @@ CONF_FILES+=         ${EGDIR}/normal.conf ${PKG
 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