[pkgsrc/trunk]: pkgsrc Unbreak go-crypto and go-net, they no longer depend on...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Unbreak go-crypto and go-net, they no longer depend on...
From: bsiegert <bsiegert%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:53:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa7548e2477b
branches:  trunk
changeset: 360086:aa7548e2477b
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon Mar 20 22:53:45 2017 +0000

description:
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.

diffstat:

 devel/go-tools/Makefile            |   5 ++++-
 devel/go-tools/buildlink3.mk       |   3 ++-
 net/go-net/Makefile                |   6 ++----
 security/go-crypto/Makefile        |  22 +++++++---------------
 security/go-crypto/Makefile.common |  19 +++++++++++++++++++
 security/go-crypto/PLIST           |  15 +--------------
 security/go-crypto/buildlink3.mk   |   3 +--
 7 files changed, 36 insertions(+), 37 deletions(-)

diffs (169 lines):

diff -r fff327385fb6 -r aa7548e2477b devel/go-tools/Makefile
--- a/devel/go-tools/Makefile   Mon Mar 20 22:36:49 2017 +0000
+++ b/devel/go-tools/Makefile   Mon Mar 20 22:53:45 2017 +0000
@@ -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 @@
 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 -r fff327385fb6 -r aa7548e2477b devel/go-tools/buildlink3.mk
--- a/devel/go-tools/buildlink3.mk      Mon Mar 20 22:36:49 2017 +0000
+++ b/devel/go-tools/buildlink3.mk      Mon Mar 20 22:53:45 2017 +0000
@@ -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_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 -r fff327385fb6 -r aa7548e2477b net/go-net/Makefile
--- a/net/go-net/Makefile       Mon Mar 20 22:36:49 2017 +0000
+++ b/net/go-net/Makefile       Mon Mar 20 22:53:45 2017 +0000
@@ -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 @@
 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 @@
 .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 -r fff327385fb6 -r aa7548e2477b security/go-crypto/Makefile
--- a/security/go-crypto/Makefile       Mon Mar 20 22:36:49 2017 +0000
+++ b/security/go-crypto/Makefile       Mon Mar 20 22:53:45 2017 +0000
@@ -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@localhost
-HOMEPAGE=      https://github.com/golang/crypto/
 COMMENT=       Go supplementary cryptography libraries
-LICENSE=       modified-bsd
 
-WRKSRC=                ${WRKDIR}
+GO_SRCPATH=    golang.org/x/crypto
 GO_DIST_BASE=  ${GITHUB_PROJECT}-${GITHUB_TAG}*
-GO_SRCPATH=    golang.org/x/crypto
 
-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 -r fff327385fb6 -r aa7548e2477b security/go-crypto/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/go-crypto/Makefile.common        Mon Mar 20 22:53:45 2017 +0000
@@ -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@localhost
+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 -r fff327385fb6 -r aa7548e2477b security/go-crypto/PLIST
--- a/security/go-crypto/PLIST  Mon Mar 20 22:36:49 2017 +0000
+++ b/security/go-crypto/PLIST  Mon Mar 20 22:53:45 2017 +0000
@@ -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/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 -r fff327385fb6 -r aa7548e2477b security/go-crypto/buildlink3.mk
--- a/security/go-crypto/buildlink3.mk  Mon Mar 20 22:36:49 2017 +0000
+++ b/security/go-crypto/buildlink3.mk  Mon Mar 20 22:53:45 2017 +0000
@@ -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_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
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/go Do not take the basename of GO_DIST_BASE when ...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc +go-crypto-acme
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/go Do not take the basename of GO_DIST_BASE when ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc +go-crypto-acme
Indexes:
Home | Main Index | Thread Index | Old Index