Unbreak go-crypto and go-net, they no longer depend on one another.

Bump go-crypto and go-tools, which now depends on go-crypto-acme.

Fixes PR pkg/52081 breakage.

7 files changed, 36 insertions, 37 deletions

diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 67c9ea09692..8b0a1ce1f2a 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2017/03/16 19:33:50 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13 2017/03/20 22:53:45 bsiegert Exp $
 #
 
 DISTNAME=		tools
 PKGNAME=		go-tools-1.8
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=		${DISTNAME}
@@ -19,7 +20,9 @@ GO_DIST_BASE=		${DISTNAME}-${GITHUB_TAG}*
 USE_TOOLS+=		bash
 REPLACE_BASH+=		cmd/godoc/setup-godoc-app.bash
 REPLACE_BASH+=		cmd/oracle/emacs-test.bash
+REPLACE_BASH+=		cmd/toolstash/buildall
 
 .include "../../lang/go/go-package.mk"
 .include "../../devel/google-api-go-client/buildlink3.mk"
+.include "../../security/go-crypto-acme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/go-tools/buildlink3.mk b/devel/go-tools/buildlink3.mk
index 706b06bb6eb..d262feefc73 100644
--- a/devel/go-tools/buildlink3.mk
+++ b/devel/go-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/03/16 19:33:50 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/03/20 22:53:45 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-tools
 
@@ -12,6 +12,7 @@ BUILDLINK_API_DEPENDS.go-tools+=	go-tools>=1.8
 BUILDLINK_PKGSRCDIR.go-tools?=	../../devel/go-tools
 
 .include "../../devel/google-api-go-client/buildlink3.mk"
+.include "../../security/go-crypto-acme/buildlink3.mk"
 .endif	# GO_TOOLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-tools
diff --git a/net/go-net/Makefile b/net/go-net/Makefile
index d559dc04cab..52981bad03a 100644
--- a/net/go-net/Makefile
+++ b/net/go-net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/03/20 12:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/03/20 22:53:45 bsiegert Exp $
 
 DISTNAME=		go-net-20170308
 CATEGORIES=		net
@@ -14,8 +14,6 @@ LICENSE=		modified-bsd
 GO_SRCPATH=		golang.org/x/net
 GO_DIST_BASE=		${GITHUB_PROJECT}-${GITHUB_TAG}*
 
-BROKEN=			Depends on go-crypto, which depends on this package.
-
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=	notsunos
@@ -27,6 +25,6 @@ PLIST.notsunos=	yes
 .endif
 
 .include "../../textproc/go-text/buildlink3.mk"
-#.include "../../security/go-crypto/buildlink3.mk"
+.include "../../security/go-crypto/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/go-crypto/Makefile b/security/go-crypto/Makefile
index 771c2c02dae..4b7eeb58226 100644
--- a/security/go-crypto/Makefile
+++ b/security/go-crypto/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2017/03/20 12:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/03/20 22:53:45 bsiegert Exp $
 
-DISTNAME=	go-crypto-0.0.20170317
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
-GITHUB_PROJECT=	crypto
-GITHUB_TAG=	728b753
+PKGREVISION=	1
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/golang/crypto/
 COMMENT=	Go supplementary cryptography libraries
-LICENSE=	modified-bsd
 
-WRKSRC=		${WRKDIR}
-GO_DIST_BASE=	${GITHUB_PROJECT}-${GITHUB_TAG}*
 GO_SRCPATH=	golang.org/x/crypto
+GO_DIST_BASE=	${GITHUB_PROJECT}-${GITHUB_TAG}*
 
-BROKEN=		Depends on go-net, which depends on this package.
+# The "acme" package depends on x/net/context.
+pre-patch:
+	${RM} -r ${WRKSRC}/acme
 
-#.include "../../net/go-net/buildlink3.mk"
-.include "../../lang/go/go-package.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "Makefile.common"
diff --git a/security/go-crypto/Makefile.common b/security/go-crypto/Makefile.common
new file mode 100644
index 00000000000..0e812beba74
--- /dev/null
+++ b/security/go-crypto/Makefile.common
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile.common,v 1.1 2017/03/20 22:53:45 bsiegert Exp $
+# 
+# used by security/go-crypto
+# used by security/go-crypto-acme
+
+DISTNAME=	go-crypto-0.0.20170317
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
+GITHUB_PROJECT=	crypto
+GITHUB_TAG=	728b753
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/golang/crypto/
+LICENSE=	modified-bsd
+
+DISTINFO_FILE=	${.CURDIR}/../../security/go-crypto/distinfo
+
+.include "../../lang/go/go-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/go-crypto/PLIST b/security/go-crypto/PLIST
index e949585ad4d..a411be6c69f 100644
--- a/security/go-crypto/PLIST
+++ b/security/go-crypto/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/03/16 19:27:36 bsiegert Exp $
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/acme.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/acme/autocert.a
+@comment $NetBSD: PLIST,v 1.3 2017/03/20 22:53:45 bsiegert Exp $
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/bcrypt.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/blake2b.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/blake2s.a
@@ -49,17 +47,6 @@ gopkg/src/golang.org/x/crypto/CONTRIBUTORS
 gopkg/src/golang.org/x/crypto/LICENSE
 gopkg/src/golang.org/x/crypto/PATENTS
 gopkg/src/golang.org/x/crypto/README
-gopkg/src/golang.org/x/crypto/acme/acme.go
-gopkg/src/golang.org/x/crypto/acme/acme_test.go
-gopkg/src/golang.org/x/crypto/acme/autocert/autocert.go
-gopkg/src/golang.org/x/crypto/acme/autocert/autocert_test.go
-gopkg/src/golang.org/x/crypto/acme/autocert/cache.go
-gopkg/src/golang.org/x/crypto/acme/autocert/cache_test.go
-gopkg/src/golang.org/x/crypto/acme/autocert/renewal.go
-gopkg/src/golang.org/x/crypto/acme/autocert/renewal_test.go
-gopkg/src/golang.org/x/crypto/acme/jws.go
-gopkg/src/golang.org/x/crypto/acme/jws_test.go
-gopkg/src/golang.org/x/crypto/acme/types.go
 gopkg/src/golang.org/x/crypto/bcrypt/base64.go
 gopkg/src/golang.org/x/crypto/bcrypt/bcrypt.go
 gopkg/src/golang.org/x/crypto/bcrypt/bcrypt_test.go
diff --git a/security/go-crypto/buildlink3.mk b/security/go-crypto/buildlink3.mk
index bf1f7ad56d9..e0b3afb5c20 100644
--- a/security/go-crypto/buildlink3.mk
+++ b/security/go-crypto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/03/16 19:27:36 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/03/20 22:53:45 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-crypto
 
@@ -11,7 +11,6 @@ BUILDLINK_DEPMETHOD.go-crypto?=		build
 BUILDLINK_API_DEPENDS.go-crypto+=	go-crypto>=0.0.20170317
 BUILDLINK_PKGSRCDIR.go-crypto?=	../../security/go-crypto
 
-.include "../../net/go-net/buildlink3.mk"
 .endif	# GO_CRYPTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-crypto