summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql92-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql93-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql94-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql95-plpython/Makefile6
-rw-r--r--databases/postgresql95-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql96-server/pkg-plist-plpython10
6 files changed, 25 insertions, 31 deletions
diff --git a/databases/postgresql92-server/pkg-plist-plpython b/databases/postgresql92-server/pkg-plist-plpython
index 083d330d22c4..c1db0a70dff6 100644
--- a/databases/postgresql92-server/pkg-plist-plpython
+++ b/databases/postgresql92-server/pkg-plist-plpython
@@ -1,12 +1,12 @@
%%DOCSDIR%%/README-plpython
%%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
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql93-server/pkg-plist-plpython b/databases/postgresql93-server/pkg-plist-plpython
index 083d330d22c4..c1db0a70dff6 100644
--- a/databases/postgresql93-server/pkg-plist-plpython
+++ b/databases/postgresql93-server/pkg-plist-plpython
@@ -1,12 +1,12 @@
%%DOCSDIR%%/README-plpython
%%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
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql94-server/pkg-plist-plpython b/databases/postgresql94-server/pkg-plist-plpython
index 083d330d22c4..c1db0a70dff6 100644
--- a/databases/postgresql94-server/pkg-plist-plpython
+++ b/databases/postgresql94-server/pkg-plist-plpython
@@ -1,12 +1,12 @@
%%DOCSDIR%%/README-plpython
%%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
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql95-plpython/Makefile b/databases/postgresql95-plpython/Makefile
index 115b776bde4c..ce1cfde53acc 100644
--- a/databases/postgresql95-plpython/Makefile
+++ b/databases/postgresql95-plpython/Makefile
@@ -18,12 +18,6 @@ WANT_PYTHON_USE?= python
CONFIGURE_ARGS= --with-python
COMPONENT= -plpython
-.if defined(PYTHON_VER) && ${PYTHON_VER:R} == 3
-PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
-.else
-PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
-.endif
-
BUILD_DIRS= src/backend src/pl/plpython
INSTALL_DIRS= src/pl/plpython
SLAVE_ONLY= yes
diff --git a/databases/postgresql95-server/pkg-plist-plpython b/databases/postgresql95-server/pkg-plist-plpython
index d24ff23fffe7..49d2377e4136 100644
--- a/databases/postgresql95-server/pkg-plist-plpython
+++ b/databases/postgresql95-server/pkg-plist-plpython
@@ -3,12 +3,12 @@ include/postgresql/server/plpython.h
%%DOCSDIR%%/README-plpython
%%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
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql96-server/pkg-plist-plpython b/databases/postgresql96-server/pkg-plist-plpython
index d24ff23fffe7..49d2377e4136 100644
--- a/databases/postgresql96-server/pkg-plist-plpython
+++ b/databases/postgresql96-server/pkg-plist-plpython
@@ -3,12 +3,12 @@ include/postgresql/server/plpython.h
%%DOCSDIR%%/README-plpython
%%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
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control