CVS commit: pkgsrc/shells/fish

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Apr 21 11:24:52 UTC 2022

Modified Files:
        pkgsrc/shells/fish: PLIST distinfo
        pkgsrc/shells/fish/patches: patch-cmake_Install.cmake

Log Message:
fish: Fix PLIST issues on macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/shells/fish/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/fish/patches/patch-cmake_Install.cmake

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/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.13 pkgsrc/shells/fish/PLIST:1.14
--- pkgsrc/shells/fish/PLIST:1.13       Tue Apr  5 20:49:22 2022
+++ pkgsrc/shells/fish/PLIST    Thu Apr 21 11:24:52 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2022/04/05 20:49:22 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.14 2022/04/21 11:24:52 jperkin Exp $
 bin/fish
 bin/fish_indent
 bin/fish_key_reader
@@ -1294,7 +1294,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.open}share/fish/man/man1/open.1
 share/fish/man/man1/or.1
 share/fish/man/man1/popd.1
 share/fish/man/man1/prevd.1
@@ -1307,6 +1307,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.realpath}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

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.26 pkgsrc/shells/fish/distinfo:1.27
--- pkgsrc/shells/fish/distinfo:1.26    Tue Apr  5 20:49:22 2022
+++ pkgsrc/shells/fish/distinfo Thu Apr 21 11:24:52 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2022/04/05 20:49:22 bsiegert Exp $
+$NetBSD: distinfo,v 1.27 2022/04/21 11:24:52 jperkin Exp $
 
 BLAKE2s (fish-3.4.1.tar.xz) = b249650ce101af78302e0eb53df4982f9d6b8e18160faf3669fe2a9112df1617
 SHA512 (fish-3.4.1.tar.xz) = 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
 Size (fish-3.4.1.tar.xz) = 3293068 bytes
 SHA1 (patch-build__tools_git__version__gen.sh) = 0c8feb0880d742e5de7f510a67680edbdd603aed
-SHA1 (patch-cmake_Install.cmake) = 6ae3f511597773dfd9bf2d22c2d8dd0b60d87ae2
+SHA1 (patch-cmake_Install.cmake) = 1defcb125ab0082649f1b6e592df96a9c5d49c0a

Index: pkgsrc/shells/fish/patches/patch-cmake_Install.cmake
diff -u pkgsrc/shells/fish/patches/patch-cmake_Install.cmake:1.1 pkgsrc/shells/fish/patches/patch-cmake_Install.cmake:1.2
--- pkgsrc/shells/fish/patches/patch-cmake_Install.cmake:1.1    Fri Mar  5 08:47:29 2021
+++ pkgsrc/shells/fish/patches/patch-cmake_Install.cmake        Thu Apr 21 11:24:52 2022
@@ -1,9 +1,10 @@
-$NetBSD: patch-cmake_Install.cmake,v 1.1 2021/03/05 08:47:29 nia Exp $
+$NetBSD: patch-cmake_Install.cmake,v 1.2 2022/04/21 11:24:52 jperkin Exp $
 
 pkgsrc-ifying:
 Install config files to examples rather than etc.
+Install desktop files on macOS regardless to simplify PLIST.
 
---- cmake/Install.cmake.orig   2021-03-01 12:47:02.000000000 +0000
+--- cmake/Install.cmake.orig   2022-03-25 16:22:53.000000000 +0000
 +++ cmake/Install.cmake
 @@ -81,9 +81,9 @@ install(TARGETS ${PROGRAMS}
                      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
@@ -18,3 +19,12 @@ Install config files to examples rather 
  
  fish_create_dirs(${rel_datadir}/fish ${rel_datadir}/fish/completions
                   ${rel_datadir}/fish/functions ${rel_datadir}/fish/groff
+@@ -170,7 +170,7 @@ if(GETTEXT_FOUND)
+   endforeach()
+ endif()
+ 
+-if (NOT APPLE)
++if (1)
+     install(FILES fish.desktop DESTINATION ${rel_datadir}/applications)
+     install(FILES ${SPHINX_SRC_DIR}/python_docs_theme/static/fish.png DESTINATION ${rel_datadir}/pixmaps)
+ endif()