svn commit: r359664 - in head: devel/bzrtools devel/py-astroid devel/py-logilab-common devel/pylint devel/qbzr ftp/py-ftputil graphics/py-editobj math/py-bitvector net-p2p/py-py2play

Marcus von Appen mva at FreeBSD.org
Sat Jun 28 07:03:23 UTC 2014 

Author: mva
Date: Sat Jun 28 07:03:19 2014
New Revision: 359664
URL: http://svnweb.freebsd.org/changeset/ports/359664
QAT: https://qat.redports.org/buildarchive/r359664/

Log:
  - Unbreak ports, which installed setup.py files due to the messed up argument
    lists in PYDISTUTILS_SETUP
  
  PR:		191317
  Phabric:	D270
  With hat:	python@

Deleted:
  head/devel/qbzr/pkg-plist
Modified:
  head/devel/bzrtools/Makefile
  head/devel/bzrtools/pkg-plist
  head/devel/py-astroid/Makefile
  head/devel/py-astroid/pkg-plist
  head/devel/py-logilab-common/Makefile
  head/devel/py-logilab-common/pkg-plist
  head/devel/pylint/Makefile
  head/devel/pylint/pkg-plist
  head/devel/qbzr/Makefile
  head/ftp/py-ftputil/Makefile
  head/ftp/py-ftputil/pkg-plist
  head/graphics/py-editobj/Makefile
  head/graphics/py-editobj/pkg-plist
  head/math/py-bitvector/Makefile
  head/net-p2p/py-py2play/Makefile
  head/net-p2p/py-py2play/pkg-plist

Modified: head/devel/bzrtools/Makefile
==============================================================================
--- head/devel/bzrtools/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/bzrtools/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bzrtools
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpad.net/bzrtools/stable/${PORTVERSION}/+download/
 

Modified: head/devel/bzrtools/pkg-plist
==============================================================================
--- head/devel/bzrtools/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/bzrtools/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -64,9 +64,6 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo

Modified: head/devel/py-astroid/Makefile
==============================================================================
--- head/devel/py-astroid/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/py-astroid/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -2,6 +2,7 @@
 
 PORTNAME=	astroid
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://bitbucket.org/logilab/astroid/get/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,6 @@ WRKSRC=			${WRKDIR}/logilab-astroid-e003
 MAKE_ENV=		NO_SETUPTOOLS=1
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	astroid
 
 .include <bsd.port.pre.mk>
 

Modified: head/devel/py-astroid/pkg-plist
==============================================================================
--- head/devel/py-astroid/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/py-astroid/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -58,9 +58,6 @@
 %%PYTHON_SITELIBDIR%%/astroid/scoped_nodes.py
 %%PYTHON_SITELIBDIR%%/astroid/scoped_nodes.pyc
 %%PYTHON_SITELIBDIR%%/astroid/scoped_nodes.pyo
-%%PYTHON_SITELIBDIR%%/astroid/setup.py
-%%PYTHON_SITELIBDIR%%/astroid/setup.pyc
-%%PYTHON_SITELIBDIR%%/astroid/setup.pyo
 %%PYTHON_SITELIBDIR%%/astroid/test/data/MyPyPa-0.1.0-py2.5.egg
 %%PYTHON_SITELIBDIR%%/astroid/test/data/MyPyPa-0.1.0-py2.5.zip
 %%PYTHON_SITELIBDIR%%/astroid/test/data/SSL1/Connection1.py

Modified: head/devel/py-logilab-common/Makefile
==============================================================================
--- head/devel/py-logilab-common/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/py-logilab-common/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	logilab-common
 PORTVERSION=	0.61.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	LOGILAB/common
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Common low-level libraries shar
 LICENSE=	LGPL20
 
 MAKE_ENV=	NO_SETUPTOOLS=1
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>

Modified: head/devel/py-logilab-common/pkg-plist
==============================================================================
--- head/devel/py-logilab-common/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/py-logilab-common/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -84,9 +84,6 @@ bin/pytest
 %%PYTHON_SITELIBDIR%%/logilab/common/registry.py
 %%PYTHON_SITELIBDIR%%/logilab/common/registry.pyc
 %%PYTHON_SITELIBDIR%%/logilab/common/registry.pyo
-%%PYTHON_SITELIBDIR%%/logilab/common/setup.py
-%%PYTHON_SITELIBDIR%%/logilab/common/setup.pyc
-%%PYTHON_SITELIBDIR%%/logilab/common/setup.pyo
 %%PYTHON_SITELIBDIR%%/logilab/common/shellutils.py
 %%PYTHON_SITELIBDIR%%/logilab/common/shellutils.pyc
 %%PYTHON_SITELIBDIR%%/logilab/common/shellutils.pyo

Modified: head/devel/pylint/Makefile
==============================================================================
--- head/devel/pylint/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/pylint/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pylint
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	LOGILAB
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -19,10 +20,6 @@ USE_PYDISTUTILS=	yes
 
 OPTIONS_DEFINE=	GUI
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGUI}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-.endif
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 
 .include <bsd.port.mk>

Modified: head/devel/pylint/pkg-plist
==============================================================================
--- head/devel/pylint/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/pylint/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -108,9 +108,6 @@ bin/symilar
 %%PYTHON_SITELIBDIR%%/pylint/reporters/text.py
 %%PYTHON_SITELIBDIR%%/pylint/reporters/text.pyc
 %%PYTHON_SITELIBDIR%%/pylint/reporters/text.pyo
-%%PYTHON_SITELIBDIR%%/pylint/setup.py
-%%PYTHON_SITELIBDIR%%/pylint/setup.pyc
-%%PYTHON_SITELIBDIR%%/pylint/setup.pyo
 %%PYTHON_SITELIBDIR%%/pylint/test/data/__init__.py
 %%PYTHON_SITELIBDIR%%/pylint/test/data/classes_No_Name.dot
 %%PYTHON_SITELIBDIR%%/pylint/test/data/clientmodule_test.py

Modified: head/devel/qbzr/Makefile
==============================================================================
--- head/devel/qbzr/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/devel/qbzr/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qbzr
 PORTVERSION=	0.23.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/109906138/ \
 		http://www.c-s.li/ports/
@@ -21,9 +21,10 @@ RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_PYTHON=	yes
-USE_QT4=	# empty
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+USE_QT4=	# empty
 USES=		gettext
 INSTALLS_ICONS=	yes
 

Modified: head/ftp/py-ftputil/Makefile
==============================================================================
--- head/ftp/py-ftputil/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/ftp/py-ftputil/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ftputil
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	ftp python
 MASTER_SITES=	# http://ftputil.sschwarzer.net/trac/attachment/wiki/Download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,13 +11,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu at FreeBSD.org
 COMMENT=	High-level FTP client library
 
-USE_PYTHON=	yes
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
-.if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOC_FILES=	README.html README.txt ftputil.html ftputil.txt ftputil_ru_utf8.txt
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -26,11 +25,9 @@ do-fetch:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/ftp/py-ftputil/pkg-plist
==============================================================================
--- head/ftp/py-ftputil/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/ftp/py-ftputil/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -1,6 +1,3 @@
-%%PYTHON_LIBDIR%%/site-packages/ftputil/setup.py
-%%PYTHON_LIBDIR%%/site-packages/ftputil/setup.pyc
-%%PYTHON_LIBDIR%%/site-packages/ftputil/setup.pyo
 %%PYTHON_SITELIBDIR%%/ftputil/__init__.py
 %%PYTHON_SITELIBDIR%%/ftputil/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ftputil/__init__.pyo

Modified: head/graphics/py-editobj/Makefile
==============================================================================
--- head/graphics/py-editobj/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/graphics/py-editobj/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	editobj
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.gna.org/songwrite/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Modified: head/graphics/py-editobj/pkg-plist
==============================================================================
--- head/graphics/py-editobj/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/graphics/py-editobj/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -6,7 +6,6 @@
 %%PYTHON_SITELIBDIR%%/editobj/eventobj.py
 %%PYTHON_SITELIBDIR%%/editobj/main.py
 %%PYTHON_SITELIBDIR%%/editobj/observe.py
-%%PYTHON_SITELIBDIR%%/editobj/setup.py
 %%PYTHON_SITELIBDIR%%/editobj/treewidget.py
 %%PYTHON_SITELIBDIR%%/editobj/__init__.pyc
 %%PYTHON_SITELIBDIR%%/editobj/cancel.pyc
@@ -16,7 +15,6 @@
 %%PYTHON_SITELIBDIR%%/editobj/eventobj.pyc
 %%PYTHON_SITELIBDIR%%/editobj/main.pyc
 %%PYTHON_SITELIBDIR%%/editobj/observe.pyc
-%%PYTHON_SITELIBDIR%%/editobj/setup.pyc
 %%PYTHON_SITELIBDIR%%/editobj/treewidget.pyc
 %%PYTHON_SITELIBDIR%%/editobj/__init__.pyo
 %%PYTHON_SITELIBDIR%%/editobj/cancel.pyo
@@ -26,7 +24,6 @@
 %%PYTHON_SITELIBDIR%%/editobj/eventobj.pyo
 %%PYTHON_SITELIBDIR%%/editobj/main.pyo
 %%PYTHON_SITELIBDIR%%/editobj/observe.pyo
-%%PYTHON_SITELIBDIR%%/editobj/setup.pyo
 %%PYTHON_SITELIBDIR%%/editobj/treewidget.pyo
 %%PYTHON_SITELIBDIR%%/editobj/icons/folder.pgm
 %%PYTHON_SITELIBDIR%%/editobj/icons/minus.pgm

Modified: head/math/py-bitvector/Makefile
==============================================================================
--- head/math/py-bitvector/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/math/py-bitvector/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bitvector
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,21 +22,16 @@ PORTDOCS=	README BitVector-${PORTVERSION
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/BitVector.py \
 		%%PYTHON_SITELIBDIR%%/BitVector.pyc \
-		%%PYTHON_SITELIBDIR%%/BitVector.pyo \
-		%%PYTHON_LIBDIR%%/site-packages/setup.py \
-		%%PYTHON_LIBDIR%%/site-packages/setup.pyc \
-		%%PYTHON_LIBDIR%%/site-packages/setup.pyo
+		%%PYTHON_SITELIBDIR%%/BitVector.pyo
 
 post-extract:
 	@${RM} -f ${WRKSRC}/test.py
 
-.if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
 regression-test:
 	@(cd ${WRKSRC}/TestBitVector && ${PYTHON_CMD} Test.py)

Modified: head/net-p2p/py-py2play/Makefile
==============================================================================
--- head/net-p2p/py-py2play/Makefile	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/net-p2p/py-py2play/Makefile	Sat Jun 28 07:03:19 2014	(r359664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	py2play
 PORTVERSION=	0.1.10
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.gna.org/slune/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,13 +21,9 @@ PYDISTUTILS_PKGNAME=	Py2Play
 EXAMPLESDIR=	${PREFIX}/share/examples/py-py2play
 
 post-install:
-.ifndef NOPORTEXAMPLES
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/startdemo ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/net-p2p/py-py2play/pkg-plist
==============================================================================
--- head/net-p2p/py-py2play/pkg-plist	Sat Jun 28 06:59:48 2014	(r359663)
+++ head/net-p2p/py-py2play/pkg-plist	Sat Jun 28 07:03:19 2014	(r359664)
@@ -1,6 +1,3 @@
-%%PYTHON_LIBDIR%%/site-packages/py2play/setup.py
-%%PYTHON_LIBDIR%%/site-packages/py2play/setup.pyc
-%%PYTHON_LIBDIR%%/site-packages/py2play/setup.pyo
 %%PYTHON_SITELIBDIR%%/py2play/__init__.py
 %%PYTHON_SITELIBDIR%%/py2play/action.py
 %%PYTHON_SITELIBDIR%%/py2play/character.py

More information about the svn-ports-head mailing list