Pullup ticket #6071 - requested by taca

devel/py-distro: dependent addition
security/py-certbot: bugfix

Revisions pulled up:
- devel/Makefile                                                1.2921
- devel/py-distro/ALTERNATIVES                                  1.1
- devel/py-distro/DESCR                                         1.1
- devel/py-distro/Makefile                                      1.1-1.2
- devel/py-distro/PLIST                                         1.1
- devel/py-distro/distinfo                                      1.1
- security/py-certbot/Makefile                                  1.17-1.20

---
   Module Name:	pkgsrc
   Committed By:	triaxx
   Date:		Tue Oct  1 13:22:55 UTC 2019

   Added Files:
   	pkgsrc/devel/py-distro: DESCR Makefile PLIST distinfo

   Log Message:
   py-distro: import to version 1.4.0

   Thanks to Aleksej for importing 1.1.0 in wip.

---
   Module Name:	pkgsrc
   Committed By:	triaxx
   Date:		Tue Oct  1 13:24:35 UTC 2019

   Modified Files:
   	pkgsrc/devel: Makefile

   Log Message:
   Import py-distro to version 1.4.0

---
   Module Name:	pkgsrc
   Committed By:	triaxx
   Date:		Tue Oct  1 13:29:58 UTC 2019

   Modified Files:
   	pkgsrc/security/py-certbot: Makefile

   Log Message:
   py-certbot: fix PR pkg/54588

   pkgsrc changes:
   ---------------
   * Add devel/py-distro as a runtime dependency. Certbot claims >=3D1.0.1=
    but
     non-linux distribution are supported only from 1.2.0.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Oct  2 10:04:59 UTC 2019

   Modified Files:
   	pkgsrc/devel/py-distro: Makefile
   Added Files:
   	pkgsrc/devel/py-distro: ALTERNATIVES

   Log Message:
   py-distro: cleanup

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Oct  1 13:53:45 UTC 2019

   Modified Files:
   	pkgsrc/security/py-certbot: Makefile

   Log Message:
   py-certbot: bump PKGREVISION for added dependency

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Wed Oct  2 08:38:42 UTC 2019

   Modified Files:
   	pkgsrc/security/py-certbot: Makefile

   Log Message:
   py-certbot: wip dependencies are not allowed in main pkgsrc

---
   Module Name:	pkgsrc
   Committed By:	triaxx
   Date:		Wed Oct  2 10:40:56 UTC 2019

   Modified Files:
   	pkgsrc/security/py-certbot: Makefile

   Log Message:
   py-certbot: update to 0.38nb3

   pkgsrc changes
   --------------
   * s/wip/devel/ for py-distro dependency (wip was for test only but
     committed by inattention)

7 files changed, 43 insertions, 2 deletions

diff --git a/devel/Makefile b/devel/Makefile
index d9657956f4c..159fc9dbe0e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2920 2019/09/26 08:35:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2920.2.1 2019/10/18 14:31:38 bsiegert Exp $
 #
 
 COMMENT=	Development utilities
@@ -2099,6 +2099,7 @@ SUBDIR+=	py-deprecation
 SUBDIR+=	py-dialog
 SUBDIR+=	py-dialog2
 SUBDIR+=	py-distorm3
+SUBDIR+=	py-distro
 SUBDIR+=	py-doc8
 SUBDIR+=	py-docopt
 SUBDIR+=	py-docstyle
diff --git a/devel/py-distro/ALTERNATIVES b/devel/py-distro/ALTERNATIVES
new file mode 100644
index 00000000000..1b23a57b63e
--- /dev/null
+++ b/devel/py-distro/ALTERNATIVES
@@ -0,0 +1 @@
+bin/distro @PREFIX@/bin/distro-@PYVERSSUFFIX@
diff --git a/devel/py-distro/DESCR b/devel/py-distro/DESCR
new file mode 100644
index 00000000000..2177334effb
--- /dev/null
+++ b/devel/py-distro/DESCR
@@ -0,0 +1 @@
+Distro - an OS platform information API.
diff --git a/devel/py-distro/Makefile b/devel/py-distro/Makefile
new file mode 100644
index 00000000000..e9001b12ffd
--- /dev/null
+++ b/devel/py-distro/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.2.2.2 2019/10/18 14:31:38 bsiegert Exp $
+
+DISTNAME=	distro-1.4.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/distro/}
+
+MAINTAINER=	root@zta.lk
+HOMEPAGE=	https://github.com/nir0s/distro
+COMMENT=	OS platform information API
+LICENSE=	apache-2.0
+
+USE_LANGUAGES=	# none
+
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} distro distro-${PYVERSSUFFIX} || ${TRUE}
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-distro/PLIST b/devel/py-distro/PLIST
new file mode 100644
index 00000000000..9dc8c429529
--- /dev/null
+++ b/devel/py-distro/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1.2.2 2019/10/18 14:31:38 bsiegert Exp $
+bin/distro-${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/distro.py
+${PYSITELIB}/distro.pyc
+${PYSITELIB}/distro.pyo
diff --git a/devel/py-distro/distinfo b/devel/py-distro/distinfo
new file mode 100644
index 00000000000..4829161677d
--- /dev/null
+++ b/devel/py-distro/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.2.2 2019/10/18 14:31:38 bsiegert Exp $
+
+SHA1 (distro-1.4.0.tar.gz) = d72ac60844b2b472fc815441afe60fc1da728926
+RMD160 (distro-1.4.0.tar.gz) = e2403c4fdb70861f89a8e09e4118027e39fb2514
+SHA512 (distro-1.4.0.tar.gz) = eac7d32ea77c2074e57c6828a8b2e4d4d01e9c46cb0f7adbd99998630b0af4924bf18d05d5f5b42fef5603b024ef835dbb4c05fc88310f5e64d193514b2fc10f
+Size (distro-1.4.0.tar.gz) = 53719 bytes
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index bdc75451a88..12676e4f2c0 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2019/06/12 10:27:37 adam Exp $
+# $NetBSD: Makefile,v 1.16.4.1 2019/10/18 14:31:38 bsiegert Exp $
 
 DISTNAME=	certbot-${CERTBOT_VERSION}
+PKGREVISION=	3
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot/}
 
 MAINTAINER=	fhajny@NetBSD.org
@@ -14,6 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
 DEPENDS+=	${PYPKGPREFIX}-configargparse>=0.9.3:../../devel/py-configargparse
 DEPENDS+=	${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.2.3:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-distro>=1.2.0:../../devel/py-distro
 DEPENDS+=	${PYPKGPREFIX}-josepy>=1.1.0:../../security/py-josepy
 DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 DEPENDS+=	${PYPKGPREFIX}-parsedatetime>=2.0:../../time/py-parsedatetime