Received: by mail.netbsd.org (Postfix, from userid 605) id 353AB84E60; Sun, 31 Dec 2017 15:59:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B37AE84E55 for ; Sun, 31 Dec 2017 15:59:29 +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 JoPN6yWuyDsJ for ; Sun, 31 Dec 2017 15:59:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3E42284D86 for ; Sun, 31 Dec 2017 15:59:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 21228FB40; Sun, 31 Dec 2017 15:59:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1514735965214410" MIME-Version: 1.0 Date: Sun, 31 Dec 2017 15:59:25 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/net/go-net To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20171231155925.21228FB40@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. --_----------=_1514735965214410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sun Dec 31 15:59:25 UTC 2017 Modified Files: pkgsrc/net/go-net: Makefile PLIST Log Message: Fix build on Linux. Linux has h2i but not the (BSD-specific) route package. Instead of having a PLIST var named notsunos, create two separate ones for h2i and route. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/go-net/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/go-net/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1514735965214410 Content-Disposition: inline Content-Length: 1965 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/go-net/Makefile diff -u pkgsrc/net/go-net/Makefile:1.17 pkgsrc/net/go-net/Makefile:1.18 --- pkgsrc/net/go-net/Makefile:1.17 Sat Jul 22 19:32:41 2017 +++ pkgsrc/net/go-net/Makefile Sun Dec 31 15:59:24 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2017/07/22 19:32:41 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2017/12/31 15:59:24 bsiegert Exp $ DISTNAME= go-net-20170308 PKGREVISION= 1 @@ -19,12 +19,16 @@ CHECK_RELRO_SKIP+= bin/h2i .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= notsunos +PLIST_VARS+= h2i route -.if ${OPSYS} != "SunOS" +.if ${OPSYS} == "SunOS" # route support is not yet implemented for sunos # h2i is missing terminal.MakeRaw and terminal.Restore -PLIST.notsunos= yes +.elif ${OPSYS} == "Linux" +PLIST.h2i= yes +.else +PLIST.h2i= yes +PLIST.route= yes .endif .include "../../textproc/go-text/buildlink3.mk" Index: pkgsrc/net/go-net/PLIST diff -u pkgsrc/net/go-net/PLIST:1.5 pkgsrc/net/go-net/PLIST:1.6 --- pkgsrc/net/go-net/PLIST:1.5 Thu Mar 16 19:14:19 2017 +++ pkgsrc/net/go-net/PLIST Sun Dec 31 15:59:24 2017 @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2017/03/16 19:14:19 bsiegert Exp $ -${PLIST.notsunos}bin/h2i +@comment $NetBSD: PLIST,v 1.6 2017/12/31 15:59:24 bsiegert Exp $ +${PLIST.h2i}bin/h2i gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/bpf.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context/ctxhttp.a @@ -23,7 +23,7 @@ gopkg/pkg/${GO_PLATFORM}/golang.org/x/ne gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/netutil.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/proxy.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/publicsuffix.a -${PLIST.notsunos}gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/route.a +${PLIST.route}gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/route.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/trace.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav/internal/xml.a --_----------=_1514735965214410--