CVS commit: pkgsrc/mail/cyrus-imapd32

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 18 18:01:35 UTC 2026

Modified Files:
        pkgsrc/mail/cyrus-imapd32: Makefile distinfo options.mk
Added Files:
        pkgsrc/mail/cyrus-imapd32/patches: patch-lib_ptrarray.c

Log Message:
cyrus-imapd32: Fixes for various platforms. Delint.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/cyrus-imapd32/Makefile \
    pkgsrc/mail/cyrus-imapd32/distinfo pkgsrc/mail/cyrus-imapd32/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/cyrus-imapd32/patches/patch-lib_ptrarray.c

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

Modified files:

Index: pkgsrc/mail/cyrus-imapd32/Makefile
diff -u pkgsrc/mail/cyrus-imapd32/Makefile:1.1 pkgsrc/mail/cyrus-imapd32/Makefile:1.2
--- pkgsrc/mail/cyrus-imapd32/Makefile:1.1      Mon Mar  9 03:19:46 2026
+++ pkgsrc/mail/cyrus-imapd32/Makefile  Wed Mar 18 18:01:35 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/03/09 03:19:46 jnemeth Exp $
+# $NetBSD: Makefile,v 1.2 2026/03/18 18:01:35 nia Exp $
 
 DISTNAME=      cyrus-imapd-3.2.12
 CATEGORIES=    mail
@@ -13,7 +13,7 @@ LICENSE=      original-bsd # like license
 MAKE_JOBS_SAFE=        no
 
 USE_TOOLS+=            perl:run makedepend pkg-config gmake bison
-USE_TOOLS+=            autoconf automake autoreconf
+USE_TOOLS+=            autoconf automake autoreconf flex
 USE_LANGUAGES+=                c c++
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
@@ -54,6 +54,9 @@ CONFIGURE_ARGS+=      --enable-replication
 
 CONFIGURE_ARGS+=       andrew_cv_runpath_switch=${COMPILER_RPATH_FLAG}
 
+LDFLAGS.FreeBSD+=      -lm
+LDFLAGS.OpenBSD+=      -lm
+
 .include "options.mk"
 
 MAKE_ENV+=             PERL=${PERL5:Q}
@@ -75,6 +78,8 @@ REPLACE_PERL+=                tools/mkimap
 REPLACE_PERL+=         tools/mknewsgroups
 REPLACE_PERL+=         tools/rehash
 
+REPLACE_SH+=           perl/imap/cyradm.sh
+
 # Override default Perl install location
 SUBST_CLASSES+=                perldir
 SUBST_STAGE.perldir=   post-configure
Index: pkgsrc/mail/cyrus-imapd32/distinfo
diff -u pkgsrc/mail/cyrus-imapd32/distinfo:1.1 pkgsrc/mail/cyrus-imapd32/distinfo:1.2
--- pkgsrc/mail/cyrus-imapd32/distinfo:1.1      Mon Mar  9 03:19:46 2026
+++ pkgsrc/mail/cyrus-imapd32/distinfo  Wed Mar 18 18:01:35 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2026/03/09 03:19:46 jnemeth Exp $
+$NetBSD: distinfo,v 1.2 2026/03/18 18:01:35 nia Exp $
 
 BLAKE2s (cyrus-imapd-3.2.12.tar.gz) = 7f6702da8894998e51429f13f5403706ff077151f5eff836de802fe839bf2ac4
 SHA512 (cyrus-imapd-3.2.12.tar.gz) = 2c49907f434f49ae50f207e13be67712f58629a95c3de7adceb54193b27adb1dd96011187fef5cf8ec37a2c1763deabac82d33d3568aa82f08890d0a3095c2bb
@@ -8,3 +8,4 @@ SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad
 SHA1 (patch-aq) = 5bb12f98970648c95376b71e16b3c2186fd774b9
 SHA1 (patch-configure) = 3d44f8ba4f6cd829c4adf83a2a0c4e829386b514
 SHA1 (patch-imap_idlemsg.c) = fa7e0a66702a200112cf6ad8d65f22e0a2d5b1f6
+SHA1 (patch-lib_ptrarray.c) = 136dbf943eb18bcc1516db9f25c3aec99f30e1d5
Index: pkgsrc/mail/cyrus-imapd32/options.mk
diff -u pkgsrc/mail/cyrus-imapd32/options.mk:1.1 pkgsrc/mail/cyrus-imapd32/options.mk:1.2
--- pkgsrc/mail/cyrus-imapd32/options.mk:1.1    Mon Mar  9 03:19:46 2026
+++ pkgsrc/mail/cyrus-imapd32/options.mk        Wed Mar 18 18:01:35 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2026/03/09 03:19:46 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2026/03/18 18:01:35 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cyrus-imapd
@@ -8,8 +8,6 @@ PKG_SUGGESTED_OPTIONS=  pcre
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   ldap
-
 .if !empty(PKG_OPTIONS:Mkerberos)
 .  if empty(PKG_OPTIONS:Mgssapi)
 PKG_OPTIONS+=  gssapi
@@ -66,7 +64,6 @@ generate-compile-et:
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-ldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST.ldap=            yes
 .else
 CONFIGURE_ARGS+=       --without-ldap
 .endif

Added files:

Index: pkgsrc/mail/cyrus-imapd32/patches/patch-lib_ptrarray.c
diff -u /dev/null pkgsrc/mail/cyrus-imapd32/patches/patch-lib_ptrarray.c:1.1
--- /dev/null   Wed Mar 18 18:01:35 2026
+++ pkgsrc/mail/cyrus-imapd32/patches/patch-lib_ptrarray.c      Wed Mar 18 18:01:35 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_ptrarray.c,v 1.1 2026/03/18 18:01:35 nia Exp $
+
+Fix implicit declaration of string functions.
+
+--- lib/ptrarray.c.orig        2026-03-18 17:32:07.783214958 +0000
++++ lib/ptrarray.c
+@@ -45,6 +45,7 @@
+ 
+ #include "ptrarray.h"
+ #include <memory.h>
++#include <string.h>
+ #include "xmalloc.h"
+ 
+ EXPORTED ptrarray_t *ptrarray_new(void)