CVS commit: pkgsrc/shells/fish

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue May  9 23:23:37 UTC 2023

Modified Files:
        pkgsrc/shells/fish: Makefile

Log Message:
shells/fish: fix ncurses linkage, from Chavdar Ivanov and RVP in PR 57365

Only add -lterminfo when using base curses on NetBSD, not ncurses.
Also put it in LIBS, not LDFLAGS :-)

The previous behavior gives a bad build, but only with non-default
settings, so I'm not bumping the revision.

XXX: the magic to add -lterminfo probably belongs in curses.bl3.mk


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/shells/fish/Makefile

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

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.42 pkgsrc/shells/fish/Makefile:1.43
--- pkgsrc/shells/fish/Makefile:1.42    Wed Mar 29 09:39:02 2023
+++ pkgsrc/shells/fish/Makefile Tue May  9 23:23:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/03/29 09:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2023/05/09 23:23:37 dholland Exp $
 
 DISTNAME=              fish-3.6.1
 CATEGORIES=            shells
@@ -28,7 +28,6 @@ CPPFLAGS+=            -DHAVE_BACKTRACE_SYMBOLS
 CXXFLAGS.NetBSD+=      -fpermissive
 LDFLAGS+=              -lexecinfo
 .endif
-LDFLAGS.NetBSD+=       -lterminfo
 
 # Upstream intentionally omits open.1 on Darwin, but adds realpath.1
 PLIST_VARS+=   open realpath
@@ -50,6 +49,16 @@ REPLACE_PYTHON=      share/tools/create_manpa
 post-extract:
        ${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
 
+# At least on NetBSD (likely elsewhere in the long run too), when
+# using base curses explicitly also link against terminfo. This is
+# needed by search changes in binutils 2.39. Skip if using ncurses as
+# ncurses has its own arrangements. XXX: this should really be wedged
+# into the buildlink magic.
+.include "../../mk/curses.buildlink3.mk"
+.if ${CURSES_TYPE} == "curses"
+LIBS.NetBSD+=  -lterminfo
+.endif
+
 .include "../../devel/cmake/build.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -57,5 +66,4 @@ post-extract:
 .include "../../lang/python/application.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"