Update to 1.3.1.

The template_gis implementation has a number of problems, including
only working on Debian GNU/Linux.  Upstream has removed it from the
default install, so this commit declines to put it back and removes
all the prefix/path fixes applied to it.

Add MAKE_JOBS_SAFE=no.

PostGIS 1.3.1
2007/08/13
        - Fixed documentation bugs and release number errors
          in previous cut

PostGIS 1.3.0
2007/08/09
        - Began migration of functions to the SQL-MM-centric naming convension
          using the spatial type (SP) prefix
        - Performance enhancements:
                - Created cached and indexed point-in-polygon short-circuits
                  for the functions ST_Contains, ST_Intersects, ST_Within
                  ST_Disjoint.
                - Added inline index support for relational functions
                  (except disjoint)
        - Added ST_Covers, ST_CoveredBy and ST_DWithin relational functions
        - Extended curved geometry support to geometry accessor functions and
          some geometry processing functions
        - JDBC: Added Hibernate Dialect from Norman Barker
        - Enhanced regression tests for curved geometries and kml functions

8 files changed, 11 insertions, 92 deletions

diff --git a/geography/postgresql81-postgis/Makefile b/geography/postgresql81-postgis/Makefile
index d04eea84885..53127775f9b 100644
--- a/geography/postgresql81-postgis/Makefile
+++ b/geography/postgresql81-postgis/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/06/29 23:35:32 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/08/22 12:25:32 gdt Exp $
 
 DISTNAME=		postgis-${VERSION}
-VERSION=		1.2.1
-PKGREVISION=		1
+VERSION=		1.3.1
 PKGNAME=		postgresql81-postgis-${VERSION}
 MASTER_SITES=		http://postgis.refractions.net/download/
 CATEGORIES=		databases geography
@@ -15,6 +14,9 @@ COMMENT=		Spatial database capabilities for PostgreSQL
 
 CONFLICTS=		postgis-[0-9]*
 
+# gmake complains about adding + to parent rule
+MAKE_JOBS_SAFE=		no
+
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl
 USE_LANGUAGES=		c c++
@@ -34,8 +36,6 @@ SUBST_FILES.paths=	extras/template_gis/profile \
 SUBST_VARS.paths+=	PKG_SYSCONFDIR
 SUBST_STAGE.paths=	pre-configure
 
-CONF_FILES=	share/examples/postgis/profile ${PKG_SYSCONFDIR}/postgis
-
 # Install is manual because distribution fails if docbook prereqs are not
 # satisfied, rather than using the prebuilt versions which are actually
 # in the distfile.
diff --git a/geography/postgresql81-postgis/PLIST b/geography/postgresql81-postgis/PLIST
index fe0d6298900..c394fbe43ff 100644
--- a/geography/postgresql81-postgis/PLIST
+++ b/geography/postgresql81-postgis/PLIST
@@ -1,17 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2007/06/29 23:35:32 joerg Exp $
-bin/mktemplate_gis.sh
+@comment $NetBSD: PLIST,v 1.7 2007/08/22 12:25:32 gdt Exp $
 bin/pgsql2shp
-bin/postgis_env.sh
-bin/postgres_lib.sh
-bin/rmtemplate_gis.sh
 bin/shp2pgsql
 lib/liblwgeom.so
 lib/liblwgeom.so.1
-lib/liblwgeom.so.1.2
-man/man1/createdb.postgis.1
-man/man1/mktemplate_gis.1
+lib/liblwgeom.so.1.3
 man/man1/pgsql2shp.1
-man/man1/rmtemplate_gis.1
 man/man1/shp2pgsql.1
 share/doc/html/postgis/postgis.html
 share/doc/html/postgis/style.css
@@ -19,7 +12,6 @@ share/doc/postgis/README.postgis
 share/doc/postgis/ZMSgeoms.txt
 share/doc/postgis/long_xact.xml
 share/doc/postgis/postgis.xml
-share/examples/postgis/profile
 share/postgresql/contrib/lwpostgis.sql
 share/postgresql/contrib/lwpostgis_upgrade.sql
 share/postgresql/contrib/spatial_ref_sys.sql
diff --git a/geography/postgresql81-postgis/distinfo b/geography/postgresql81-postgis/distinfo
index d272904b509..5470e755835 100644
--- a/geography/postgresql81-postgis/distinfo
+++ b/geography/postgresql81-postgis/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/06/29 23:35:33 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/08/22 12:25:32 gdt Exp $
 
-SHA1 (postgis-1.2.1.tar.gz) = 0a47bde414bf691fb624ead37cc119687aba14df
-RMD160 (postgis-1.2.1.tar.gz) = b5f8c542a143d460ebc1387a0d9e4b69335e73c3
-Size (postgis-1.2.1.tar.gz) = 2084672 bytes
+SHA1 (postgis-1.3.1.tar.gz) = db8e954dfc19e73c2331358a396e2064d1333a72
+RMD160 (postgis-1.3.1.tar.gz) = f199505dc04bd2caa0400c9235bbf1aecfe14b6f
+Size (postgis-1.3.1.tar.gz) = 2148125 bytes
 SHA1 (patch-aa) = 9660b7e2be9a039bca88f0f66e9075faf97fe41d
-SHA1 (patch-ab) = 5bd37a8c5cd71c0e90c3ccd43d6e658d840e4b3a
-SHA1 (patch-ac) = ecee68429d1d27241d1bfe96ca45053b4368fffc
-SHA1 (patch-ad) = 7ca1849a616d4ffc3dbcf9030b216b93c5d06168
-SHA1 (patch-ae) = 17d5844ed09e0299081906b949ec503f6f8f515c
-SHA1 (patch-af) = c4a63c071db31fd1c018142a24fb1e4ca9043578
diff --git a/geography/postgresql81-postgis/patches/patch-ab b/geography/postgresql81-postgis/patches/patch-ab
deleted file mode 100644
index 55131ee4724..00000000000
--- a/geography/postgresql81-postgis/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/06/29 23:35:33 joerg Exp $
-
---- extras/template_gis/Makefile.orig	2007-06-29 22:50:54.000000000 +0000
-+++ extras/template_gis/Makefile
-@@ -31,8 +31,8 @@ MAN1_TARGET=$(MAN1_TARGETDIR)/$(MAN1)
- MAN1_INSTALL=$(INSTALL_DATA) $(MAN1) $(MAN1_TARGET)
- MAN1_UNINSTALL=rm -f $(MAN1_TARGET)
- 
--DEFAULTS_DIR=$(DESTDIR)/etc/default
--SCRIPT_DEFAULTS=$(DEFAULTS_DIR)/postgis
-+DEFAULTS_DIR=$(DESTDIR)${prefix}/share/examples/postgis
-+SCRIPT_DEFAULTS=$(DEFAULTS_DIR)
- 
- all: $(SCRIPTS_IN)
- 	$(foreach SCRIPT, $(SCRIPTS), $(SCRIPT_PREPARE);)
diff --git a/geography/postgresql81-postgis/patches/patch-ac b/geography/postgresql81-postgis/patches/patch-ac
deleted file mode 100644
index c4b7da45b13..00000000000
--- a/geography/postgresql81-postgis/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/06/29 23:35:33 joerg Exp $
-
---- extras/template_gis/createdb.postgis.1.orig	2007-06-29 23:04:29.000000000 +0000
-+++ extras/template_gis/createdb.postgis.1
-@@ -43,7 +43,7 @@ is set, its value is used as the default
- .LP
- The environment variables for template_gis creation, removal and usage may be stored in files, as follows:
- .TP
--.B /etc/default/postgis
-+.B @PKG_SYSCONFDIR@/postgis
- will designate default values for the whole system.
- .TP
- .B $HOME/.postgis/profile
diff --git a/geography/postgresql81-postgis/patches/patch-ad b/geography/postgresql81-postgis/patches/patch-ad
deleted file mode 100644
index 896924cf4c3..00000000000
--- a/geography/postgresql81-postgis/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/06/29 23:35:33 joerg Exp $
-
---- extras/template_gis/mktemplate_gis.1.orig	2007-06-29 23:04:07.000000000 +0000
-+++ extras/template_gis/mktemplate_gis.1
-@@ -89,7 +89,7 @@ scripts/contrib directory for this postg
- .LP
- The environment variables for template_gis creation, removal and usage may be stored in files, as follows:
- .TP
--.B /etc/default/postgis
-+.B @PKG_SYSCONFDIR@/postgis
- will designate default values for the whole system.
- .TP
- .B $HOME/.postgis/profile
diff --git a/geography/postgresql81-postgis/patches/patch-ae b/geography/postgresql81-postgis/patches/patch-ae
deleted file mode 100644
index ab13b392c44..00000000000
--- a/geography/postgresql81-postgis/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/06/29 23:35:34 joerg Exp $
-
---- extras/template_gis/postgis_env.sh.in.orig	2007-06-29 23:03:21.000000000 +0000
-+++ extras/template_gis/postgis_env.sh.in
-@@ -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 "@PKG_SYSCONFDIR@/postgis" "$HOME/.postgis/profile" ; do
- 	if [ -f "$file" ]; then
- 		tmpval=`grep "^TEMPLATEDB=" $file | cut -d= -f2`
- 		if [ -n "$tmpval" ]; then
diff --git a/geography/postgresql81-postgis/patches/patch-af b/geography/postgresql81-postgis/patches/patch-af
deleted file mode 100644
index 4360510ce28..00000000000
--- a/geography/postgresql81-postgis/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/06/29 23:35:34 joerg Exp $
-
---- extras/template_gis/profile.orig	2007-06-29 23:03:59.000000000 +0000
-+++ extras/template_gis/profile
-@@ -1,7 +1,7 @@
- 
- #those are the default variables for postgresql-postgis.
--#this file will be scanned from /etc/default/postgis,
--#and then from $HOME/postgis/profile
-+#this file will be scanned from @PKG_SYSCONFDIR@/postgis,
-+#and then from $HOME/.postgis/profile
- 
- #values should NOT be in quotes
-