Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Dec 2013 15:09:56 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337257 - head/math/py-networkx
Message-ID:  <201312231509.rBNF9ucd013513@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Mon Dec 23 15:09:56 2013
New Revision: 337257
URL: http://svnweb.freebsd.org/changeset/ports/337257

Log:
  Fix plist when port is used with python-3.
  
  Approved by:	maintainer

Modified:
  head/math/py-networkx/Makefile
  head/math/py-networkx/pkg-plist

Modified: head/math/py-networkx/Makefile
==============================================================================
--- head/math/py-networkx/Makefile	Mon Dec 23 14:49:25 2013	(r337256)
+++ head/math/py-networkx/Makefile	Mon Dec 23 15:09:56 2013	(r337257)
@@ -13,7 +13,9 @@ COMMENT=	Tools for complex network
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
+PYTHON_PY3K_PLIST_HACK=yes
 PYSETUP=	setup_egg.py
+PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
 NO_STAGE=	yes
 post-install:

Modified: head/math/py-networkx/pkg-plist
==============================================================================
--- head/math/py-networkx/pkg-plist	Mon Dec 23 14:49:25 2013	(r337256)
+++ head/math/py-networkx/pkg-plist	Mon Dec 23 15:09:56 2013	(r337257)
@@ -602,12 +602,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2/_decorator2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2/_decorator2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2/_decorator2.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%/_decorator%%PYTHON_MAJOR_VER%%.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%/_decorator%%PYTHON_MAJOR_VER%%.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%/_decorator%%PYTHON_MAJOR_VER%%.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/generators/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/generators/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/generators/__init__.pyo
@@ -984,7 +984,7 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/linalg
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/generators/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/generators
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator2
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator/decorator%%PYTHON_MAJOR_VER%%
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external/decorator
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/external
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/drawing/tests



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312231509.rBNF9ucd013513>