CVS commit: pkgsrc/shells/fish
"Jonathan Perkin" <[email protected]> Thu, 6 Aug 2026 11:24:30 +0000
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc Committed By: jperkin Date: Thu Aug 6 11:24:30 UTC 2026 Modified Files: pkgsrc/shells/fish: Makefile PLIST Log Message: fish: A couple of fixes for Darwin. The native pax(1) refuses to copy a directory if the target does not already exist, and fish has a couple of manual page differences when installing on Darwin. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 pkgsrc/shells/fish/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/shells/fish/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
(unnamed)
(text/x-diff, 1.8 KB)
Modified files:
Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.66 pkgsrc/shells/fish/Makefile:1.67
--- pkgsrc/shells/fish/Makefile:1.66 Wed Aug 5 16:00:21 2026
+++ pkgsrc/shells/fish/Makefile Thu Aug 6 11:24:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2026/08/05 16:00:21 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2026/08/06 11:24:30 jperkin Exp $
DISTNAME= fish-4.7.1
PKGREVISION= 1
@@ -48,6 +48,18 @@ CMAKE_CONFIGURE_ARGS+= -DSPHINX_EXECUTAB
PKGSRC_MAKE_ENV+= FISH_BUILD_VERSION=${PKGVERSION_NOREV}
+INSTALLATION_DIRS+= share/prompts
+INSTALLATION_DIRS+= share/themes
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+= mac notmac
+.if ${OPSYS} == "Darwin"
+PLIST.mac= yes
+.else
+PLIST.notmac= yes
+.endif
+
TEST_TARGET= fish_run_tests
TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
TEST_ENV+= LC_ALL=C.UTF-8 # requires a UTF-8 locale
Index: pkgsrc/shells/fish/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.24 pkgsrc/shells/fish/PLIST:1.25
--- pkgsrc/shells/fish/PLIST:1.24 Sun May 10 18:46:48 2026
+++ pkgsrc/shells/fish/PLIST Thu Aug 6 11:24:30 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2026/05/10 18:46:48 vins Exp $
+@comment $NetBSD: PLIST,v 1.25 2026/08/06 11:24:30 jperkin Exp $
bin/fish
bin/fish_indent
bin/fish_key_reader
@@ -1586,7 +1586,7 @@ share/fish/man/man1/jobs.1
share/fish/man/man1/math.1
share/fish/man/man1/nextd.1
share/fish/man/man1/not.1
-share/fish/man/man1/open.1
+${PLIST.notmac}share/fish/man/man1/open.1
share/fish/man/man1/or.1
share/fish/man/man1/path.1
share/fish/man/man1/popd.1
@@ -1600,6 +1600,7 @@ share/fish/man/man1/pushd.1
share/fish/man/man1/pwd.1
share/fish/man/man1/random.1
share/fish/man/man1/read.1
+${PLIST.mac}share/fish/man/man1/realpath.1
share/fish/man/man1/return.1
share/fish/man/man1/set.1
share/fish/man/man1/set_color.1