Update to match the updated perl in pkgsrc and fix some pkglint.

[Geoff Adams (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Geoff Adams <gadams%avernus.com@localhost>
Pushed By:	gadams
Date:		Sat Dec 21 23:29:20 2024 -0800
Changeset:	ef02da7fecd15c1f1b9f9766f74cf761fecece7c

Modified Files:
	cyrus-imapd34/PLIST
	cyrus-imapd34/options.mk
Added Files:
	cyrus-imapd34/COMMIT_MSG

Log Message:
Update to match the updated perl in pkgsrc and fix some pkglint.

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

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

diffstat:
 cyrus-imapd34/COMMIT_MSG | 14 ++++++++++++++
 cyrus-imapd34/PLIST      | 26 +++++++++++++-------------
 cyrus-imapd34/options.mk |  2 +-
 3 files changed, 28 insertions(+), 14 deletions(-)

diffs:
diff --git a/cyrus-imapd34/COMMIT_MSG b/cyrus-imapd34/COMMIT_MSG
new file mode 100644
index 0000000000..4b5a3d876e
--- /dev/null
+++ b/cyrus-imapd34/COMMIT_MSG
@@ -0,0 +1,14 @@
+mail/cyrus-imapd34: Add Cyrus imapd version 3.4.6
+
+IMAP (Internet Message Access Protocol) is an Internet standards-track
+protocol for accessing messages (mail, bboards, news, etc). The Cyrus
+IMAP server differs from other IMAP server implementations in that it
+is generally intended to be run on "sealed" servers, where normal users
+are not permitted to log in. The mailbox database is stored in parts of
+the filesystem that are private to the Cyrus IMAP system. All user
+access to mail is through the IMAP, POP3, or KPOP protocols.
+
+Version 3.4.x of the Cyrus IMAP server is a useful transition version
+from 2.4.x to higher versions, since this is the latest version that
+can upgrade in-place from Cyrus IMAP 2.4. Once upgraded to 3.4, you can
+then consider upgrading to later versions.
diff --git a/cyrus-imapd34/PLIST b/cyrus-imapd34/PLIST
index 64a5927dc2..2e2fab7a80 100644
--- a/cyrus-imapd34/PLIST
+++ b/cyrus-imapd34/PLIST
@@ -71,19 +71,19 @@ lib/libcyrus.la
 lib/libcyrus_imap.la
 lib/libcyrus_min.la
 lib/libcyrus_sieve.la
-lib/perl5/site_perl/5.38.0/Cyrus/Annotator/AnnotateInlinedCIDs.pm
-lib/perl5/site_perl/5.38.0/Cyrus/Annotator/Daemon.pm
-lib/perl5/site_perl/5.38.0/Cyrus/Annotator/Message.pm
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP.pm
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/auto/Cyrus/Annotator/Daemon/.packlist
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/5.38.0/x86_64-solaris-thread-multi-64/auto/Cyrus/SIEVE/managesieve/managesieve.so
+lib/perl5/site_perl/5.40.0/Cyrus/Annotator/AnnotateInlinedCIDs.pm
+lib/perl5/site_perl/5.40.0/Cyrus/Annotator/Daemon.pm
+lib/perl5/site_perl/5.40.0/Cyrus/Annotator/Message.pm
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP.pm
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP/Admin.pm
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP/IMSP.pm
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/Cyrus/IMAP/Shell.pm
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/Cyrus/SIEVE/managesieve.pm
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/auto/Cyrus/Annotator/Daemon/.packlist
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/auto/Cyrus/IMAP/.packlist
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/auto/Cyrus/IMAP/IMAP.so
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/auto/Cyrus/SIEVE/managesieve/.packlist
+lib/perl5/site_perl/5.40.0/x86_64-solaris-thread-multi-64/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
diff --git a/cyrus-imapd34/options.mk b/cyrus-imapd34/options.mk
index 686c96c2d8..aada0825c1 100644
--- a/cyrus-imapd34/options.mk
+++ b/cyrus-imapd34/options.mk
@@ -49,7 +49,7 @@ CONFIGURE_ENV+=	COMPILE_ET=/usr/bin/compile_et
 CONFIGURE_ARGS+=	--with-com-err=yes
 .  endif
 .endif
-.if defined(CONFIGURE_ENV) && !empty(CONFIGURE_ENV:MCOMPILE_ET=*)
+.if !empty(CONFIGURE_ENV:MCOMPILE_ET=*)
 post-configure:		generate-compile-et
 .endif