CVS commit: pkgsrc/net/go-net

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

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.

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