CVS commit: [pkgsrc-2019Q3] pkgsrc

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct 18 14:31:38 UTC 2019

Modified Files:
        pkgsrc/devel [pkgsrc-2019Q3]: Makefile
        pkgsrc/security/py-certbot [pkgsrc-2019Q3]: Makefile
Added Files:
        pkgsrc/devel/py-distro [pkgsrc-2019Q3]: ALTERNATIVES DESCR Makefile
            PLIST distinfo

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.2920 -r1.2920.2.1 pkgsrc/devel/Makefile
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/devel/py-distro/ALTERNATIVES \
    pkgsrc/devel/py-distro/DESCR pkgsrc/devel/py-distro/PLIST \
    pkgsrc/devel/py-distro/distinfo
cvs rdiff -u -r0 -r1.2.2.2 pkgsrc/devel/py-distro/Makefile
cvs rdiff -u -r1.16 -r1.16.4.1 pkgsrc/security/py-certbot/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.2920 pkgsrc/devel/Makefile:1.2920.2.1
--- pkgsrc/devel/Makefile:1.2920        Thu Sep 26 08:35:24 2019
+++ pkgsrc/devel/Makefile       Fri Oct 18 14:31:38 2019
@@ -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

Index: pkgsrc/security/py-certbot/Makefile
diff -u pkgsrc/security/py-certbot/Makefile:1.16 pkgsrc/security/py-certbot/Makefile:1.16.4.1
--- pkgsrc/security/py-certbot/Makefile:1.16    Wed Jun 12 10:27:37 2019
+++ pkgsrc/security/py-certbot/Makefile Fri Oct 18 14:31:38 2019
@@ -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@localhost
@@ -14,6 +15,7 @@ DEPENDS+=     ${PYPKGPREFIX}-acme>=0.29.0:..
 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

Added files:

Index: pkgsrc/devel/py-distro/ALTERNATIVES
diff -u /dev/null pkgsrc/devel/py-distro/ALTERNATIVES:1.1.2.2
--- /dev/null   Fri Oct 18 14:31:38 2019
+++ pkgsrc/devel/py-distro/ALTERNATIVES Fri Oct 18 14:31:38 2019
@@ -0,0 +1 @@
+bin/distro @PREFIX@/bin/distro-@PYVERSSUFFIX@
Index: pkgsrc/devel/py-distro/DESCR
diff -u /dev/null pkgsrc/devel/py-distro/DESCR:1.1.2.2
--- /dev/null   Fri Oct 18 14:31:38 2019
+++ pkgsrc/devel/py-distro/DESCR        Fri Oct 18 14:31:38 2019
@@ -0,0 +1 @@
+Distro - an OS platform information API.
Index: pkgsrc/devel/py-distro/PLIST
diff -u /dev/null pkgsrc/devel/py-distro/PLIST:1.1.2.2
--- /dev/null   Fri Oct 18 14:31:38 2019
+++ pkgsrc/devel/py-distro/PLIST        Fri Oct 18 14:31:38 2019
@@ -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
Index: pkgsrc/devel/py-distro/distinfo
diff -u /dev/null pkgsrc/devel/py-distro/distinfo:1.1.2.2
--- /dev/null   Fri Oct 18 14:31:38 2019
+++ pkgsrc/devel/py-distro/distinfo     Fri Oct 18 14:31:38 2019
@@ -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

Index: pkgsrc/devel/py-distro/Makefile
diff -u /dev/null pkgsrc/devel/py-distro/Makefile:1.2.2.2
--- /dev/null   Fri Oct 18 14:31:38 2019
+++ pkgsrc/devel/py-distro/Makefile     Fri Oct 18 14:31:38 2019
@@ -0,0 +1,20 @@
+# $NetBSD$
+
+DISTNAME=      distro-1.4.0
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=    devel python
+MASTER_SITES=  ${MASTER_SITE_PYPI:=d/distro/}
+
+MAINTAINER=    root%zta.lk@localhost
+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"