[91294] trunk/dports/databases/libpqxx

ryandesign at macports.org ryandesign at macports.org
Wed Mar 28 07:24:05 PDT 2012


Revision: 91294
          https://trac.macports.org/changeset/91294
Author:   ryandesign at macports.org
Date:     2012-03-28 07:24:05 -0700 (Wed, 28 Mar 2012)
Log Message:
-----------
libpqxx: update to 4.0 and add variants for postgresql83 thru postgresql91; see #33671 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/databases/libpqxx/Portfile

Added Paths:
-----------
    trunk/dports/databases/libpqxx/files/
    trunk/dports/databases/libpqxx/files/patch-configure.diff
    trunk/dports/databases/libpqxx/files/patch-tools-maketemporary.diff
    trunk/dports/databases/libpqxx/files/patch-tools-splitconfig.diff

Modified: trunk/dports/databases/libpqxx/Portfile
===================================================================
--- trunk/dports/databases/libpqxx/Portfile	2012-03-28 14:17:35 UTC (rev 91293)
+++ trunk/dports/databases/libpqxx/Portfile	2012-03-28 14:24:05 UTC (rev 91294)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name        libpqxx
-version     3.0.2
+version     4.0
 
 categories  databases devel
 
@@ -29,27 +29,42 @@
 
 homepage        http://pqxx.org/development/libpqxx/
 master_sites    http://pqxx.org/download/software/libpqxx/
-#http://pqxx.org/download/software/libpqxx/libpqxx-3.0.1.tar.gz
 
-distname        libpqxx-${version}
+checksums       rmd160  517683e7f936126a9d133056740802518f62d18a \
+                sha256  b160043289cfbf2a186d3b12f9976b6914e76d918d3d4469ff408bd199bbb8ed
 
-checksums           md5     3baa257e851b773fa1d693bbe185a418 \
-                    sha1    6af866e06668e9c8b7af4161dddb1ab5f4bf094c \
-                    rmd160  0162ea135d56c203f45f9d5d328a29d2db72b102
-
-variant pq83 description {use postgresql83} {
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91]} {
+    default_variants +postgresql91
 }
 
-if {[variant_isset pq83]} {
-    set server      postgresql83
-} else {
-    set server      postgresql84
+variant pq83 requires postgresql83 description {Legacy compatibility variant} {}
+
+variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 description {Use postgresql83} {}
+variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 description {Use postgresql84} {}
+variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 description {Use postgresql90} {}
+variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 description {Use postgresql91} {}
+
+if {[variant_isset postgresql83]} {
+    set server postgresql83
+} elseif {[variant_isset postgresql84]} {
+    set server postgresql84
+} elseif {[variant_isset postgresql90]} {
+    set server postgresql90
+} elseif {[variant_isset postgresql91]} {
+    set server postgresql91
 }
 
 platforms       darwin
 depends_build   path:bin/pkg-config:pkgconfig
 depends_lib     port:${server}
 
+patchfiles      patch-tools-maketemporary.diff \
+                patch-tools-splitconfig.diff
+
+platform darwin {
+    patchfiles-append patch-configure.diff
+}
+
 configure.env-append \
     PG_CONFIG=${prefix}/lib/${server}/bin/pg_config
 

Added: trunk/dports/databases/libpqxx/files/patch-configure.diff
===================================================================
--- trunk/dports/databases/libpqxx/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/databases/libpqxx/files/patch-configure.diff	2012-03-28 14:24:05 UTC (rev 91294)
@@ -0,0 +1,38 @@
+--- configure.orig	2011-11-27 05:12:25.000000000 -0600
++++ configure	2012-03-18 01:09:08.000000000 -0500
+@@ -15204,7 +15204,7 @@
+ fi
+ 
+ 
+- if /bin/true; then
++ if /usr/bin/true; then
+   BUILD_REFERENCE_TRUE=
+   BUILD_REFERENCE_FALSE='#'
+ else
+@@ -15290,7 +15290,7 @@
+ fi
+ 
+ 
+- if /bin/true; then
++ if /usr/bin/true; then
+   BUILD_TUTORIAL_TRUE=
+   BUILD_TUTORIAL_FALSE='#'
+ else
+@@ -15299,7 +15299,7 @@
+ fi
+ 
+ else
+- if /bin/false; then
++ if /usr/bin/false; then
+   BUILD_REFERENCE_TRUE=
+   BUILD_REFERENCE_FALSE='#'
+ else
+@@ -15307,7 +15307,7 @@
+   BUILD_REFERENCE_FALSE=
+ fi
+ 
+- if /bin/false; then
++ if /usr/bin/false; then
+   BUILD_TUTORIAL_TRUE=
+   BUILD_TUTORIAL_FALSE='#'
+ else

Added: trunk/dports/databases/libpqxx/files/patch-tools-maketemporary.diff
===================================================================
--- trunk/dports/databases/libpqxx/files/patch-tools-maketemporary.diff	                        (rev 0)
+++ trunk/dports/databases/libpqxx/files/patch-tools-maketemporary.diff	2012-03-28 14:24:05 UTC (rev 91294)
@@ -0,0 +1,11 @@
+--- tools/maketemporary.orig	2009-07-04 00:38:30.000000000 -0500
++++ tools/maketemporary	2012-03-18 01:13:26.000000000 -0500
+@@ -5,7 +5,7 @@
+ TMPDIR="${TMPDIR:-/tmp}"
+ export TMPDIR
+ 
+-T="`mktemp`"
++T="`mktemp 2>/dev/null`"
+ if test -z "$T" ; then
+ 	T="`mktemp -t pqxx.XXXXXX`"
+ fi

Added: trunk/dports/databases/libpqxx/files/patch-tools-splitconfig.diff
===================================================================
--- trunk/dports/databases/libpqxx/files/patch-tools-splitconfig.diff	                        (rev 0)
+++ trunk/dports/databases/libpqxx/files/patch-tools-splitconfig.diff	2012-03-28 14:24:05 UTC (rev 91294)
@@ -0,0 +1,20 @@
+--- tools/splitconfig.orig	2009-07-04 00:38:30.000000000 -0500
++++ tools/splitconfig	2012-03-18 01:06:12.000000000 -0500
+@@ -105,7 +105,7 @@
+ 	esac
+ }
+ 
+-echo -n "Checking for usable grep -F or equivalent... "
++printf "Checking for usable grep -F or equivalent... "
+ SAMPLEPAT="foo
+ bar
+ splat"
+@@ -139,7 +139,7 @@
+ for publication in $PUBLICATIONS ; do
+ 	for factor in $FACTORS ; do
+ 		CFGFILE="include/pqxx/config-${publication}-${factor}.h"
+-		echo -n "Generating $CFGFILE: "
++		printf "Generating $CFGFILE: "
+ 		ITEMS="`grep -w "${publication}" "$CFDB" | grep -w "${factor}" | cut -f 1 | grep -v '^$'`"
+ 		if test -z "$ITEMS" ; then
+ 			echo "no items--skipping"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120328/4ab70cf8/attachment.html>


More information about the macports-changes mailing list