svn commit: r331888 - in head/databases: postgresql90-plpython postgresql91-plpython postgresql91-server postgresql92-plpython postgresql92-server postgresql93-plpython postgresql93-server
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Mon Oct 28 18:52:24 UTC 2013
Author: sunpoet
Date: Mon Oct 28 18:52:22 2013
New Revision: 331888
URL: http://svnweb.freebsd.org/changeset/ports/331888
Log:
- Fix PLIST for python3
Submitted by: sunpoet (myself)
Approved by: crees (pgsql)
Modified:
head/databases/postgresql90-plpython/Makefile
head/databases/postgresql91-plpython/Makefile
head/databases/postgresql91-server/pkg-plist-plpython (contents, props changed)
head/databases/postgresql92-plpython/Makefile
head/databases/postgresql92-server/pkg-plist-plpython (contents, props changed)
head/databases/postgresql93-plpython/Makefile
head/databases/postgresql93-server/pkg-plist-plpython (contents, props changed)
Modified: head/databases/postgresql90-plpython/Makefile
==============================================================================
--- head/databases/postgresql90-plpython/Makefile Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql90-plpython/Makefile Mon Oct 28 18:52:22 2013 (r331888)
@@ -14,15 +14,13 @@ MASTERDIR= ${.CURDIR}/../postgresql${WAN
WANT_PGSQL_VER?= 90
USE_PYTHON?= yes
-PYTHON_MAJOR_VER= ${PYTHON_VER:R}
CONFIGURE_ARGS= --with-python
-PLIST_SUB= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
COMPONENT= -plpython
-.if ${PYTHON_MAJOR_VER} == 3
-PLIST_SUB+= PYTHON3=""
+.if defined(PYTHON_VER) && ${PYTHON_VER:R} == 3
+PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
.else
-PLIST_SUB+= PYTHON3="@comment "
+PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
.endif
BUILD_DIRS= src/backend src/pl/plpython
Modified: head/databases/postgresql91-plpython/Makefile
==============================================================================
--- head/databases/postgresql91-plpython/Makefile Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql91-plpython/Makefile Mon Oct 28 18:52:22 2013 (r331888)
@@ -2,5 +2,4 @@
WANT_PGSQL_VER= 91
-NO_STAGE= yes
.include "${.CURDIR}/../postgresql90-plpython/Makefile"
Modified: head/databases/postgresql91-server/pkg-plist-plpython
==============================================================================
--- head/databases/postgresql91-server/pkg-plist-plpython Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql91-server/pkg-plist-plpython Mon Oct 28 18:52:22 2013 (r331888)
@@ -1,11 +1,12 @@
%%DOCSDIR%%/README-plpython
-lib/postgresql/plpython%%PYTHON_MAJOR_VER%%.so
-%%DATADIR%%/extension/plpythonu.control
-%%DATADIR%%/extension/plpythonu--1.0.sql
-%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%DATADIR%%/extension/plpython2u.control
-%%DATADIR%%/extension/plpython2u--1.0.sql
-%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
+%%PYTHON2%%lib/postgresql/plpython2.so
+%%PYTHON3%%lib/postgresql/plpython3.so
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
Modified: head/databases/postgresql92-plpython/Makefile
==============================================================================
--- head/databases/postgresql92-plpython/Makefile Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql92-plpython/Makefile Mon Oct 28 18:52:22 2013 (r331888)
@@ -2,5 +2,4 @@
WANT_PGSQL_VER= 92
-NO_STAGE= yes
.include "${.CURDIR}/../postgresql90-plpython/Makefile"
Modified: head/databases/postgresql92-server/pkg-plist-plpython
==============================================================================
--- head/databases/postgresql92-server/pkg-plist-plpython Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql92-server/pkg-plist-plpython Mon Oct 28 18:52:22 2013 (r331888)
@@ -1,11 +1,12 @@
%%DOCSDIR%%/README-plpython
-lib/postgresql/plpython%%PYTHON_MAJOR_VER%%.so
-%%DATADIR%%/extension/plpythonu.control
-%%DATADIR%%/extension/plpythonu--1.0.sql
-%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%DATADIR%%/extension/plpython2u.control
-%%DATADIR%%/extension/plpython2u--1.0.sql
-%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
+%%PYTHON2%%lib/postgresql/plpython2.so
+%%PYTHON3%%lib/postgresql/plpython3.so
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
Modified: head/databases/postgresql93-plpython/Makefile
==============================================================================
--- head/databases/postgresql93-plpython/Makefile Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql93-plpython/Makefile Mon Oct 28 18:52:22 2013 (r331888)
@@ -2,5 +2,4 @@
WANT_PGSQL_VER= 93
-NO_STAGE= yes
.include "${.CURDIR}/../postgresql90-plpython/Makefile"
Modified: head/databases/postgresql93-server/pkg-plist-plpython
==============================================================================
--- head/databases/postgresql93-server/pkg-plist-plpython Mon Oct 28 18:48:22 2013 (r331887)
+++ head/databases/postgresql93-server/pkg-plist-plpython Mon Oct 28 18:52:22 2013 (r331888)
@@ -1,11 +1,12 @@
%%DOCSDIR%%/README-plpython
-lib/postgresql/plpython%%PYTHON_MAJOR_VER%%.so
-%%DATADIR%%/extension/plpythonu.control
-%%DATADIR%%/extension/plpythonu--1.0.sql
-%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%DATADIR%%/extension/plpython2u.control
-%%DATADIR%%/extension/plpython2u--1.0.sql
-%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
+%%PYTHON2%%lib/postgresql/plpython2.so
+%%PYTHON3%%lib/postgresql/plpython3.so
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
More information about the svn-ports-all
mailing list