diff options
| -rw-r--r-- | databases/postgresql90-plpython/Makefile | 8 | ||||
| -rw-r--r-- | databases/postgresql91-plpython/Makefile | 1 | ||||
| -rw-r--r-- | databases/postgresql91-server/pkg-plist-plpython | 15 | ||||
| -rw-r--r-- | databases/postgresql92-plpython/Makefile | 1 | ||||
| -rw-r--r-- | databases/postgresql92-server/pkg-plist-plpython | 15 | ||||
| -rw-r--r-- | databases/postgresql93-plpython/Makefile | 1 | ||||
| -rw-r--r-- | databases/postgresql93-server/pkg-plist-plpython | 15 |
7 files changed, 27 insertions, 29 deletions
diff --git a/databases/postgresql90-plpython/Makefile b/databases/postgresql90-plpython/Makefile index 678cc27dc5a6..b8b4ad02dd93 100644 --- a/databases/postgresql90-plpython/Makefile +++ b/databases/postgresql90-plpython/Makefile @@ -14,15 +14,13 @@ MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server 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 diff --git a/databases/postgresql91-plpython/Makefile b/databases/postgresql91-plpython/Makefile index d1473d46c5a8..f5fe4f38ee99 100644 --- a/databases/postgresql91-plpython/Makefile +++ b/databases/postgresql91-plpython/Makefile @@ -2,5 +2,4 @@ WANT_PGSQL_VER= 91 -NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plpython/Makefile" diff --git a/databases/postgresql91-server/pkg-plist-plpython b/databases/postgresql91-server/pkg-plist-plpython index 9c0d4b7b938c..1f74e5ec1da4 100644 --- a/databases/postgresql91-server/pkg-plist-plpython +++ b/databases/postgresql91-server/pkg-plist-plpython @@ -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 diff --git a/databases/postgresql92-plpython/Makefile b/databases/postgresql92-plpython/Makefile index dffba6bc5442..0fccab61ab19 100644 --- a/databases/postgresql92-plpython/Makefile +++ b/databases/postgresql92-plpython/Makefile @@ -2,5 +2,4 @@ WANT_PGSQL_VER= 92 -NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plpython/Makefile" diff --git a/databases/postgresql92-server/pkg-plist-plpython b/databases/postgresql92-server/pkg-plist-plpython index 9c0d4b7b938c..1f74e5ec1da4 100644 --- a/databases/postgresql92-server/pkg-plist-plpython +++ b/databases/postgresql92-server/pkg-plist-plpython @@ -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 diff --git a/databases/postgresql93-plpython/Makefile b/databases/postgresql93-plpython/Makefile index 9ee0aa7ebff7..7a94bc0d5070 100644 --- a/databases/postgresql93-plpython/Makefile +++ b/databases/postgresql93-plpython/Makefile @@ -2,5 +2,4 @@ WANT_PGSQL_VER= 93 -NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plpython/Makefile" diff --git a/databases/postgresql93-server/pkg-plist-plpython b/databases/postgresql93-server/pkg-plist-plpython index 9c0d4b7b938c..1f74e5ec1da4 100644 --- a/databases/postgresql93-server/pkg-plist-plpython +++ b/databases/postgresql93-server/pkg-plist-plpython @@ -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 |