pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/coilmq Convert to distutils.mk to remove some home...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c7922a7c157
branches:  trunk
changeset: 629494:6c7922a7c157
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jan 22 07:13:22 2014 +0000

description:
Convert to distutils.mk to remove some homegrown replacement code.
No effective change.
Mark as not for python-3.x.

diffstat:

 net/coilmq/Makefile |  20 +++++---------------
 net/coilmq/PLIST    |  16 ++++++++--------
 2 files changed, 13 insertions(+), 23 deletions(-)

diffs (69 lines):

diff -r 5caed42a1fb6 -r 6c7922a7c157 net/coilmq/Makefile
--- a/net/coilmq/Makefile       Wed Jan 22 06:21:30 2014 +0000
+++ b/net/coilmq/Makefile       Wed Jan 22 07:13:22 2014 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/23 17:18:15 asau Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/22 07:13:22 wiz Exp $
 
 DISTNAME=      CoilMQ-0.6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,25 +16,14 @@
 
 USE_LANGUAGES= # none
 
-REPLACE_INTERPRETER+=  python
-REPLACE.python.old=    python
-REPLACE.python.new=    ${PYTHONBIN}
-REPLACE_FILES.python=  distribute_setup.py coilmq/start.py
+REPLACE_PYTHON+=       distribute_setup.py coilmq/start.py
 
 SUBST_CLASSES+=                cfg
 SUBST_STAGE.cfg=       post-patch
 SUBST_FILES.cfg=       coilmq/config/__init__.py
 SUBST_SED.cfg=         -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/coilmq/defaults.cfg,'
 
-.include "../../lang/python/egg.mk"
-
-# setup.py has python distribute as a dependency
-.if ${_PYTHON_VERSION} < 31
-SUBST_CLASSES+=                setup
-SUBST_STAGE.setup=     post-patch
-SUBST_FILES.setup=     setup.py
-SUBST_SED.setup=       -e 's,distribute,setuptools,'
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-stompclient, py-daemon
 
 EGDIR=                 ${PREFIX}/share/examples/coilmq
 
@@ -52,4 +40,6 @@
        ${INSTALL_DATA} ${WRKSRC}/coilmq/config/coilmq.cfg-sample       \
                ${DESTDIR}${EGDIR}
 
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5caed42a1fb6 -r 6c7922a7c157 net/coilmq/PLIST
--- a/net/coilmq/PLIST  Wed Jan 22 06:21:30 2014 +0000
+++ b/net/coilmq/PLIST  Wed Jan 22 07:13:22 2014 +0000
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/14 15:35:00 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/01/22 07:13:22 wiz Exp $
 bin/coilmq
-${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}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/entry_points.txt
+${PYSITELIB}/${EGG_FILE}/not-zip-safe
+${PYSITELIB}/${EGG_FILE}/requires.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/coilmq/__init__.py
 ${PYSITELIB}/coilmq/__init__.pyc
 ${PYSITELIB}/coilmq/__init__.pyo



Home | Main Index | Thread Index | Old Index