Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Aug 2012 04:33:10 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302665 - head/textproc/coccigrep
Message-ID:  <201208170433.q7H4XAH0017112@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Fri Aug 17 04:33:09 2012
New Revision: 302665
URL: http://svn.freebsd.org/changeset/ports/302665

Log:
  Use PYEASYINSTALL_EGG instead of PLIST_SUB hacks
  
  Reported by:	rm@

Modified:
  head/textproc/coccigrep/Makefile
  head/textproc/coccigrep/pkg-plist

Modified: head/textproc/coccigrep/Makefile
==============================================================================
--- head/textproc/coccigrep/Makefile	Fri Aug 17 04:15:52 2012	(r302664)
+++ head/textproc/coccigrep/Makefile	Fri Aug 17 04:33:09 2012	(r302665)
@@ -20,8 +20,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/spatch:${P
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 MANCOMPRESSED=	no
-PLIST_SUB=	VERSION=${PORTVERSION} \
-		PY_VER=${PYTHON_VERSION:S/python//}
 
 MAN1=		coccigrep.1
 

Modified: head/textproc/coccigrep/pkg-plist
==============================================================================
--- head/textproc/coccigrep/pkg-plist	Fri Aug 17 04:15:52 2012	(r302664)
+++ head/textproc/coccigrep/pkg-plist	Fri Aug 17 04:33:09 2012	(r302665)
@@ -1,30 +1,30 @@
 bin/coccigrep
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/coccigrep.py
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/__init__.py
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/coccigrep.cfg
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/coccigrep.pyc
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/__init__.pyc
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/data/set.cocci
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/data/deref.cocci
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/data/test.cocci
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/data/used.cocci
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/data/func.cocci
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/coccigrep.pyo
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/__init__.pyo
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/scripts/coccigrep
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/coccigrep.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/coccigrep.cfg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/coccigrep.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data/set.cocci
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data/deref.cocci
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data/test.cocci
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data/used.cocci
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data/func.cocci
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/coccigrep.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/coccigrep
 %%DATADIR%%/cocci-grep.el
 %%DATADIR%%/cocci-grep.vim
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.rst
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep/data
-@dirrm %%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/coccigrep
-@dirrm %%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/coccigrep-%%VERSION%%-py%%PY_VER%%.egg
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%



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