pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/fish Fix installation on Darwin.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/303143543e56
branches:  trunk
changeset: 362614:303143543e56
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri May 19 15:27:58 2017 +0000

description:
Fix installation on Darwin.

diffstat:

 shells/fish/Makefile |  8 +++++++-
 shells/fish/PLIST    |  4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r de8b3c009e29 -r 303143543e56 shells/fish/Makefile
--- a/shells/fish/Makefile      Fri May 19 14:59:23 2017 +0000
+++ b/shells/fish/Makefile      Fri May 19 15:27:58 2017 +0000
@@ -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 @@
 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"
diff -r de8b3c009e29 -r 303143543e56 shells/fish/PLIST
--- a/shells/fish/PLIST Fri May 19 14:59:23 2017 +0000
+++ b/shells/fish/PLIST Fri May 19 15:27:58 2017 +0000
@@ -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/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



Home | Main Index | Thread Index | Old Index