Tue May 16 19:55:32 2023 UTC ()
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


(wiz)
diff -r1.43 -r1.44 pkgsrc/shells/fish/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/shells/fish/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/fish/Makefile 2023/05/09 23:23:37 1.43
+++ pkgsrc/shells/fish/Makefile 2023/05/16 19:55:32 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2023/05/09 23:23:37 dholland Exp $ 1# $NetBSD: Makefile,v 1.44 2023/05/16 19:55:32 wiz Exp $
2 2
3DISTNAME= fish-3.6.1 3DISTNAME= fish-3.6.1
4CATEGORIES= shells 4CATEGORIES= shells
5MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/}
6GITHUB_PROJECT= fish-shell 6GITHUB_PROJECT= fish-shell
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fishshell.com/ 11HOMEPAGE= http://www.fishshell.com/
12COMMENT= User friendly command line shell for UNIX-like operating systems 12COMMENT= User friendly command line shell for UNIX-like operating systems
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -39,31 +39,22 @@ PLIST.open= yes @@ -39,31 +39,22 @@ PLIST.open= yes
39 39
40EGDIR= ${PREFIX}/share/examples/fish 40EGDIR= ${PREFIX}/share/examples/fish
41CONF_FILES= ${EGDIR}/config.fish ${PKG_SYSCONFDIR}/fish/config.fish 41CONF_FILES= ${EGDIR}/config.fish ${PKG_SYSCONFDIR}/fish/config.fish
42OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/functions 42OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/functions
43OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/conf.d 43OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/conf.d
44OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/completions 44OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/completions
45 45
46REPLACE_PYTHON= share/tools/create_manpage_completions.py 46REPLACE_PYTHON= share/tools/create_manpage_completions.py
47 47
48# Avoid C++ <version> issues. 48# Avoid C++ <version> issues.
49post-extract: 49post-extract:
50 ${MV} ${WRKSRC}/version ${WRKSRC}/version.txt 50 ${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
51 51
52# At least on NetBSD (likely elsewhere in the long run too), when 
53# using base curses explicitly also link against terminfo. This is 
54# needed by search changes in binutils 2.39. Skip if using ncurses as 
55# ncurses has its own arrangements. XXX: this should really be wedged 
56# into the buildlink magic. 
57.include "../../mk/curses.buildlink3.mk" 52.include "../../mk/curses.buildlink3.mk"
58.if ${CURSES_TYPE} == "curses" 
59LIBS.NetBSD+= -lterminfo 
60.endif 
61 
62.include "../../devel/cmake/build.mk" 53.include "../../devel/cmake/build.mk"
63.include "../../devel/pcre2/buildlink3.mk" 54.include "../../devel/pcre2/buildlink3.mk"
64.include "../../devel/gettext-lib/buildlink3.mk" 55.include "../../devel/gettext-lib/buildlink3.mk"
65.include "../../devel/gettext-tools/buildlink3.mk" 56.include "../../devel/gettext-tools/buildlink3.mk"
66.include "../../lang/python/application.mk" 57.include "../../lang/python/application.mk"
67.include "../../sysutils/desktop-file-utils/desktopdb.mk" 58.include "../../sysutils/desktop-file-utils/desktopdb.mk"
68.include "../../mk/atomic64.mk" 59.include "../../mk/atomic64.mk"
69.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"