summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/cyrus-imapd/Makefile12
-rw-r--r--mail/cyrus-imapd23/Makefile12
2 files changed, 20 insertions, 4 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
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 37b577dd0f6..507f883bd4f 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -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_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