CVS commit: pkgsrc/mail/alpine

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue May 28 00:46:30 UTC 2024

Modified Files:
        pkgsrc/mail/alpine: Makefile

Log Message:
mail/alpine: fix broken build

Seems we need to include terminfo.buildlink3.mk before gettext-tools's bl3.
The latter includes termcap.buildlink3.mk and having that comes first
causes the wrappers to drop -lterminfo, and since that's what the package
is expecting to use, it all fails.

This is a hack; bl3 inclusions should not be order-dependent. But there
isn't really a better solution.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/mail/alpine/Makefile

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.58 pkgsrc/mail/alpine/Makefile:1.59
--- pkgsrc/mail/alpine/Makefile:1.58    Tue Oct 24 22:09:40 2023
+++ pkgsrc/mail/alpine/Makefile Tue May 28 00:46:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2023/10/24 22:09:40 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2024/05/28 00:46:29 dholland Exp $
 
 DISTNAME=      alpine-2.26
 PKGREVISION=   3
@@ -103,7 +103,7 @@ INSTALLATION_DIRS+= share/doc/${PKGBASE}
 do-install:
 .for bin in \
        alpine/alpine alpine/rpdump alpine/rpload       \
-               pico/pico pico/pilot
+               pico/pico pico/pilot
        ${INSTALL_PROGRAM} ${WRKSRC}/${bin} ${DESTDIR}${PREFIX}/bin
 .endfor
 .for man in alpine rpdump rpload pico pilot
@@ -115,10 +115,15 @@ post-install:
        ${RUN}${WRKSRC}/alpine/alpine -conf > ${DESTDIR}${EGDIR}/pine.conf
        ${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} ${DESTDIR}${DOCDIR}
 
+# This must come first, or at least before gettext-tools, because the
+# latter includes termcap.buildlink3.mk instead; that sets things up
+# to use -ltermcap, not -lterminfo, but the package's makefile uses
+# -lterminfo and then the link fails.
+.include "../../mk/terminfo.buildlink3.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"