From owner-svn-ports-all@FreeBSD.ORG Mon Oct 28 18:52:24 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 53954B10; Mon, 28 Oct 2013 18:52:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3ED002545; Mon, 28 Oct 2013 18:52:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SIqOEo085716; Mon, 28 Oct 2013 18:52:24 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SIqMeJ085705; Mon, 28 Oct 2013 18:52:22 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201310281852.r9SIqMeJ085705@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 28 Oct 2013 18:52:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331888 - in head/databases: postgresql90-plpython postgresql91-plpython postgresql91-server postgresql92-plpython postgresql92-server postgresql93-plpython postgresql93-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 18:52:24 -0000 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