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:18:11 2018 +0200
Changeset:	927c80dcde1d06154155b97bb85ce785812d93fa

Modified Files:
	py-mulpyplexer/Makefile
	py-mulpyplexer/PLIST
	py-mulpyplexer/distinfo
Removed Files:
	py-mulpyplexer/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=927c80dcde1d06154155b97bb85ce785812d93fa

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

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

diffs:
diff --git a/py-mulpyplexer/Makefile b/py-mulpyplexer/Makefile
index 092f95edab..8491ba4046 100644
--- a/py-mulpyplexer/Makefile
+++ b/py-mulpyplexer/Makefile
@@ -13,5 +13,5 @@ COMMENT=	Multiplexes interactions with lists of python objects
 
 PYTHON_VERSIONS_ACCEPTED=	27
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-mulpyplexer/PLIST b/py-mulpyplexer/PLIST
index 3661ca21b3..ce04f57e76 100644
--- a/py-mulpyplexer/PLIST
+++ b/py-mulpyplexer/PLIST
@@ -1,8 +1,5 @@
 @comment $NetBSD$
-${PYSITELIB}/mulpyplexer-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/mulpyplexer-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/mulpyplexer-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/mulpyplexer-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/mulpyplexer.py
 ${PYSITELIB}/mulpyplexer.pyc
 ${PYSITELIB}/mulpyplexer.pyo
diff --git a/py-mulpyplexer/distinfo b/py-mulpyplexer/distinfo
index e284419605..e7779a5595 100644
--- a/py-mulpyplexer/distinfo
+++ b/py-mulpyplexer/distinfo
@@ -4,4 +4,3 @@ SHA1 (mulpyplexer-0.08.tar.gz) = de9bb912570e7522febd6fa0ca01ae2767e5992c
 RMD160 (mulpyplexer-0.08.tar.gz) = 2f1b28ad398eb8d39d95ee8319653f587896fab4
 SHA512 (mulpyplexer-0.08.tar.gz) = 6a8e3aaeaa42a1ec90bbd34aefa6c9c259e8b3e8a01e0824fce9cf4e82ae65aedec747eb1849ef7341bab144be739ae86378fdd825d4eefa3bbf89ca96a87ab3
 Size (mulpyplexer-0.08.tar.gz) = 2100 bytes
-SHA1 (patch-setup.py) = 99f6745e4d17113f179a949fc13922919e008ff2
diff --git a/py-mulpyplexer/patches/patch-setup.py b/py-mulpyplexer/patches/patch-setup.py
deleted file mode 100644
index 479d9ad560..0000000000
--- a/py-mulpyplexer/patches/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Fix error "Unknown distribution option: 'install_requires'"
-
---- setup.py.orig	2017-08-10 02:47:00.000000000 +0000
-+++ setup.py
-@@ -1,5 +1,5 @@
- import os
--from distutils.core import setup
-+from setuptools import setup
- 
- setup(
-     name='mulpyplexer',


Home | Main Index | Thread Index | Old Index