Date: Wed, 17 Aug 2011 17:36:16 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159843: [PATCH] databases/postgresql-plpython: unbreak Message-ID: <201108171736.p7HHaGpK084193@red.freebsd.org> Resent-Message-ID: <201108171740.p7HHe9fI010424@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159843 >Category: ports >Synopsis: [PATCH] databases/postgresql-plpython: unbreak >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 17 17:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA1 >Organization: >Environment: 9.0-BETA1 i386 >Description: Here is the that unbreaks postgresql-plpython extention with threaded python (and threadless too). Apart from postgresql-plpython it touches our postgresqlXX-server ports too to make it actually builds. So this patch should be applied against /usr/ports/databases. Please see this message for detailed descriptions and build logs: http://lists.freebsd.org/pipermail/freebsd-ports/2011-August/069274.html changes: - databases/postgresql-plpython no more marked as broken, since it builds both with threaded and threaless python on all supported FreeBSD versions with three major PostgreSQL branches - added configure patch for PostgreSQL 8.4, 9.0, 9.1 to make it able to build plpython threads-aware python - merge changed regexp to make plpython built with 9.1b3 from ports ports/159319 - fix pkg-plists for postgresql9x-server/pkg-plist-plpython (plpython2.so and extensions) - bump portrevision for postgresql-plpython >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa databases.orig/postgresql-plpython/Makefile databases/postgresql-plpython/Makefile --- databases.orig/postgresql-plpython/Makefile 2011-04-05 10:29:48.000000000 +0400 +++ databases/postgresql-plpython/Makefile 2011-08-16 18:27:13.000000000 +0400 @@ -6,15 +6,13 @@ # PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python PKGNAMESUFFIX= -plpython MAINTAINER= ports@FreeBSD.org COMMENT= A module for using Python to write SQL functions -BROKEN= Does not configure without threaded Python - RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT} MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server @@ -28,9 +26,9 @@ # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/postmaster) -PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | ${SED} -n 's/.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | ${SED} -n 's/.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1\2/p' .elif exists(${LOCALBASE}/bin/pg_config) -PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1\2/p' .else PGSQL_VER= ${DEFAULT_PGSQL_VER} .endif diff -ruNa databases.orig/postgresql84-server/files/patch-configure databases/postgresql84-server/files/patch-configure --- databases.orig/postgresql84-server/files/patch-configure 1970-01-01 03:00:00.000000000 +0300 +++ databases/postgresql84-server/files/patch-configure 2011-08-16 00:30:10.000000000 +0400 @@ -0,0 +1,11 @@ +--- configure.orig 2011-04-15 07:17:14.000000000 +0400 ++++ configure 2011-08-16 00:29:51.000000000 +0400 +@@ -6931,7 +6931,7 @@ + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + case $host_os in +- openbsd*|freebsd*) ++ openbsd*) + { { echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5 + echo "$as_me: error: threaded Python not supported on this platform" >&2;} + { (exit 1); exit 1; }; } diff -ruNa databases.orig/postgresql90-server/files/patch-configure databases/postgresql90-server/files/patch-configure --- databases.orig/postgresql90-server/files/patch-configure 1970-01-01 03:00:00.000000000 +0300 +++ databases/postgresql90-server/files/patch-configure 2011-08-16 11:10:36.000000000 +0400 @@ -0,0 +1,11 @@ +--- configure.orig 2011-04-15 07:15:53.000000000 +0400 ++++ configure 2011-08-16 11:10:22.000000000 +0400 +@@ -7051,7 +7051,7 @@ + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } + case $host_os in +- openbsd*|freebsd*) ++ openbsd*) + { { $as_echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5 + $as_echo "$as_me: error: threaded Python not supported on this platform" >&2;} + { (exit 1); exit 1; }; } diff -ruNa databases.orig/postgresql90-server/pkg-plist-plpython databases/postgresql90-server/pkg-plist-plpython --- databases.orig/postgresql90-server/pkg-plist-plpython 2006-01-22 08:52:11.000000000 +0300 +++ databases/postgresql90-server/pkg-plist-plpython 2011-08-16 11:39:10.000000000 +0400 @@ -1,4 +1,5 @@ %%DOCSDIR%%/README-plpython lib/postgresql/plpython.so +lib/postgresql/plpython2.so @dirrmtry lib/postgresql @dirrmtry %%DOCSDIR%% diff -ruNa databases.orig/postgresql91-server/files/patch-configure databases/postgresql91-server/files/patch-configure --- databases.orig/postgresql91-server/files/patch-configure 1970-01-01 03:00:00.000000000 +0300 +++ databases/postgresql91-server/files/patch-configure 2011-08-16 00:57:48.000000000 +0400 @@ -0,0 +1,11 @@ +--- configure.orig 2011-07-08 04:12:33.000000000 +0400 ++++ configure 2011-08-16 00:57:34.000000000 +0400 +@@ -7283,7 +7283,7 @@ + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } + case $host_os in +- openbsd*|freebsd*) ++ openbsd*) + { { $as_echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5 + $as_echo "$as_me: error: threaded Python not supported on this platform" >&2;} + { (exit 1); exit 1; }; } diff -ruNa databases.orig/postgresql91-server/pkg-plist-plpython databases/postgresql91-server/pkg-plist-plpython --- databases.orig/postgresql91-server/pkg-plist-plpython 2011-04-28 11:46:15.000000000 +0400 +++ databases/postgresql91-server/pkg-plist-plpython 2011-08-16 16:02:33.000000000 +0400 @@ -1,4 +1,14 @@ %%DOCSDIR%%/README-plpython -lib/postgresql/plpython.so +lib/postgresql/plpython2.so +share/postgresql/extension/plpythonu.control +share/postgresql/extension/plpythonu--1.0.sql +share/postgresql/extension/plpythonu--unpackaged--1.0.sql +share/postgresql/extension/plpython2u.control +share/postgresql/extension/plpython2u--1.0.sql +share/postgresql/extension/plpython2u--unpackaged--1.0.sql +share/postgresql/extension/plpython3u.control +share/postgresql/extension/plpython3u--1.0.sql +share/postgresql/extension/plpython3u--unpackaged--1.0.sql +@dirrmtry share/postgresql/extension @dirrmtry lib/postgresql @dirrmtry %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108171736.p7HHaGpK084193>