diff options
| author | gdt <gdt@pkgsrc.org> | 2006-09-20 16:24:46 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2006-09-20 16:24:46 +0000 |
| commit | d8dbb92254acfc14d7e3bcc1234057c345b8e6d0 (patch) | |
| tree | 9cf8c21033bd6a2b5dfa796eb7857bb434b88b09 /geography | |
| parent | 9b356774ed79f07a16b4726df0f303c3cb86d0b5 (diff) | |
| download | pkgsrc-d8dbb92254acfc14d7e3bcc1234057c345b8e6d0.tar.gz | |
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 (limited to 'geography')
| -rw-r--r-- | geography/postgresql81-postgis/DESCR | 1 | ||||
| -rw-r--r-- | geography/postgresql81-postgis/Makefile | 8 | ||||
| -rw-r--r-- | geography/postgresql81-postgis/distinfo | 3 | ||||
| -rw-r--r-- | geography/postgresql81-postgis/patches/patch-aa | 13 |
4 files changed, 17 insertions, 8 deletions
diff --git a/geography/postgresql81-postgis/DESCR b/geography/postgresql81-postgis/DESCR index e4ea7b92ee3..8172a0f8b94 100644 --- a/geography/postgresql81-postgis/DESCR +++ b/geography/postgresql81-postgis/DESCR @@ -15,4 +15,3 @@ the following functionality: geometries * Support for OGC access functions as defined by the Simple Features Specification - diff --git a/geography/postgresql81-postgis/Makefile b/geography/postgresql81-postgis/Makefile index a090827fe76..f17304d720d 100644 --- a/geography/postgresql81-postgis/Makefile +++ b/geography/postgresql81-postgis/Makefile @@ -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+= --enable-rpath 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 --git a/geography/postgresql81-postgis/distinfo b/geography/postgresql81-postgis/distinfo index d67a343b583..ef77a1b6f04 100644 --- a/geography/postgresql81-postgis/distinfo +++ b/geography/postgresql81-postgis/distinfo @@ -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 --git a/geography/postgresql81-postgis/patches/patch-aa b/geography/postgresql81-postgis/patches/patch-aa new file mode 100644 index 00000000000..540e2d1ddf0 --- /dev/null +++ b/geography/postgresql81-postgis/patches/patch-aa @@ -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 |