Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 4D1AB7A1FE for ; Fri, 19 May 2017 15:28:00 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B863E8560F; Fri, 19 May 2017 15:27:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 477B78560E for ; Fri, 19 May 2017 15:27:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3YuYu3d4nAc1 for ; Fri, 19 May 2017 15:27:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A305B84DBD for ; Fri, 19 May 2017 15:27:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9D95BFBE4; Fri, 19 May 2017 15:27:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149520767832480" MIME-Version: 1.0 Date: Fri, 19 May 2017 15:27:58 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/shells/fish To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20170519152758.9D95BFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_149520767832480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_149520767832480 Content-Disposition: inline Content-Length: 1453 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_149520767832480--