Remove go-crypto-acme. Replacement: go-crypto.

The two packages have been re-merged after the removal of a circular
dependency.

6 files changed, 1 insertions, 72 deletions

diff --git a/security/Makefile b/security/Makefile
index b59a742331f..d4119942849 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.674 2018/03/11 12:08:18 maya Exp $
+# $NetBSD: Makefile,v 1.675 2018/03/11 20:49:04 bsiegert Exp $
 #
 
 COMMENT=	Security tools
@@ -101,7 +101,6 @@ SUBDIR+=	gnupg2
 SUBDIR+=	gnutls
 SUBDIR+=	go-crypt
 SUBDIR+=	go-crypto
-SUBDIR+=	go-crypto-acme
 SUBDIR+=	go-oauth2
 SUBDIR+=	go-sftp
 SUBDIR+=	google-authenticator
diff --git a/security/go-crypto-acme/DESCR b/security/go-crypto-acme/DESCR
deleted file mode 100644
index 4f2db2dd026..00000000000
--- a/security/go-crypto-acme/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Supplementary Go cryptography libraries.
-
-This package contains the ACME library to interface with automated certificate
-issuers, such as Let's Encrypt.
diff --git a/security/go-crypto-acme/Makefile b/security/go-crypto-acme/Makefile
deleted file mode 100644
index 0c5b22e3d59..00000000000
--- a/security/go-crypto-acme/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2018/03/04 15:52:19 bsiegert Exp $
-
-PKGNAME=	${DISTNAME:S/crypto/crypto-acme/}
-PKGREVISION=	1
-COMMENT=	ACME library from go-crypto
-
-GO_SRCPATH=	golang.org/x/crypto/acme
-GO_DIST_BASE=	${GITHUB_PROJECT}-${GITHUB_TAG}*/acme
-
-.include "../../net/go-net/buildlink3.mk"
-.include "../../security/go-crypto/Makefile.common"
diff --git a/security/go-crypto-acme/PLIST b/security/go-crypto-acme/PLIST
deleted file mode 100644
index 3ab7f2d18be..00000000000
--- a/security/go-crypto-acme/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2017/05/02 17:06:30 fhajny Exp $
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/acme.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/acme/autocert.a
-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/example_test.go
-gopkg/src/golang.org/x/crypto/acme/autocert/listener.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/acme/types_test.go
-@pkgdir bin
diff --git a/security/go-crypto-acme/buildlink3.mk b/security/go-crypto-acme/buildlink3.mk
deleted file mode 100644
index 704c4ec8101..00000000000
--- a/security/go-crypto-acme/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/03/20 22:36:49 bsiegert Exp $
-
-BUILDLINK_TREE+=	go-crypto-acme
-
-.if !defined(GO_CRYPTO_ACME_BUILDLINK3_MK)
-GO_CRYPTO_ACME_BUILDLINK3_MK:=
-
-BUILDLINK_CONTENTS_FILTER.go-crypto-acme=	${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-crypto-acme?=		build
-
-BUILDLINK_API_DEPENDS.go-crypto-acme+=	go-crypto-acme>=0.0.20170317
-BUILDLINK_PKGSRCDIR.go-crypto-acme?=	../../security/go-crypto-acme
-
-.include "../../net/go-net/buildlink3.mk"
-.endif	# GO_CRYPTO_ACME_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-go-crypto-acme
diff --git a/security/go-crypto/Makefile.common b/security/go-crypto/Makefile.common
deleted file mode 100644
index 2a81a33f29e..00000000000
--- a/security/go-crypto/Makefile.common
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2017/08/25 17:20:51 jperkin Exp $
-#
-# used by security/go-crypto-acme/Makefile
-# used by security/go-crypto/Makefile
-
-DISTNAME=	go-crypto-0.0.20170502
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
-GITHUB_PROJECT=	crypto
-GITHUB_TAG=	8e03fc1ab6
-
-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 "../../devel/go-sys/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"