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 8B4887A291 for ; Wed, 31 Aug 2016 14:15:35 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7446085E8A; Wed, 31 Aug 2016 14:15:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 04CEB85E88 for ; Wed, 31 Aug 2016 14:15:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id yr2X2NEf2UG1 for ; Wed, 31 Aug 2016 14:15:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8CB9B85E7E for ; Wed, 31 Aug 2016 14:15:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 87B48FBC3; Wed, 31 Aug 2016 14:15:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1472652933296930" MIME-Version: 1.0 Date: Wed, 31 Aug 2016 14:15:33 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/go To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20160831141533.87B48FBC3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1472652933296930 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Aug 31 14:15:33 UTC 2016 Modified Files: pkgsrc/lang/go: Makefile PLIST Log Message: Fix install on Linux and SunOS. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/go/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/go/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1472652933296930 Content-Disposition: inline Content-Length: 1575 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/go/Makefile diff -u pkgsrc/lang/go/Makefile:1.45 pkgsrc/lang/go/Makefile:1.46 --- pkgsrc/lang/go/Makefile:1.45 Sat Aug 20 06:22:38 2016 +++ pkgsrc/lang/go/Makefile Wed Aug 31 14:15:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/08/20 06:22:38 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2016/08/31 14:15:33 jperkin Exp $ .include "version.mk" @@ -72,6 +72,14 @@ CHECK_INTERPRETER_SKIP+= go/src/run.rc BUILD_DEPENDS+= go14-1.4*:../../lang/go14 GOROOT_BOOTSTRAP= ${PREFIX}/go14 +.include "../../mk/bsd.prefs.mk" + +PLIST_VARS+= route + +.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS" +PLIST.route= yes +.endif + pre-build: cd ${WRKSRC}/src/syscall && \ env GOOS=${LOWER_OPSYS:Q} GOARCH=${GOARCH:Q} \ Index: pkgsrc/lang/go/PLIST diff -u pkgsrc/lang/go/PLIST:1.25 pkgsrc/lang/go/PLIST:1.26 --- pkgsrc/lang/go/PLIST:1.25 Fri Aug 19 09:38:06 2016 +++ pkgsrc/lang/go/PLIST Wed Aug 31 14:15:33 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2016/08/19 09:38:06 bsiegert Exp $ +@comment $NetBSD: PLIST,v 1.26 2016/08/31 14:15:33 jperkin Exp $ bin/go bin/gofmt go/AUTHORS @@ -1038,7 +1038,7 @@ go/pkg/${GO_PLATFORM}/unicode/utf16.a go/pkg/${GO_PLATFORM}/unicode/utf8.a go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/http2/hpack.a go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/lex/httplex.a -go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/route.a +${PLIST.route}go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/route.a go/pkg/tool/${GO_PLATFORM}/addr2line go/pkg/tool/${GO_PLATFORM}/api go/pkg/tool/${GO_PLATFORM}/asm --_----------=_1472652933296930--