svn commit: r376712 - head/databases/monetdb

[Dmitry Sivachenko]

Author: demon
Date: Sat Jan 10 15:29:18 2015
New Revision: 376712
URL: https://svnweb.freebsd.org/changeset/ports/376712
QAT: https://qat.redports.org/buildarchive/r376712/

Log:
  Fix plist for python3 versions other that 3.3.
  
  Approved by:	antoine

Modified:
  head/databases/monetdb/Makefile
  head/databases/monetdb/pkg-plist

Modified: head/databases/monetdb/Makefile
==============================================================================
--- head/databases/monetdb/Makefile	Sat Jan 10 15:07:34 2015	(r376711)
+++ head/databases/monetdb/Makefile	Sat Jan 10 15:29:18 2015	(r376712)
@@ -170,6 +170,9 @@ IGNORE=	testing option requires both Pyt
 
 .if ${PORT_OPTIONS:MPYTHON2} || ${PORT_OPTIONS:MPYTHON3}
 CATEGORIES+=	python
+PLIST_SUB+=	PYTHON=
+.else
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON2}
@@ -183,6 +186,7 @@ CONFIGURE_ARGS+=	--without-python2
 
 .if ${PORT_OPTIONS:MPYTHON3}
 USES+=		python:3
+USE_PYTHON=	py3kplist
 PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 CONFIGURE_ARGS+=	--with-python3=${PYTHON_CMD} \
 			--without-python2

Modified: head/databases/monetdb/pkg-plist
==============================================================================
--- head/databases/monetdb/pkg-plist	Sat Jan 10 15:07:34 2015	(r376711)
+++ head/databases/monetdb/pkg-plist	Sat Jan 10 15:29:18 2015	(r376712)
@@ -197,52 +197,29 @@ lib/monetdb5/zorder.mal
 %%TESTING%%%%PYTHON_SITELIBDIR%%/MonetDBtesting/monet_options.py
 %%TESTING%%%%PYTHON_SITELIBDIR%%/MonetDBtesting/process.py
 %%TESTING%%%%PYTHON_SITELIBDIR%%/MonetDBtesting/trace.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/__init__.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/__init__.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/control.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/control.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/exceptions.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/exceptions.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/mapi.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/mapi.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__init__.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__init__.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/connections.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/connections.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/converters.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/converters.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/cursors.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/cursors.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/monetize.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/monetize.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/pythonize.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/pythonize.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/types.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/monetdb/sql/types.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/python_monetdb-11.15.19-py%%PYTHON_VER%%.egg-info
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/__init__.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/__pycache__/__init__.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/__pycache__/control.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/__pycache__/exceptions.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/__pycache__/mapi.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/control.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/exceptions.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/mapi.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__init__.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/__init__.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/connections.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/converters.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/cursors.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/monetize.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/pythonize.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__pycache__/types.cpython-33.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/connections.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/converters.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/cursors.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/monetize.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/pythonize.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/monetdb/sql/types.py
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/python_monetdb-11.15.19-py3.3.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/control.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/control.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/exceptions.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/exceptions.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/mapi.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/mapi.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/connections.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/connections.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/converters.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/converters.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/cursors.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/cursors.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/monetize.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/monetize.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/pythonize.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/pythonize.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/types.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/monetdb/sql/types.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/python_monetdb-11.15.19-py%%PYTHON_VER%%.egg-info
 %%RUBYGEMS%%lib/ruby/gems/1.9/cache/activerecord-monetdb-adapter-0.1.gem
 %%RUBYGEMS%%lib/ruby/gems/1.9/cache/ruby-monetdb-sql-0.1.gem
 %%RUBYGEMS%%lib/ruby/gems/1.9/doc/activerecord-monetdb-adapter-0.1/rdoc/ActiveRecord.html