CVS commit: pkgsrc/mail/alpine

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Sep  8 18:16:55 UTC 2025

Modified Files:
        pkgsrc/mail/alpine: Makefile
Added Files:
        pkgsrc/mail/alpine: hacks.mk

Log Message:
mail/alpine: fix build with GCC14 on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/mail/alpine/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/alpine/hacks.mk

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

Modified files:

Index: pkgsrc/mail/alpine/Makefile
diff -u pkgsrc/mail/alpine/Makefile:1.61 pkgsrc/mail/alpine/Makefile:1.62
--- pkgsrc/mail/alpine/Makefile:1.61    Mon Sep  8 12:57:17 2025
+++ pkgsrc/mail/alpine/Makefile Mon Sep  8 18:16:55 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2025/09/08 12:57:17 vins Exp $
+# $NetBSD: Makefile,v 1.62 2025/09/08 18:16:55 vins Exp $
 
 DISTNAME=      alpine-2.26
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    mail
 # repo at https://repo.or.cz/alpine.git
 MASTER_SITES=  https://alpineapp.email/alpine/release/src/
@@ -87,12 +87,12 @@ SUBST_STAGE.paths=  pre-configure
 SUBST_MESSAGE.paths=   Replacing hard-coded paths.
 SUBST_FILES.paths=     doc/man1/alpine.1 doc/tech-notes/*.txt
 SUBST_FILES.paths+=    pith/filter.c pith/pine.hlp imap/src/osdep/unix/Makefile
-SUBST_SED.paths+=      -e "s:/usr/local/lib/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g" \
-                       -e "s:/usr/local/lib/pine.info:${PREFIX}/${PKGINFODIR}/pine.info:g" \
-                       -e "s:/usr/local/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g" \
-                       -e "s:/usr/local/lib:${PKG_SYSCONFDIR}:g" \
-                       -e "s:/usr/local/bin:${PREFIX}/bin:g" \
-                       -e "s:/usr/local/ssl:${SSLDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local/lib/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g"
+SUBST_SED.paths+=      -e "s:/usr/local/lib/pine.info:${PREFIX}/${PKGINFODIR}/pine.info:g"
+SUBST_SED.paths+=      -e "s:/usr/local/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g"
+SUBST_SED.paths+=      -e "s:/usr/local/lib:${PKG_SYSCONFDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local/bin:${PREFIX}/bin:g"
+SUBST_SED.paths+=      -e "s:/usr/local/ssl:${SSLDIR}:g"
 
 SUBST_CLASSES+=                var
 SUBST_STAGE.var=       pre-configure

Added files:

Index: pkgsrc/mail/alpine/hacks.mk
diff -u /dev/null pkgsrc/mail/alpine/hacks.mk:1.1
--- /dev/null   Mon Sep  8 18:16:55 2025
+++ pkgsrc/mail/alpine/hacks.mk Mon Sep  8 18:16:55 2025
@@ -0,0 +1,32 @@
+# $NetBSD: hacks.mk,v 1.1 2025/09/08 18:16:55 vins Exp $
+
+.if !defined(ALPINE_HACKS_MK)
+ALPINE_HACKS_MK=       defined
+
+### [Mon Sept 8 17:32:19 UTC 2025 : vins]
+### GCC14 enforces `-Werror=incompatible-pointer-type', which makes alpine
+### build fail on SunOS. This is essentially due to bitrotting code in the
+### OS-dependent routines for Solaris, inside the alpine codebase.
+### The rationale of using SUBST here is to avoid maintaining multiple
+### patches addressing the same issue.
+### It should be a temporary solution until the problem is reported upstream.
+
+.if ${OPSYS} == "SunOS"
+
+PKG_HACKS+=            incompatible-pointer-types
+
+SUBST_CLASSES+=                hacks
+SUBST_STAGE.hacks=     pre-configure
+SUBST_MESSAGE.hacks=   Applying fixes for OS-dependent routines on SunOS.
+SUBST_FILES.hacks+=    imap/src/osdep/unix/news.c imap/src/osdep/unix/mh.c \
+                       imap/src/osdep/unix/mix.c imap/src/osdep/unix/mx.c \
+                       imap/src/osdep/unix/maildir.c imap/src/osdep/unix/maildir.h \
+                       imap/src/osdep/unix/os_soln.h imap/src/osdep/unix/scandir.c
+SUBST_SED.hacks+=      -e "s:const struct direct \*name:struct direct \*name:g"
+SUBST_SED.hacks+=      -e "s:void \*d1:const void \*d1:g"
+SUBST_SED.hacks+=      -e "s:void \*d2:const void \*d2:g"
+SUBST_SED.hacks+=      -e "s:const struct direct \**d1:const void \*d1:g"
+SUBST_SED.hacks+=      -e "s:const struct direct \**d2:const void \*d2:g"
+
+.endif
+.endif  # ALPINE_HACKS_MK