CVS commit: pkgsrc/textproc/py-demjson

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May  7 09:29:04 UTC 2020

Modified Files:
        pkgsrc/textproc/py-demjson: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/py-demjson/patches: patch-setup.py

Log Message:
py-demjson: fix building with Python 2.7; clean-up


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-demjson/Makefile \
    pkgsrc/textproc/py-demjson/PLIST pkgsrc/textproc/py-demjson/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/py-demjson/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/textproc/py-demjson/Makefile
diff -u pkgsrc/textproc/py-demjson/Makefile:1.1 pkgsrc/textproc/py-demjson/Makefile:1.2
--- pkgsrc/textproc/py-demjson/Makefile:1.1     Fri May  1 17:52:29 2020
+++ pkgsrc/textproc/py-demjson/Makefile Thu May  7 09:29:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/05/01 17:52:29 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/07 09:29:04 adam Exp $
 
 DISTNAME=      demjson-2.2.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,11 @@ HOMEPAGE=    https://github.com/dmeranda/de
 COMMENT=       Encoder, decoder, and lint/validator for JSON compliant with RFC 7159
 LICENSE=       gnu-lgpl-v3
 
+USE_LANGUAGES= # none
+
 post-install:
-       ${MV} ${DESTDIR}${PREFIX}/bin/jsonlint \
-           ${DESTDIR}${PREFIX}/bin/jsonlint-${PYVERSSUFFIX}
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} jsonlint jsonlint-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/py-demjson/PLIST
diff -u pkgsrc/textproc/py-demjson/PLIST:1.1 pkgsrc/textproc/py-demjson/PLIST:1.2
--- pkgsrc/textproc/py-demjson/PLIST:1.1        Fri May  1 17:52:29 2020
+++ pkgsrc/textproc/py-demjson/PLIST    Thu May  7 09:29:04 2020
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/01 17:52:29 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/05/07 09:29:04 adam Exp $
 bin/jsonlint-${PYVERSSUFFIX}
-${PYSITELIB}/demjson.pyo
-${PYSITELIB}/demjson.pyc
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/demjson.py
+${PYSITELIB}/demjson.pyc
+${PYSITELIB}/demjson.pyo
Index: pkgsrc/textproc/py-demjson/distinfo
diff -u pkgsrc/textproc/py-demjson/distinfo:1.1 pkgsrc/textproc/py-demjson/distinfo:1.2
--- pkgsrc/textproc/py-demjson/distinfo:1.1     Fri May  1 17:52:29 2020
+++ pkgsrc/textproc/py-demjson/distinfo Thu May  7 09:29:04 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/05/01 17:52:29 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/05/07 09:29:04 adam Exp $
 
 SHA1 (demjson-2.2.4.tar.gz) = 1c5d78b5616b4cc6f4d4ad35fe831bbd11aaadec
 RMD160 (demjson-2.2.4.tar.gz) = 2d5f60a791671465dc91ab370a8ad7480ed81a26
 SHA512 (demjson-2.2.4.tar.gz) = d8a1cde062d0b062bdae29b6d79ad69fb9cc185428718a0009ccbed544ed37bd354fbb86edadb56bd98183ac8636b2edae322ed19aa5f07a7b6df668c7aa0029
 Size (demjson-2.2.4.tar.gz) = 131457 bytes
+SHA1 (patch-setup.py) = a25eaed1eb2d39c08dd96c7a0a756b8fff51d155

Added files:

Index: pkgsrc/textproc/py-demjson/patches/patch-setup.py
diff -u /dev/null pkgsrc/textproc/py-demjson/patches/patch-setup.py:1.1
--- /dev/null   Thu May  7 09:29:04 2020
+++ pkgsrc/textproc/py-demjson/patches/patch-setup.py   Thu May  7 09:29:04 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-setup.py,v 1.1 2020/05/07 09:29:04 adam Exp $
+
+Always use setuptools.
+
+--- setup.py.orig      2020-05-07 09:23:44.000000000 +0000
++++ setup.py
+@@ -9,23 +9,8 @@ try:
+ except AttributeError:
+     py_major = sys.version_info[0]
+ 
+-distmech = None
+-if py_major >= 3:
+-    # Python 3, use setuptools first
+-    try:
+-        from setuptools import setup
+-        distmech = 'setuptools'
+-    except ImportError:
+-        from distutils.core import setup
+-        distmech = 'distutils'
+-else:
+-    # Python 2, use distutils first
+-    try:
+-        from distutils.core import setup
+-        distmech = 'distutils'
+-    except ImportError:
+-        from setuptools import setup
+-        distmech = 'setuptools'
++from setuptools import setup
++distmech = 'setuptools'
+ 
+ if False:
+     sys.stdout.write("Using Python:    %s\n" % sys.version.split(None,1)[0])