CVS commit: pkgsrc/shells/fish

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri May 19 15:27:58 UTC 2017

Modified Files:
        pkgsrc/shells/fish: Makefile PLIST

Log Message:
Fix installation on Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/fish/PLIST

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.9 pkgsrc/shells/fish/Makefile:1.10
--- pkgsrc/shells/fish/Makefile:1.9     Mon May 15 13:46:47 2017
+++ pkgsrc/shells/fish/Makefile Fri May 19 15:27:58 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/05/15 13:46:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2017/05/19 15:27:58 fhajny Exp $
 
 FISHVER=               2.5.0
 DISTNAME=              fish-${FISHVER}
@@ -37,6 +37,12 @@ CXXFLAGS.NetBSD+=    -fpermissive
 LDFLAGS+=              -lexecinfo
 .endif
 
+# Upstream intentionally omits open.1 on Darwin
+PLIST_VARS+=   open
+.if ${OPSYS} != "Darwin"
+PLIST.open=    yes
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/shells/fish/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.3 pkgsrc/shells/fish/PLIST:1.4
--- pkgsrc/shells/fish/PLIST:1.3        Sat May 13 01:19:05 2017
+++ pkgsrc/shells/fish/PLIST    Fri May 19 15:27:58 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/05/13 01:19:05 wen Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/05/19 15:27:58 fhajny Exp $
 bin/fish
 bin/fish_indent
 bin/fish_key_reader
@@ -794,7 +794,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