CVS commit: pkgsrc/shells/fish

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue May 16 19:55:32 UTC 2023

Modified Files:
        pkgsrc/shells/fish: Makefile

Log Message:
fish: remove incorrect workaround

libterminfo symbols are used directly by fish, so this is not
a problem in pkgsrc or curses.

Fixed properly in patch-cmake_ConfigureChecks.cmake


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 pkgsrc/shells/fish/Makefile:1.44
--- pkgsrc/shells/fish/Makefile:1.43    Tue May  9 23:23:37 2023
+++ pkgsrc/shells/fish/Makefile Tue May 16 19:55:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2023/05/09 23:23:37 dholland Exp $
+# $NetBSD: Makefile,v 1.44 2023/05/16 19:55:32 wiz Exp $
 
 DISTNAME=              fish-3.6.1
 CATEGORIES=            shells
@@ -49,16 +49,7 @@ 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"