[pkgsrc/trunk]: pkgsrc/geography/postgresql81-postgis Use 'geos-config --libs...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfbbe2db6ca4
branches:  trunk
changeset: 518867:dfbbe2db6ca4
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Sep 20 16:24:46 2006 +0000

description:
Use 'geos-config --libs' instead of --ldflags, to match usage of the
version we have in pkgsrc.  Fixes failure of library to find geos/proj
prerequisites.  PKGREVISION++

diffstat:

 geography/postgresql81-postgis/DESCR            |   1 -
 geography/postgresql81-postgis/Makefile         |   8 ++------
 geography/postgresql81-postgis/distinfo         |   3 ++-
 geography/postgresql81-postgis/patches/patch-aa |  13 +++++++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r ab5c6e643e7d -r dfbbe2db6ca4 geography/postgresql81-postgis/DESCR
--- a/geography/postgresql81-postgis/DESCR      Wed Sep 20 16:01:48 2006 +0000
+++ b/geography/postgresql81-postgis/DESCR      Wed Sep 20 16:24:46 2006 +0000
@@ -15,4 +15,3 @@
   geometries
 * Support for OGC access functions as defined by the Simple
   Features Specification
-
diff -r ab5c6e643e7d -r dfbbe2db6ca4 geography/postgresql81-postgis/Makefile
--- a/geography/postgresql81-postgis/Makefile   Wed Sep 20 16:01:48 2006 +0000
+++ b/geography/postgresql81-postgis/Makefile   Wed Sep 20 16:24:46 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/09/14 19:16:43 gdt Exp $
+# $NetBSD: Makefile,v 1.3 2006/09/20 16:24:46 gdt Exp $
 
 DISTNAME=              postgis-${VERSION}
 VERSION=               1.1.3
 PKGNAME=               postgresql81-postgis-${VERSION}
+PKGREVISION=           1
 MASTER_SITES=          http://postgis.refractions.net/download/
 CATEGORIES=            databases geography
 
@@ -22,11 +23,6 @@
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/postgresql/contrib
 #CONFIGURE_ARGS+=      --libdir=${PREFIX}/lib/postgresql
 
-# Work around geos and proj not providing -R via foo-config/pkg-config.
-# XXX Deal with this correctly.
-LDFLAGS+=      -L${PREFIX}/lib -R${PREFIX}/lib
-CONFIGURE_ENV+=        LDFLAGS="${LDFLAGS}"
-
 DOCDIR=                ${PREFIX}/share/doc/postgis
 HTMLDIR=       ${PREFIX}/share/doc/html/postgis
 
diff -r ab5c6e643e7d -r dfbbe2db6ca4 geography/postgresql81-postgis/distinfo
--- a/geography/postgresql81-postgis/distinfo   Wed Sep 20 16:01:48 2006 +0000
+++ b/geography/postgresql81-postgis/distinfo   Wed Sep 20 16:24:46 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/14 17:02:40 gdt Exp $
+$NetBSD: distinfo,v 1.2 2006/09/20 16:24:46 gdt Exp $
 
 SHA1 (postgis-1.1.3.tar.gz) = 2c7cb03f2b47605437578afafcfbd99c7e66f5c6
 RMD160 (postgis-1.1.3.tar.gz) = 5754ee4d98e78f1f75798e345be3401a32c11113
 Size (postgis-1.1.3.tar.gz) = 1619568 bytes
+SHA1 (patch-aa) = 0b319c966ae1b47a2a7c65a8385a6b8e4df28c5e
diff -r ab5c6e643e7d -r dfbbe2db6ca4 geography/postgresql81-postgis/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/postgresql81-postgis/patches/patch-aa   Wed Sep 20 16:24:46 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/09/20 16:24:46 gdt Exp $
+
+--- configure.orig     2006-07-01 00:53:02.000000000 -0400
++++ configure
+@@ -3735,7 +3735,7 @@ fi;
+ 
+ if test $USE_GEOS -gt 0; then
+       GEOS_DIR=`$GEOSCONFIG --prefix`
+-      GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
++      GEOS_LDFLAGS=`$GEOSCONFIG --libs`
+       GEOS_MAJOR=`$GEOSCONFIG --version | cut -d. -f1`
+       if test "$GEOS_MAJOR" = "@GEOS_VERSION@"; then
+               GEOS_MAJOR=1