cyrus-imapd36: fix perl interpreter locations, removed unsupported snmp build option

[Matthias Petermann <mp%petermann-it.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Matthias Petermann <mp%petermann-it.de@localhost>
Pushed By:	mp
Date:		Fri Feb 17 08:21:11 2023 +0100
Changeset:	8288a9ff7fb343671e98ca377ccb4084ca4e7a88

Modified Files:
	cyrus-imapd36/Makefile
	cyrus-imapd36/options.mk

Log Message:
cyrus-imapd36: fix perl interpreter locations, removed unsupported snmp build option

Signed-off-by: Matthias Petermann <mp%petermann-it.de@localhost>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8288a9ff7fb343671e98ca377ccb4084ca4e7a88

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cyrus-imapd36/Makefile   | 12 +++++++++++-
 cyrus-imapd36/options.mk | 10 +---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs:
diff --git a/cyrus-imapd36/Makefile b/cyrus-imapd36/Makefile
index 48c97e47f2..ab308dc55e 100644
--- a/cyrus-imapd36/Makefile
+++ b/cyrus-imapd36/Makefile
@@ -62,10 +62,20 @@ CONF_FILES+=		${EGDIR}/cyrus.conf ${PKG_SYSCONFDIR}/cyrus.conf
 RCD_SCRIPTS=		cyrus
 FILES_SUBST+=		IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
 
-REPLACE_PERL+=		tools/rehash
+REPLACE_PERL+=		tools/arbitronsort.pl
+REPLACE_PERL+=		tools/compile_st.pl
 REPLACE_PERL+=		tools/config2header
+REPLACE_PERL+=		tools/config2rst
+REPLACE_PERL+=		tools/config2sample
+REPLACE_PERL+=		tools/fixsearchpath.pl
+REPLACE_PERL+=		tools/masssievec
+REPLACE_PERL+=		tools/mkimap
+REPLACE_PERL+=		tools/mknewsgroups
+REPLACE_PERL+=		tools/perl2rst
+REPLACE_PERL+=		tools/rehash
 REPLACE_PERL+=		imap/promdatagen
 REPLACE_PERL+=		perl/annotator/Daemon.pm
+REPLACE_PERL+=		perl/sieve/scripts/sieveshell.pl
 
 pre-build:
 	${RUN}${_ULIMIT_CMD}
diff --git a/cyrus-imapd36/options.mk b/cyrus-imapd36/options.mk
index 207d67c86e..d008c387d4 100644
--- a/cyrus-imapd36/options.mk
+++ b/cyrus-imapd36/options.mk
@@ -2,7 +2,7 @@
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4 ldap pcre snmp
+PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4 ldap pcre
 PKG_SUPPORTED_OPTIONS+=	mysql pgsql sqlite http
 PKG_SUGGESTED_OPTIONS=	pcre http ldap
 
@@ -71,14 +71,6 @@ PLIST.ldap=		yes
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-.if !empty(PKG_OPTIONS:Msnmp)
-.  include "../../net/net-snmp/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-snmp=${BUILDLINK_PREFIX.net-snmp}
-USE_TOOLS+=		perl:run
-.else
-CONFIGURE_ARGS+=	--without-snmp
-.endif
-
 .if !empty(PKG_OPTIONS:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}