diff options
author | jlam <jlam@pkgsrc.org> | 2017-08-14 15:25:36 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2017-08-14 15:25:36 +0000 |
commit | 3bd5bc662ef94c4fc3e052f6f6c90bf3f045a7e3 (patch) | |
tree | b368b6177372109291d0c71abe50ec46d72693a3 /mail/cyrus-imapd | |
parent | cd5bb1fa552aef1a3f9a4edbe05be89a35d844f2 (diff) | |
download | pkgsrc-3bd5bc662ef94c4fc3e052f6f6c90bf3f045a7e3.tar.gz |
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.
Bump the PKGREVISION of the cyrus-imapd and cyrus-imapd23 packages
due to the change in the installed script.
Diffstat (limited to 'mail/cyrus-imapd')
-rw-r--r-- | mail/cyrus-imapd/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 4617ed88262..7889975d46f 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -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_SYSCONFDIR}/cyrus.conf 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 |