From ee54bd212d5ace8582a62ca9f6def1359c23bb77 Mon Sep 17 00:00:00 2001 From: Matthias Petermann Date: Fri, 2 Oct 2020 17:25:36 +0200 Subject: [PATCH] cyrus-imapd: unbreak build by removing now obsolete subst instruction in Makefile, update PLIST --- cyrus-imapd30/Makefile | 7 +------ cyrus-imapd30/PLIST | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/cyrus-imapd30/Makefile b/cyrus-imapd30/Makefile index cdb056730e..5b811069ce 100644 --- a/cyrus-imapd30/Makefile +++ b/cyrus-imapd30/Makefile @@ -1,7 +1,7 @@ # $NetBSD: $ DISTNAME= cyrus-imapd-3.0.13 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=cyrusimap/} GITHUB_RELEASE= ${PKGNAME_NOREV} @@ -66,11 +66,6 @@ FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf REPLACE_PERL+= tools/rehash REPLACE_PERL+= perl/annotator/Daemon.pm -SUBST_CLASSES+= sh -SUBST_STAGE.sh= post-build -SUBST_FILES.sh= perl/imap/blib/script/cyradm -SUBST_SED.sh+= -e 's|^\#!.*sh|\#!/bin/sh|' - pre-build: ${RUN}${_ULIMIT_CMD} diff --git a/cyrus-imapd30/PLIST b/cyrus-imapd30/PLIST index 56134f0320..88096aec59 100644 --- a/cyrus-imapd30/PLIST +++ b/cyrus-imapd30/PLIST @@ -72,19 +72,19 @@ lib/libcyrus_com_err.la lib/libcyrus_imap.la lib/libcyrus_min.la lib/libcyrus_sieve.la -lib/perl5/site_perl/5.30.0/Cyrus/Annotator/AnnotateInlinedCIDs.pm -lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Daemon.pm -lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Message.pm -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP.pm -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/Admin.pm -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/IMSP.pm -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/Shell.pm -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/SIEVE/managesieve.pm -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/IMAP/.packlist -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/IMAP/IMAP.so -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist -lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so +lib/perl5/site_perl/5.32.0/Cyrus/Annotator/AnnotateInlinedCIDs.pm +lib/perl5/site_perl/5.32.0/Cyrus/Annotator/Daemon.pm +lib/perl5/site_perl/5.32.0/Cyrus/Annotator/Message.pm +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/Cyrus/IMAP.pm +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/Admin.pm +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/IMSP.pm +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/Shell.pm +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/Cyrus/SIEVE/managesieve.pm +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/auto/Cyrus/IMAP/.packlist +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/auto/Cyrus/IMAP/IMAP.so +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist +lib/perl5/site_perl/5.32.0/x86_64-netbsd-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so lib/perl5/site_perl/bin/cyradm lib/perl5/site_perl/man/man1/cyradm.1 lib/perl5/site_perl/man/man3/Cyrus::Annotator::Daemon.3