Mon Jan 8 21:30:06 2024 UTC (140d)
fish: remove remnants of terminfo hack

I needed this for an issue that appeared in netbsd-current's binutils but
when updating to the latest, this terminfo hack is no longer necessary.


(maya)
diff -r1.50 -r1.51 pkgsrc/shells/fish/Makefile
cvs diff -r1.50 -r1.51 pkgsrc/shells/fish/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/fish/Makefile 2024/01/07 16:08:52 1.50
+++ pkgsrc/shells/fish/Makefile 2024/01/08 21:30:05 1.51
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.50 2024/01/07 16:08:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.51 2024/01/08 21:30:05 maya Exp $
2 2
3DISTNAME= fish-3.7.0 3DISTNAME= fish-3.7.0
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
@@ -44,23 +44,22 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/conf.d @@ -44,23 +44,22 @@ OWN_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# wiz 20231109: 52# wiz 20231109:
53# as of fish-3.6.2, the ninja generator has problems in some environments: 53# as of fish-3.6.2, the ninja generator has problems in some environments:
54# ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set 54# ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
55CMAKE_GENERATOR= make 55CMAKE_GENERATOR= make
56 56
57.include "../../mk/terminfo.buildlink3.mk" 
58.include "../../mk/curses.buildlink3.mk" 57.include "../../mk/curses.buildlink3.mk"
59.include "../../devel/cmake/build.mk" 58.include "../../devel/cmake/build.mk"
60.include "../../devel/pcre2/buildlink3.mk" 59.include "../../devel/pcre2/buildlink3.mk"
61.include "../../devel/gettext-lib/buildlink3.mk" 60.include "../../devel/gettext-lib/buildlink3.mk"
62.include "../../devel/gettext-tools/buildlink3.mk" 61.include "../../devel/gettext-tools/buildlink3.mk"
63.include "../../lang/python/application.mk" 62.include "../../lang/python/application.mk"
64.include "../../sysutils/desktop-file-utils/desktopdb.mk" 63.include "../../sysutils/desktop-file-utils/desktopdb.mk"
65.include "../../mk/atomic64.mk" 64.include "../../mk/atomic64.mk"
66.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"