[97420] trunk/dports/databases/postgis

[stromnov at macports.org]

Revision: 97420
          https://trac.macports.org/changeset/97420
Author:   stromnov at macports.org
Date:     2012-09-05 08:33:28 -0700 (Wed, 05 Sep 2012)
Log Message:
-----------
postgis: update to version 1.5.5 (#35987)

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

Added Paths:
-----------
    trunk/dports/databases/postgis/files/patch-postgis-Makefile.in.diff

Removed Paths:
-------------
    trunk/dports/databases/postgis/files/patch-Makefile.config.in.diff
    trunk/dports/databases/postgis/files/patch-extras-template_gis-postgis_env.sh.in

Modified: trunk/dports/databases/postgis/Portfile
===================================================================
--- trunk/dports/databases/postgis/Portfile	2012-09-05 15:29:58 UTC (rev 97419)
+++ trunk/dports/databases/postgis/Portfile	2012-09-05 15:33:28 UTC (rev 97420)
@@ -5,8 +5,8 @@
 PortGroup           archcheck 1.0
 
 name                postgis
-version             1.5.4
-revision            1
+version             1.5.5
+revision            0
 categories          databases
 platforms           darwin
 maintainers         stromnov openmaintainer
@@ -25,8 +25,8 @@
 homepage            http://postgis.refractions.net/
 master_sites        ${homepage}download/
 
-checksums           rmd160  cfda2a6472c283aa151e3c0bceb47287059d168b \
-                    sha256  241e366d08030471643b15bd504160eb22cedc2f89374ff8fae438e526c16dc0
+checksums           rmd160  676588b59215e457930b2c9cfefec249b75cd090 \
+                    sha256  6f7fbb417cfce8cd120d098219ba5f9a19ccdcec0beb0163320b163b23231cf3
 
 depends_build \
     port:docbook-xsl \
@@ -47,6 +47,8 @@
 
 use_parallel_build  no
 
+patchfiles          patch-postgis-Makefile.in.diff
+
 configure.args \
     --datadir=${prefix}/share/${name} \
     --with-projdir=${prefix} \
@@ -56,8 +58,11 @@
     -Diconv=libiconv -Diconv_open=libiconv_open -Diconv_close=libiconv_close
 
 build.target-append comments
-build.args          ICONV_LDFLAGS='-L${prefix}/lib -liconv'
+build.args-append   ICONV_LDFLAGS='-L${prefix}/lib -liconv'
 
+# Workaround for https://trac.osgeo.org/postgis/ticket/1694 (actually the same internal result as in postgis2 port)
+build.args-append   CPP="cpp"
+
 destroot.target-append docs-install comments-install
 
 set pgsql_suffixes {82 83 84 90 91}

Deleted: trunk/dports/databases/postgis/files/patch-Makefile.config.in.diff
===================================================================
--- trunk/dports/databases/postgis/files/patch-Makefile.config.in.diff	2012-09-05 15:29:58 UTC (rev 97419)
+++ trunk/dports/databases/postgis/files/patch-Makefile.config.in.diff	2012-09-05 15:33:28 UTC (rev 97420)
@@ -1,10 +0,0 @@
---- Makefile.config.in.orig	2008-03-29 06:25:16.000000000 +1100
-+++ Makefile.config.in	2009-03-06 05:37:41.000000000 +1100
-@@ -98,6 +98,7 @@
- CC=@CC@
- CXX=@CXX@
- ELF_SYSTEM=@ELF_SYS@
-+CFLAGS=@CPPFLAGS@ @CFLAGS@
- 
- #
- # Other programs

Deleted: trunk/dports/databases/postgis/files/patch-extras-template_gis-postgis_env.sh.in
===================================================================
--- trunk/dports/databases/postgis/files/patch-extras-template_gis-postgis_env.sh.in	2012-09-05 15:29:58 UTC (rev 97419)
+++ trunk/dports/databases/postgis/files/patch-extras-template_gis-postgis_env.sh.in	2012-09-05 15:33:28 UTC (rev 97420)
@@ -1,11 +0,0 @@
---- extras/template_gis/postgis_env.sh.in	2006-05-31 08:43:12.000000000 +0200
-+++ extras/template_gis/postgis_env.sh.in	2007-02-22 00:19:47.000000000 +0100
-@@ -3,7 +3,7 @@
- # environment variables for postgis
- 
- #read optional configuration files. last prevails
--for file in "/etc/default/postgis" "$HOME/.postgis/profile" ; do
-+for file in "@prefix@/etc/postgis.default" "$HOME/.postgis/profile" ; do
- 	if [ -f "$file" ]; then
- 		tmpval=`grep "^TEMPLATEDB=" $file | cut -d= -f2`
- 		if [ -n "$tmpval" ]; then

Added: trunk/dports/databases/postgis/files/patch-postgis-Makefile.in.diff
===================================================================
--- trunk/dports/databases/postgis/files/patch-postgis-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/databases/postgis/files/patch-postgis-Makefile.in.diff	2012-09-05 15:33:28 UTC (rev 97420)
@@ -0,0 +1,11 @@
+--- postgis/Makefile.in.orig	2012-09-05 19:20:48.000000000 +0400
++++ postgis/Makefile.in	2012-09-05 19:21:13.000000000 +0400
+@@ -69,7 +69,7 @@
+ # to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
+ # older version of PostGIS, rather than with the static liblwgeom.a 
+ # supplied with newer versions of PostGIS
+-PG_CPPFLAGS+=@CPPFLAGS@ -I../liblwgeom
++PG_CPPFLAGS+=-I../liblwgeom @CPPFLAGS@
+ SHLIB_LINK+=@SHLIB_LINK@ ../liblwgeom/liblwgeom.a
+ 
+ # Extra files to remove during 'make clean'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120905/74bda11d/attachment.html>