pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Use lang/python/distutils.mk instead



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Tue May 8 04:15:32 2018 +0200
Changeset:	6b86ac9f3e829fdb2a70df37985194f70a2a63b8

Modified Files:
	py-cooldict/Makefile
	py-cooldict/PLIST
	py-cooldict/distinfo
Removed Files:
	py-cooldict/patches/patch-setup.py

Log Message:
Use lang/python/distutils.mk instead

As recommended by leot@, thanks!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6b86ac9f3e829fdb2a70df37985194f70a2a63b8

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

diffstat:
 py-cooldict/Makefile               |  2 +-
 py-cooldict/PLIST                  |  6 +-----
 py-cooldict/distinfo               |  1 -
 py-cooldict/patches/patch-setup.py | 12 ------------
 4 files changed, 2 insertions(+), 19 deletions(-)

diffs:
diff --git a/py-cooldict/Makefile b/py-cooldict/Makefile
index d82bd77467..f321ffa4f7 100644
--- a/py-cooldict/Makefile
+++ b/py-cooldict/Makefile
@@ -11,5 +11,5 @@ COMMENT=	Some useful dict-like structures
 
 PYTHON_VERSIONS_ACCEPTED=	27
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cooldict/PLIST b/py-cooldict/PLIST
index ed33d216cd..ca707d33bf 100644
--- a/py-cooldict/PLIST
+++ b/py-cooldict/PLIST
@@ -1,9 +1,5 @@
 @comment $NetBSD$
-${PYSITELIB}/cooldict-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/cooldict-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/cooldict-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/cooldict-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/cooldict-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/cooldict.py
 ${PYSITELIB}/cooldict.pyc
 ${PYSITELIB}/cooldict.pyo
diff --git a/py-cooldict/distinfo b/py-cooldict/distinfo
index 5ebe8b5aea..bf1fae5d09 100644
--- a/py-cooldict/distinfo
+++ b/py-cooldict/distinfo
@@ -4,4 +4,3 @@ SHA1 (cooldict-1.02.tar.gz) = 4197731fc1383aed4f03b74c6a9d7dfe92305563
 RMD160 (cooldict-1.02.tar.gz) = 961770f9968d41ace9258e3097543bcd9c1a2cd7
 SHA512 (cooldict-1.02.tar.gz) = d5d3ed177be24ba4381f09e2a10bc7a6101d3a59f0f521d2dc081d3f676b518b4edc0ceb13e779d9936d490085ceb358a2529f766e020bd447857c459e52ebe1
 Size (cooldict-1.02.tar.gz) = 4745 bytes
-SHA1 (patch-setup.py) = daec0d16da285a3f4cd02e8ed124caa1f401dd07
diff --git a/py-cooldict/patches/patch-setup.py b/py-cooldict/patches/patch-setup.py
deleted file mode 100644
index 9e2719df97..0000000000
--- a/py-cooldict/patches/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Fix error "Unknown distribution option: 'install_requires'"
-
---- setup.py.orig	2015-12-29 05:03:09.000000000 +0000
-+++ setup.py
-@@ -1,4 +1,4 @@
--from distutils.core import setup
-+from setuptools import setup
- setup(name='cooldict',
-       version='1.02',
-       description='Some useful dict-like structures',


Home | Main Index | Thread Index | Old Index