Dmitrij D. Czarkoff said: > Juan Francisco Cantero Hurtado said: > > I just ran "make test" on amd64, so any additional tests are welcome. > > > > OK? > > Corresponding update to devel/go-tools.
In previous versions go-tools did not include present and html2article tools. This happened because both tools had dependencies on golang extra packages from golang.org/x/net which were not available in ports. For the sake of completeness I've ported golang.org/x/net and its dependencies golang.org/x/crypto and golang.org/x/text. As golang.org/x/net/websocket (net/go-websocket) is a part of golang.org/x/net package set, I suggest to remove it in favor of the whole package set. I have also updated net/websocketd, the only port depending on net/go-websocket. OKs? -- Dmitrij D. Czarkoff
go-crypto-20160329.tgz
Description: go-crypto-20160329.tgz
go-net-20160331.tgz
Description: go-net-20160331.tgz
go-text-20160316.tgz
Description: go-text-20160316.tgz
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/go-tools/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 14 Jan 2016 16:11:17 -0000 1.6 +++ Makefile 1 Apr 2016 09:35:19 -0000 @@ -3,8 +3,8 @@ COMMENT = various tools for the Go programming language GH_ACCOUNT = golang GH_PROJECT = tools -GH_COMMIT = 99c318c742339e824d89d23ba3b3bff4f4ab27a8 -DISTNAME = go-tools-1.5.20151226 +GH_COMMIT = c887be1b2ebd11663d4bf2fbca508c449172339e +DISTNAME = go-tools-1.6.20160204 CATEGORIES = devel HOMEPAGE = http://golang.org/ @@ -17,11 +17,14 @@ WANTLIB += c pthread MODULES = lang/go +BUILD_DEPENDS = net/go-net + RUN_DEPENDS = ${MODGO_RUN_DEPENDS} GODOC_TARGET = golang.org/x/tools/cmd/godoc ALL_TARGET = golang.org/x/tools/cmd/benchcmp \ + golang.org/x/tools/cmd/bundle \ golang.org/x/tools/cmd/callgraph \ golang.org/x/tools/cmd/digraph \ golang.org/x/tools/cmd/eg \ @@ -31,18 +34,16 @@ ALL_TARGET = golang.org/x/tools/cmd/ben golang.org/x/tools/cmd/gomvpkg \ golang.org/x/tools/cmd/gorename \ golang.org/x/tools/cmd/gotype \ + golang.org/x/tools/cmd/html2article \ golang.org/x/tools/cmd/oracle \ + golang.org/x/tools/cmd/present \ golang.org/x/tools/cmd/ssadump \ golang.org/x/tools/cmd/stress \ golang.org/x/tools/cmd/stringer \ -# golang.org/x/tools/cmd/html2article \ -# golang.org/x/tools/cmd/present \ + golang.org/x/tools/cmd/tip MODGO_TYPE = bin - -post-patch: - mkdir -p ${MODGO_WORKSPACE}/src/golang.org/x - mv ${WRKDIST} ${MODGO_WORKSPACE}/src/golang.org/x/tools +WRKSRC = ${MODGO_WORKSPACE}/src/golang.org/x/tools # godoc needs special handling - prior to Go 1.2, godoc was part of the base # distribution and there is a remaining mapping that causes 'go install' to Index: distinfo =================================================================== RCS file: /cvs/ports/devel/go-tools/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 14 Jan 2016 16:11:17 -0000 1.2 +++ distinfo 31 Mar 2016 23:40:31 -0000 @@ -1,2 +1,2 @@ -SHA256 (go-tools-1.5.20151226.tar.gz) = JDNfXzok6DwT7pexMzVL4DCxVSOXoYOJqcCkC8mLWd4= -SIZE (go-tools-1.5.20151226.tar.gz) = 1661993 +SHA256 (go-tools-1.6.20160204.tar.gz) = lV5aEZurrTVtnPAM2q88J2SNRFEQm0Z8hy+tjMlNW1Y= +SIZE (go-tools-1.6.20160204.tar.gz) = 1768790 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/go-tools/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 14 Jan 2016 16:11:17 -0000 1.4 +++ pkg/PLIST 1 Apr 2016 09:38:31 -0000 @@ -2,6 +2,7 @@ @conflict stress-* @pkgpath textproc/godoc @bin bin/benchcmp +@bin bin/bundle @bin bin/callgraph @bin bin/digraph @bin bin/eg @@ -12,8 +13,11 @@ @bin bin/gomvpkg @bin bin/gorename @bin bin/gotype +@bin bin/html2article @bin bin/oracle +@bin bin/present @bin bin/ssadump @bin bin/stress @bin bin/stringer +@bin bin/tip @rcscript ${RCDIR}/godoc
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.369
diff -u -p -r1.369 Makefile
--- Makefile 20 Mar 2016 20:42:47 -0000 1.369
+++ Makefile 1 Apr 2016 10:04:41 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.214
+PKGNAME = quirks-2.215
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.379
diff -u -p -r1.379 Quirks.pm
--- files/Quirks.pm 20 Mar 2016 20:42:47 -0000 1.379
+++ files/Quirks.pm 1 Apr 2016 10:04:28 -0000
@@ -397,6 +397,7 @@ my $stem_extensions = {
# 6.0
'cosmic-sans-neue-mono' => 'fantasque-sans',
'droid-fonts' => 'noto-fonts',
+ 'go-websocket' => 'go-net',
};
# reasons for obsolete packages
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/websocketd/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 18 Sep 2015 14:37:50 -0000 1.6
+++ Makefile 1 Apr 2016 09:44:02 -0000
@@ -2,13 +2,9 @@
COMMENT = access any command-line tool via a WebSocket
-V = 0.2.11
-VERSION = $V
-DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
-GH_TAGNAME = v$V
-REVISION = 0
+GH_TAGNAME = v0.2.12
CATEGORIES = net www
@@ -23,7 +19,7 @@ WANTLIB = c pthread
MODULES += lang/go
-BUILD_DEPENDS = net/go-websocket
+BUILD_DEPENDS = net/go-net
NO_TEST = Yes
SUBST_VARS = VERSION
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/websocketd/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 20 Jul 2015 20:53:58 -0000 1.2
+++ distinfo 1 Apr 2016 09:45:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (websocketd-0.2.11.tar.gz) =
tnoHJIzYZ1NE5KhVOx6mQ01niaOZCq/l7LmNUhD4UHE=
-SIZE (websocketd-0.2.11.tar.gz) = 39373
+SHA256 (websocketd-0.2.12.tar.gz) =
iUQPKLWvmF1DVQve7j4ExK0Msrw3OvjgVj8XaVkgJVA=
+SIZE (websocketd-0.2.12.tar.gz) = 40784
Index: patches/patch-examples_cgi-bin_dump-env_sh
===================================================================
RCS file: patches/patch-examples_cgi-bin_dump-env_sh
diff -N patches/patch-examples_cgi-bin_dump-env_sh
--- patches/patch-examples_cgi-bin_dump-env_sh 18 Sep 2015 14:37:52 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-examples_cgi-bin_dump-env_sh,v 1.2 2015/09/18 14:37:52
kspillner Exp $
-
-Drop Bash and tweak to work with our ksh. Merged upstream in PR#166.
---- examples/cgi-bin/dump-env.sh.orig Thu Jul 16 11:52:56 2015
-+++ examples/cgi-bin/dump-env.sh Thu Jul 16 11:58:52 2015
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- # Copyright 2013 Joe Walnes and the websocketd team.
- # All rights reserved.
-@@ -36,7 +36,8 @@ echo
-
- for NAME in ${NAMES}
- do
-- echo ${NAME}=${!NAME:-<unset>}
-+ eval "value=\${${NAME}}"
-+ env -i "${NAME}=${value:-<unset>}"
- done
-
- # Additional HTTP headers
