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

4 files changed, 42 insertions, 7 deletions

diff --git a/textproc/py-demjson/Makefile b/textproc/py-demjson/Makefile
index 3ac51b14a4c..cc1aaa1a67d 100644
--- a/textproc/py-demjson/Makefile
+++ b/textproc/py-demjson/Makefile
@@ -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/demjson
 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"
diff --git a/textproc/py-demjson/PLIST b/textproc/py-demjson/PLIST
index 0b848f2d9e3..039c88d6220 100644
--- a/textproc/py-demjson/PLIST
+++ b/textproc/py-demjson/PLIST
@@ -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
diff --git a/textproc/py-demjson/distinfo b/textproc/py-demjson/distinfo
index 50a5abae134..a69920373c9 100644
--- a/textproc/py-demjson/distinfo
+++ b/textproc/py-demjson/distinfo
@@ -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
diff --git a/textproc/py-demjson/patches/patch-setup.py b/textproc/py-demjson/patches/patch-setup.py
new file mode 100644
index 00000000000..84f0505b9b4
--- /dev/null
+++ b/textproc/py-demjson/patches/patch-setup.py
@@ -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])