Hi! Here come the updates for devel/go-tools and net/websocketd. Because of new common dependencies I send these two together.
Changes: * devel/go-tools is updated to go 1.6 branch. New dependency (net/go-net) is added to add previously missing tools. * net/websocketd sees trivial update to next version. Thanks to kspillner@'s work it needs less patches. Its dependency net/go-websocket is superceded by net/go-net. * net/go-websocket is be removed. * net/go-net and its dependencies security/go-crypto and textproc/go-text are be added. * textproc/go-text comes with an utility, so go.port.mk is patched to allow MODGO_TYPE="bin lib". * devel/quirks notes go-websocket removal. Diffs against existing ports follow inline. New ports are attached. jsing@ and kspillner@: You gave OKs for previous revision of these. Unless you'll say otherwise I'll assume those OKs still hold. -- Dmitrij D. Czarkoff Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.387 diff -u -p -r1.387 Makefile --- devel/quirks/Makefile 5 May 2016 19:58:37 -0000 1.387 +++ devel/quirks/Makefile 11 May 2016 22:54:58 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-2.232 +PKGNAME = quirks-2.233 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.398 diff -u -p -r1.398 Quirks.pm --- devel/quirks/files/Quirks.pm 5 May 2016 19:58:37 -0000 1.398 +++ devel/quirks/files/Quirks.pm 11 May 2016 22:54:51 -0000 @@ -400,6 +400,7 @@ my $stem_extensions = { 'py-logilab-astng' => 'py-astroid', 'apache-httpd-openbsd' => 'apache-httpd', 'openmotif' => 'motif', + 'go-websocket' => 'go-net', }; # reasons for obsolete packages Index: lang/go/go.port.mk =================================================================== RCS file: /cvs/ports/lang/go/go.port.mk,v retrieving revision 1.9 diff -u -p -r1.9 go.port.mk --- lang/go/go.port.mk 8 May 2016 12:29:17 -0000 1.9 +++ lang/go/go.port.mk 11 May 2016 22:56:46 -0000 @@ -44,13 +44,14 @@ MODGO_FLAGS ?= -x INSTALL_STRIP = .if ${MODGO_TYPE:L:Mbin} -MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin +MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* \ + ${PREFIX}/bin; .endif # Go source files serve the purpose of libraries, so sources should be included # with library ports. .if ${MODGO_TYPE:L:Mlib} -MODGO_INSTALL_TARGET = ${INSTALL_DATA_DIR} ${MODGO_PACKAGE_PATH} && \ +MODGO_INSTALL_TARGET += ${INSTALL_DATA_DIR} ${MODGO_PACKAGE_PATH} && \ cd ${MODGO_WORKSPACE} && \ find src pkg -type d -exec ${INSTALL_DATA_DIR} \ ${MODGO_PACKAGE_PATH}/{} \; && \ Index: devel/go-tools/Makefile =================================================================== RCS file: /cvs/ports/devel/go-tools/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- devel/go-tools/Makefile 8 May 2016 17:14:07 -0000 1.7 +++ devel/go-tools/Makefile 11 May 2016 22:58:07 -0000 @@ -3,10 +3,10 @@ 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/ +HOMEPAGE = https://godoc.org/golang.org/x/tools MAINTAINER = Dmitrij D. Czarkoff <czark...@openbsd.org> @@ -18,39 +18,24 @@ WANTLIB += c pthread MODULES = lang/go MODGO_ENV = PATH="${PORTPATH}" +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/callgraph \ - golang.org/x/tools/cmd/digraph \ - golang.org/x/tools/cmd/eg \ - golang.org/x/tools/cmd/fiximports \ - golang.org/x/tools/cmd/godex \ - golang.org/x/tools/cmd/goimports \ - golang.org/x/tools/cmd/gomvpkg \ - golang.org/x/tools/cmd/gorename \ - golang.org/x/tools/cmd/gotype \ - golang.org/x/tools/cmd/oracle \ - 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 \ - -MODGO_TYPE = bin - -post-patch: - mkdir -p ${MODGO_WORKSPACE}/src/golang.org/x - mv ${WRKDIST} ${MODGO_WORKSPACE}/src/golang.org/x/tools +_MAIN = golang.org/x/tools +_SUBPKGS = benchcmp bundle callgraph digraph eg fiximports godex \ + goimports gomvpkg gorename gotype html2article oracle \ + ssadump stress stringer tip +ALL_TARGET = ${_SUBPKGS:%=${_MAIN}/cmd/%} +WRKSRC = ${MODGO_WORKSPACE}/src/${_MAIN} # 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 # install godoc in $GOROOT/bin instead of $GOPATH/bin (golang.org/issue/6654). do-build: - mkdir -p ${MODGO_WORKSPACE}/bin - ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/godoc ${GODOC_TARGET} ${MODGO_BUILD_TARGET} + ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/godoc \ + ${GODOC_TARGET} .include <bsd.port.mk> Index: devel/go-tools/distinfo =================================================================== RCS file: /cvs/ports/devel/go-tools/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- devel/go-tools/distinfo 14 Jan 2016 16:11:17 -0000 1.2 +++ devel/go-tools/distinfo 11 May 2016 22:00:34 -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: devel/go-tools/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/go-tools/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- devel/go-tools/pkg/PLIST 14 Jan 2016 16:11:17 -0000 1.4 +++ devel/go-tools/pkg/PLIST 11 May 2016 22:42:56 -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,10 @@ @bin bin/gomvpkg @bin bin/gorename @bin bin/gotype +@bin bin/html2article @bin bin/oracle @bin bin/ssadump @bin bin/stress @bin bin/stringer +@bin bin/tip @rcscript ${RCDIR}/godoc Index: net/websocketd/Makefile =================================================================== RCS file: /cvs/ports/net/websocketd/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- net/websocketd/Makefile 18 Sep 2015 14:37:50 -0000 1.6 +++ net/websocketd/Makefile 11 May 2016 19:33:17 -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: net/websocketd/distinfo =================================================================== RCS file: /cvs/ports/net/websocketd/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- net/websocketd/distinfo 20 Jul 2015 20:53:58 -0000 1.2 +++ net/websocketd/distinfo 11 May 2016 22:48:15 -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: net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh =================================================================== RCS file: net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh diff -N net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh --- net/websocketd/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
go-net-20160510.tgz
Description: application/tar-gz
go-crypto-20160510.tgz
Description: application/tar-gz
go-text-20160510.tgz
Description: application/tar-gz