[86485] trunk/dports/databases
jmr at macports.org
jmr at macports.org
Wed Oct 26 11:41:46 PDT 2011
Revision: 86485
http://trac.macports.org/changeset/86485
Author: jmr at macports.org
Date: 2011-10-26 11:41:40 -0700 (Wed, 26 Oct 2011)
Log Message:
-----------
postgresql*: fix linking of plpython (#27687)
Modified Paths:
--------------
trunk/dports/databases/postgresql80/Portfile
trunk/dports/databases/postgresql81/Portfile
trunk/dports/databases/postgresql82/Portfile
trunk/dports/databases/postgresql83/Portfile
trunk/dports/databases/postgresql84/Portfile
trunk/dports/databases/postgresql90/Portfile
trunk/dports/databases/postgresql91/Portfile
Added Paths:
-----------
trunk/dports/databases/postgresql80/files/
trunk/dports/databases/postgresql80/files/src_pl_plpython_Makefile.patch
trunk/dports/databases/postgresql81/files/
trunk/dports/databases/postgresql81/files/src_pl_plpython_Makefile.patch
trunk/dports/databases/postgresql82/files/src_pl_plpython_Makefile.patch
trunk/dports/databases/postgresql83/files/
trunk/dports/databases/postgresql83/files/src_pl_plpython_Makefile.patch
trunk/dports/databases/postgresql84/files/src_pl_plpython_Makefile.patch
trunk/dports/databases/postgresql90/files/src_pl_plpython_Makefile.patch
trunk/dports/databases/postgresql91/files/src_pl_plpython_Makefile.patch
Modified: trunk/dports/databases/postgresql80/Portfile
===================================================================
--- trunk/dports/databases/postgresql80/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql80/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -30,6 +30,8 @@
depends_lib port:readline port:openssl port:zlib
depends_build port:bison
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -81,7 +83,7 @@
variant python description {add support for python} {
depends_lib-append port:python26
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.6
+ configure.python ${prefix}/bin/python2.6
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql80/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql80/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql80/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2010-10-01 23:39:44.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-27 04:18:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec := -framework Python
+-override python_additional_libs :=
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
Modified: trunk/dports/databases/postgresql81/Portfile
===================================================================
--- trunk/dports/databases/postgresql81/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql81/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -30,6 +30,8 @@
depends_lib port:readline port:openssl port:zlib port:libxml2 port:libxslt
depends_build port:bison
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -79,7 +81,7 @@
variant python description {add support for python} {
depends_lib-append port:python26
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.6
+ configure.python ${prefix}/bin/python2.6
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql81/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql81/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql81/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2010-10-01 23:39:44.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-27 04:18:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec := -framework Python
+-override python_additional_libs :=
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
Modified: trunk/dports/databases/postgresql82/Portfile
===================================================================
--- trunk/dports/databases/postgresql82/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql82/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -30,6 +30,8 @@
depends_lib port:readline port:openssl port:zlib port:libxml2 port:libxslt
depends_build port:bison
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -95,7 +97,7 @@
variant python description {add support for python} {
depends_lib-append port:python26
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.6
+ configure.python ${prefix}/bin/python2.6
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql82/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql82/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql82/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2010-10-01 23:39:44.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-27 04:18:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec := -framework Python
+-override python_additional_libs :=
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
Modified: trunk/dports/databases/postgresql83/Portfile
===================================================================
--- trunk/dports/databases/postgresql83/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql83/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -32,6 +32,8 @@
worksrcdir postgresql-${version}
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -85,7 +87,7 @@
variant python description {add support for python} {
depends_lib-append port:python26
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.6
+ configure.python ${prefix}/bin/python2.6
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql83/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql83/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql83/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2011-09-23 08:03:52.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-26 21:43:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec = -framework Python
+-override python_additional_libs =
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
Modified: trunk/dports/databases/postgresql84/Portfile
===================================================================
--- trunk/dports/databases/postgresql84/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql84/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -33,6 +33,8 @@
worksrcdir postgresql-${version}
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -100,7 +102,7 @@
variant python description {add support for python} {
depends_lib-append port:python26
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.6
+ configure.python ${prefix}/bin/python2.6
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql84/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql84/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql84/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2011-09-23 08:03:52.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-26 21:43:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec = -framework Python
+-override python_additional_libs =
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
Modified: trunk/dports/databases/postgresql90/Portfile
===================================================================
--- trunk/dports/databases/postgresql90/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql90/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -35,6 +35,8 @@
worksrcdir postgresql-${version}
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -102,7 +104,7 @@
variant python description {add support for python} {
depends_lib-append port:python27
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.7
+ configure.python ${prefix}/bin/python2.7
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql90/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql90/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql90/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2011-09-23 08:03:52.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-26 21:43:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec = -framework Python
+-override python_additional_libs =
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
Modified: trunk/dports/databases/postgresql91/Portfile
===================================================================
--- trunk/dports/databases/postgresql91/Portfile 2011-10-26 18:34:38 UTC (rev 86484)
+++ trunk/dports/databases/postgresql91/Portfile 2011-10-26 18:41:40 UTC (rev 86485)
@@ -32,6 +32,8 @@
worksrcdir postgresql-${version}
+patchfiles src_pl_plpython_Makefile.patch
+
set libdir ${prefix}/lib/${name}
configure.args --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
@@ -98,7 +100,7 @@
variant python description {add support for python} {
depends_lib-append port:python27
configure.args-append --with-python
- configure.env-append PYTHON=${prefix}/bin/python2.7
+ configure.python ${prefix}/bin/python2.7
}
variant krb5 description {add support for Kerberos 5 authentication} {
Added: trunk/dports/databases/postgresql91/files/src_pl_plpython_Makefile.patch
===================================================================
--- trunk/dports/databases/postgresql91/files/src_pl_plpython_Makefile.patch (rev 0)
+++ trunk/dports/databases/postgresql91/files/src_pl_plpython_Makefile.patch 2011-10-26 18:41:40 UTC (rev 86485)
@@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig 2011-09-23 08:03:52.000000000 +1000
++++ src/pl/plpython/Makefile 2011-10-26 21:43:40.000000000 +1100
+@@ -24,8 +24,6 @@
+ # Darwin (OS X) has its own ideas about how to do this.
+ ifeq ($(PORTNAME), darwin)
+ shared_libpython = yes
+-override python_libspec = -framework Python
+-override python_additional_libs =
+ endif
+
+ # If we don't have a shared library and the platform doesn't allow it
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111026/493f58dc/attachment.html>
More information about the macports-changes
mailing list