CVS commit: pkgsrc/mail/cyrus-imapd312

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 18 18:15:21 UTC 2026

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

Log Message:
cyrus-imapd312: Fixes for various platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/cyrus-imapd312/Makefile \
    pkgsrc/mail/cyrus-imapd312/distinfo pkgsrc/mail/cyrus-imapd312/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/cyrus-imapd312/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-imapd312/Makefile
diff -u pkgsrc/mail/cyrus-imapd312/Makefile:1.1 pkgsrc/mail/cyrus-imapd312/Makefile:1.2
--- pkgsrc/mail/cyrus-imapd312/Makefile:1.1     Mon Mar  9 03:16:43 2026
+++ pkgsrc/mail/cyrus-imapd312/Makefile Wed Mar 18 18:15:21 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/03/09 03:16:43 jnemeth Exp $
+# $NetBSD: Makefile,v 1.2 2026/03/18 18:15:21 nia Exp $
 
 DISTNAME=      cyrus-imapd-3.12.1
 CATEGORIES=    mail
@@ -13,7 +13,7 @@ LICENSE=      original-bsd # like license
 MAKE_JOBS_SAFE=        no
 
 USE_TOOLS+=            perl:run makedepend pkg-config gmake bison bash:run
-USE_TOOLS+=            autoconf automake autoreconf
+USE_TOOLS+=            autoconf automake autoreconf flex
 USE_LANGUAGES+=                c c++
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
@@ -55,6 +55,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}
@@ -80,6 +83,8 @@ REPLACE_PERL+=                tools/rehash
 REPLACE_PERL+=         tools/config2rst
 REPLACE_PERL+=         tools/perl2rst
 
+REPLACE_SH+=           perl/imap/cyradm.sh
+
 # Override default Perl install location
 SUBST_CLASSES+=                perldir
 SUBST_STAGE.perldir=   post-configure
Index: pkgsrc/mail/cyrus-imapd312/distinfo
diff -u pkgsrc/mail/cyrus-imapd312/distinfo:1.1 pkgsrc/mail/cyrus-imapd312/distinfo:1.2
--- pkgsrc/mail/cyrus-imapd312/distinfo:1.1     Mon Mar  9 03:16:43 2026
+++ pkgsrc/mail/cyrus-imapd312/distinfo Wed Mar 18 18:15:21 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2026/03/09 03:16:43 jnemeth Exp $
+$NetBSD: distinfo,v 1.2 2026/03/18 18:15:21 nia Exp $
 
 BLAKE2s (cyrus-imapd-3.12.1.tar.gz) = 24d07259b14e762f1ed59becd9ba14ec7d1e799bd73bba3f32d0535a97259b16
 SHA512 (cyrus-imapd-3.12.1.tar.gz) = 3089cbe79c176b4af922700426e04fa69cfe2aa23ddf393077499f7489228ad301402abbd3a17d8797700b77dcaabbe31540276e287e7bec79571a372dc37e82
@@ -8,6 +8,7 @@ SHA1 (patch-Makefile.in) = 3bb072eb7042f
 SHA1 (patch-configure) = 6da0341a5ce1f58be3068ad3f6ed47c6a23787f7
 SHA1 (patch-docsrc_conf.py) = 5474342cb1bb99e8e54ff4b011463bb0a5131a9c
 SHA1 (patch-docsrc_imap_concepts_overview__and__concepts.rst) = 4971c769790fe6b648c697a82961d32d93f7bcbb
+SHA1 (patch-lib_ptrarray.c) = ecd40f40094e2ba764f240cceaeb6c90a9dc89f0
 SHA1 (patch-docsrc_imap_developer_compiling.rst) = 3dd9b2be508a216f851dc7c8d880782ce6ad3464
 SHA1 (patch-docsrc_imap_download_installation_manage-dav.rst) = 2982b81eeac52d01aa8a50844a7f583bf87f9372
 SHA1 (patch-docsrc_imap_quickstart_introduction.rst) = aea770e1e22b47fe2bcc1183f690f69f192c26a5
Index: pkgsrc/mail/cyrus-imapd312/options.mk
diff -u pkgsrc/mail/cyrus-imapd312/options.mk:1.1 pkgsrc/mail/cyrus-imapd312/options.mk:1.2
--- pkgsrc/mail/cyrus-imapd312/options.mk:1.1   Mon Mar  9 03:16:43 2026
+++ pkgsrc/mail/cyrus-imapd312/options.mk       Wed Mar 18 18:15:21 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2026/03/09 03:16:43 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2026/03/18 18:15:21 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cyrus-imapd
@@ -8,8 +8,6 @@ PKG_SUGGESTED_OPTIONS=  pcre doc
 
 .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-imapd312/patches/patch-lib_ptrarray.c
diff -u /dev/null pkgsrc/mail/cyrus-imapd312/patches/patch-lib_ptrarray.c:1.1
--- /dev/null   Wed Mar 18 18:15:21 2026
+++ pkgsrc/mail/cyrus-imapd312/patches/patch-lib_ptrarray.c     Wed Mar 18 18:15:21 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_ptrarray.c,v 1.1 2026/03/18 18:15:21 nia Exp $
+
+Fix implicit declaration of string functions.
+
+--- lib/ptrarray.c.orig        2025-06-27 02:57:49.000000000 +0000
++++ lib/ptrarray.c
+@@ -45,6 +45,7 @@
+ 
+ #include "ptrarray.h"
+ #include <memory.h>
++#include <string.h>
+ #include "util.h"
+ #include "xmalloc.h"
+