[pkgsrc/pkgsrc-2017Q4]: pkgsrc/net/go-net Pullup ticket #5669 - requested by ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f2624f08bed
branches:  pkgsrc-2017Q4
changeset: 373097:0f2624f08bed
user:      spz <spz%pkgsrc.org@localhost>
date:      Thu Jan 04 21:13:18 2018 +0000

description:
Pullup ticket #5669 - requested by bsiegert
net/go-net: build fix

Revisions pulled up:
- net/go-net/Makefile                                           1.18
- net/go-net/PLIST                                              1.6

-------------------------------------------------------------------
   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

diffstat:

 net/go-net/Makefile |  12 ++++++++----
 net/go-net/PLIST    |   6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 1b796b127547 -r 0f2624f08bed net/go-net/Makefile
--- a/net/go-net/Makefile       Thu Jan 04 21:07:13 2018 +0000
+++ b/net/go-net/Makefile       Thu Jan 04 21:13:18 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/07/22 19:32:41 wiz Exp $
+# $NetBSD: Makefile,v 1.17.6.1 2018/01/04 21:13:18 spz Exp $
 
 DISTNAME=              go-net-20170308
 PKGREVISION=           1
@@ -19,12 +19,16 @@
 
 .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"
diff -r 1b796b127547 -r 0f2624f08bed net/go-net/PLIST
--- a/net/go-net/PLIST  Thu Jan 04 21:07:13 2018 +0000
+++ b/net/go-net/PLIST  Thu Jan 04 21:13:18 2018 +0000
@@ -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.5.10.1 2018/01/04 21:13:18 spz 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/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