Bug 137537

Upgrade to 1.4.0

This is a significant release including many performance enhancements, bug fixes, improved internal testing system, more detailed documentation.

Some features:

    * API Stability - new policies surrounding minor releases
    * Support for PostgreSQL 8.4
    * New methods - ST_GeoHash, ST_LineCrossingDirection, ST_AsGeoJSON, ST_MinimumBoundingCircle to name a few
    * Significant performance improvements for many spatial operations, including ST_Union, ST_Intersects, ST_Contains, and ST_Within
    * Vastly improved documentation and reference manual
    * Improved build system, library structure, debugging framework, unit testing
    * More stable support for CIRCULARSTRING, COMPOUNDCURVE and CURVEPOLYGON

More details: http://www.postgis.org/news/20090724/

Fix: 

---
Aviso de confidencialidade:

Esta mensagem da Empresa Brasileira de Pesquisa Agropecuária (Embrapa), 
empresa pública federal regida pelo disposto na Lei Federal nº 5.851, 
de 7 de dezembro de 1972, é enviada exclusivamente a seu destinatário 
e pode conter informações confidenciais, protegidas por sigilo profissional. 
Sua utilização desautorizada é ilegal e sujeita o infrator às penas da lei. 
Se você a recebeu indevidamente, queira, por gentileza, reenviá-la ao emitente, 
esclarecendo o equívoco.

Confidentiality note:

This message from Empresa Brasileira de Pesquisa Agropecuária (Embrapa), 
a government company established under Brazilian law (5.851/72), 
is directed exclusively to its addressee and may contain confidential data, 
protected under professional secrecy rules. Its unauthorized use is illegal 
and may subject the transgressor to the law's penalties. 
If you are not the addressee, please send it back, elucidating the failure.--TXA7OGaKlu0yCGc3VB70JATW6LzHE8won0ANkO34A5ga40tZ
Content-Type: text/plain; name="postgis.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="postgis.patch"

diff -Nru postgis.old/Makefile postgis/Makefile
--- postgis.old/Makefile	2009-05-18 13:11:10.000000000 -0300
+++ postgis/Makefile	2009-08-07 15:56:44.000000000 -0300
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	postgis
-DISTVERSION=	1.3.6
+DISTVERSION=	1.4.0
 CATEGORIES=	databases geography
-MASTER_SITES=	http://postgis.refractions.net/download/
+MASTER_SITES=	http://postgis.refractions.net/download/ \
+		http://www.postgis.org/download/
 
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	Adds support for geographic objects to PostgreSQL databases
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/geos-config:${PORTSDIR}/graphics/geos
 LIB_DEPENDS=	proj.5:${PORTSDIR}/graphics/proj
 RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 
@@ -24,52 +26,44 @@
 
 INSTALL_TARGET=	install
 
-OPTIONS=	GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \
-		UTF8 "UTF-8 support for shp2pgsql. (needs libiconv)" off
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/postgis \
-		--bindir=${PREFIX}/bin \
-		--libdir=${PREFIX}/lib \
-		--with-proj
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_ENV=	DATADIR=${DATADIR} DOCSDIR=${DOCSDIR}
+CONFIGURE_ARGS=	--with-projdir=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
-MAKE_ARGS+=	WITH-DOC=yes
+CONFIGURE_ARGS+=	--with-xsldir=/usr/local/share/xsl/docbook
 MAN1=		pgsql2shp.1 shp2pgsql.1
 PORTDOCS=	*
 .else
 MAKE_ARGS+=	NOPORTSDOC=yes
 .endif
 
-.if defined(WITH_UTF8)
-USE_ICONV=	yes
-MAKE_ENV+=	"LDFLAGS=-L${LOCALBASE}/lib"
-.else
-CONFIGURE_ARGS+=	--without-iconv
-.endif
-
-.if defined(WITH_GEOS)
-LIB_DEPENDS+=	geos:${PORTSDIR}/graphics/geos
-CONFIGURE_ARGS+=	--with-geos=${LOCALBASE}/bin/geos-config
-.else
-CONFIGURE_ARGS+=	--without-geos
-.endif
-
-pre-everything::
-	@${SH} ${PKGINSTALL} ${PORTNAME} MESSAGE
+post-extract:
+	@${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \
+		${WRKSRC}/loader/Makefile.in
+
+post-patch:
+	@${REINPLACE_CMD} -e 's#%PERL%#${PERL}#g' \
+		${WRKSRC}/postgis/Makefile.in
 
 post-install:
+	@${MKDIR} -p ${DATADIR}/utils
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/create_undef.pl ${DATADIR}/utils/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/new_postgis_restore.pl ${DATADIR}/utils/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/profile_intersects.pl ${DATADIR}/utils/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_proc_upgrade.pl ${DATADIR}/utils/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/test_estimation.pl ${DATADIR}/utils/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_restore.pl ${DATADIR}/utils/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/test_joinestimation.pl ${DATADIR}/utils/
 	@${MKDIR} ${PREFIX}/lib/postgresql
-	@${LN} -s ${PREFIX}/lib/liblwgeom.so.1 ${PREFIX}/lib/postgresql
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
-
-post-deinstall:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
+	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/postgis.so
+	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so.1
+	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so
 
 .include <bsd.port.post.mk>
diff -Nru postgis.old/distinfo postgis/distinfo
--- postgis.old/distinfo	2009-05-18 13:11:10.000000000 -0300
+++ postgis/distinfo	2009-08-07 10:40:11.000000000 -0300
@@ -1,4 +1,3 @@
-SIZE (postgis-1.3.6.tar.gz) = 2227317 
-MD5 (postgis-1.3.6.tar.gz) = da590f0e485335e9cdaeb66c3d68aa24
-SHA256 (postgis-1.3.6.tar.gz) = d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144
-
+MD5 (postgis-1.4.0.tar.gz) = bc5b97d5399bd20ca90bfdf784ab6c33
+SHA256 (postgis-1.4.0.tar.gz) = 71c5ffde54a2ecbb88fbffa12ca18c617ecfe2404fb9049940cd1b7a06a7e38d
+SIZE (postgis-1.4.0.tar.gz) = 3143966
diff -Nru postgis.old/files/patch-GNUmakefile postgis/files/patch-GNUmakefile
--- postgis.old/files/patch-GNUmakefile	2007-08-31 07:32:16.000000000 -0300
+++ postgis/files/patch-GNUmakefile	2009-08-07 14:38:13.000000000 -0300
@@ -1,48 +1,36 @@
---- GNUmakefile.orig	2007-07-11 05:12:42.000000000 +0800
-+++ GNUmakefile	2007-08-31 17:41:49.000000000 +0800
-@@ -4,9 +4,9 @@
+--- GNUmakefile.orig	2009-05-26 15:00:55.000000000 -0300
++++ GNUmakefile	2009-08-07 14:36:10.000000000 -0300
+@@ -4,10 +4,10 @@
  #
  #-----------------------------------------------------
  
--all: Makefile.config liblwgeom loaderdumper utils 
-+all: Makefile.config liblwgeom loaderdumper utils docs
+-all: postgis loaderdumper utils
++all: postgis loaderdumper utils docs
+ 	@echo "PostGIS was built successfully. Ready to install." 
  
--install: all liblwgeom-install loaderdumper-install 
-+install: all liblwgeom-install loaderdumper-install utils-install docs-install
+-install: all postgis-install loaderdumper-install
++install: all postgis-install loaderdumper-install docs-install
  
- uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall 
+ uninstall: postgis-uninstall loaderdumper-uninstall docs-uninstall comments-uninstall
  
-@@ -72,21 +72,31 @@
+@@ -80,7 +80,9 @@
  	$(MAKE) -C extras/template_gis uninstall
  
- docs: Makefile.config
+ docs: 
 -	$(MAKE) -C doc 
-+ifndef NOPORTSDOC
-+	$(MAKE) -C doc
++ifndef NOPORTDOCS
++	$(MAKE) -C doc html/postgis.html
 +endif
  
- docs-clean: Makefile.config
-+ifndef NOPORTSDOC
+ docs-clean:
  	$(MAKE) -C doc clean
--
-+endif
+@@ -95,7 +97,9 @@
+ 	$(MAKE) -C doc comments-uninstall
  
  docs-install:
-+ifndef NOPORTSDOC
++ifndef NOPORTDOCS
  	$(MAKE) -C doc install
 +endif
  
  docs-uninstall:
-+ifndef NOPORTSDOC
  	$(MAKE) -C doc uninstall
-+endif
- 
- utils:
- 	$(MAKE) -C utils
- 
-+utils-install:
-+	${MAKE} -C utils install
-+
- configure: configure.in
- 	./autogen.sh
- 
diff -Nru postgis.old/files/patch-configure postgis/files/patch-configure
--- postgis.old/files/patch-configure	2009-05-18 13:11:10.000000000 -0300
+++ postgis/files/patch-configure	1969-12-31 21:00:00.000000000 -0300
@@ -1,10 +0,0 @@
---- configure	2009-05-04 15:03:04.000000000 -0300
-+++ configure	2009-05-18 08:36:54.000000000 -0300
-@@ -4806,6 +4806,7 @@
- 		/opt/local/share/xsl/docbook-xsl
- 		/usr/local/share/xsl/docbook-xsl
- 		/usr/share/xsl/docbook-xsl
-+		/usr/local/share/xsl/docbook
- 		"
- 	for p in ${SEARCHPATH}; do
- 		if test -r "${p}"/html/docbook.xsl; then
diff -Nru postgis.old/files/patch-doc-Makefile.in postgis/files/patch-doc-Makefile.in
--- postgis.old/files/patch-doc-Makefile.in	1969-12-31 21:00:00.000000000 -0300
+++ postgis/files/patch-doc-Makefile.in	2009-08-07 13:57:09.000000000 -0300
@@ -0,0 +1,21 @@
+--- doc/Makefile.in.orig	2009-08-07 13:20:39.000000000 -0300
++++ doc/Makefile.in	2009-08-07 13:22:04.000000000 -0300
+@@ -135,12 +135,12 @@
+ 	rm -f $(PGSQL_SHAREDIR)/contrib/postgis_comments.sql
+ 
+ install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1
+-	@mkdir -p $(PGSQL_DOCDIR)/postgis
+-	@mkdir -p $(PGSQL_MANDIR)/man1
+-	cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html
+-	cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis
+-	cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1
+-	cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1
++	@mkdir -p $(DOCSDIR)
++	@mkdir -p $(MANDIR)/man1
++	cp html/postgis.html $(DOCSDIR)/postgis.html
++	cp ../README.postgis $(DOCSDIR)/README.postgis
++	cp man/pgsql2shp.1 $(PREFIX)/man/man1/pgsql2shp.1
++	cp man/shp2pgsql.1 $(PREFIX)/man/man1/shp2pgsql.1
+ 
+ uninstall:
+ 	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html
diff -Nru postgis.old/files/patch-loader postgis/files/patch-loader
--- postgis.old/files/patch-loader	2005-12-28 19:10:57.000000000 -0200
+++ postgis/files/patch-loader	1969-12-31 21:00:00.000000000 -0300
@@ -1,22 +0,0 @@
---- loader/Makefile	Fri Dec 16 14:47:24 2005
-+++ loader/Makefile	Wed Dec 28 14:23:13 2005
-@@ -9,7 +9,7 @@
- #---------------------------------------------------------------
- 
- ifeq ($(USE_ICONV),1)
--	override CFLAGS += -DUSE_ICONV
-+	override CFLAGS += -DUSE_ICONV -I/usr/local/include
- 	override LDFLAGS += $(ICONV_LDFLAGS)
- endif
- 
---- loader/shp2pgsql.c	Tue Nov  1 07:25:47 2005
-+++ loader/shp2pgsql.c	Wed Dec 28 14:23:13 2005
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include "getopt.h"
--#ifdef HAVE_ICONV_H
-+#ifdef USE_ICONV
- #include <iconv.h>
- #endif
- 
diff -Nru postgis.old/files/patch-loader-Makefile.in postgis/files/patch-loader-Makefile.in
--- postgis.old/files/patch-loader-Makefile.in	1969-12-31 21:00:00.000000000 -0300
+++ postgis/files/patch-loader-Makefile.in	2009-08-07 11:59:30.000000000 -0300
@@ -0,0 +1,13 @@
+--- loader/Makefile.in.orig	2009-08-07 11:13:19.000000000 -0300
++++ loader/Makefile.in	2009-08-07 11:14:01.000000000 -0300
+@@ -13,6 +13,10 @@
+ CC=@CC@
+ CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@
+ 
++override datadir := $(DATADIR)
++override bindir := $(PREFIX)/bin
++override pkglibdir := $(PREFIX)/lib/postgresql
++
+ # Filenames with extension as determined by the OS
+ PGSQL2SHP=pgsql2shp@EXESUFFIX@
+ SHP2PGSQL=shp2pgsql@EXESUFFIX@
diff -Nru postgis.old/files/patch-lwgeom postgis/files/patch-lwgeom
--- postgis.old/files/patch-lwgeom	2008-04-27 02:41:08.000000000 -0300
+++ postgis/files/patch-lwgeom	1969-12-31 21:00:00.000000000 -0300
@@ -1,11 +0,0 @@
---- lwgeom/Makefile	2008-03-28 18:28:21.000000000 -0300
-+++ lwgeom/Makefile	2008-04-16 11:41:22.000000000 -0300
-@@ -122,7 +122,7 @@
- 	$(PERL) ../utils/postgis_proc_upgrade.pl ../lwpostgis.sql > ../lwpostgis_upgrade.sql
- 
- ../lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h 
--	cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@
-+	cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's:@MODULE_FILENAME@:$$libdir/liblwgeom.so.1:g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@
- 
- ../regress/lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h
- 	cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's#@MODULE_FILENAME@#$(MODULE_FILENAME)#g;s#@POSTGIS_VERSION@#$(POSTGIS_VERSION)#g;s#@POSTGIS_SCRIPTS_VERSION@#$(SCRIPTS_VERSION)#g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@
diff -Nru postgis.old/files/patch-postgis-Makefile.in postgis/files/patch-postgis-Makefile.in
--- postgis.old/files/patch-postgis-Makefile.in	1969-12-31 21:00:00.000000000 -0300
+++ postgis/files/patch-postgis-Makefile.in	2009-08-07 15:19:29.000000000 -0300
@@ -0,0 +1,22 @@
+--- postgis/Makefile.in.orig	2009-06-06 11:09:39.000000000 -0300
++++ postgis/Makefile.in	2009-08-07 15:18:27.000000000 -0300
+@@ -12,6 +12,10 @@
+ 
+ MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
+ 
++override datadir := $(DATADIR)
++override bindir := $(PREFIX)/bin
++override pkglibdir := $(PREFIX)/lib/postgresql
++
+ # Files to be copied to the contrib/ directory
+ DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade.sql
+ DATA=../spatial_ref_sys.sql
+@@ -73,7 +77,7 @@
+ 
+ # Borrow the $libdir substitution from PGXS but customise by adding the version number
+ %.sql: %.sql.in
+-	sed 's,MODULE_PATHNAME,$$libdir/$*-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
++	sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
+ 
+ postgis_upgrade.sql: postgis.sql
+ 	$(PERL) ../utils/postgis_proc_upgrade.pl $< > $@
diff -Nru postgis.old/files/patch-utils postgis/files/patch-utils
--- postgis.old/files/patch-utils	2005-12-28 19:10:57.000000000 -0200
+++ postgis/files/patch-utils	1969-12-31 21:00:00.000000000 -0300
@@ -1,22 +0,0 @@
---- utils/Makefile	Mon Jun  6 13:49:41 2005
-+++ utils/Makefile	Wed Dec 28 15:33:31 2005
-@@ -1,3 +1,6 @@
-+include ../Makefile.config
-+include ../Version.config
-+
- SCRIPTS = \
- 	postgis_restore.pl \
- 	create_undef.pl \
-@@ -8,3 +11,12 @@
- 
- all:
- 	chmod +x $(SCRIPTS)
-+
-+install:
-+	@mkdir -p $(DESTDIR)$(datadir)/utils
-+	$(INSTALL_DATA) README $(DESTDIR)$(datadir)/utils/README
-+	$(INSTALL_DATA) create_undef.pl $(DESTDIR)$(datadir)/utils/create_undef.pl
-+	$(INSTALL_DATA) postgis_restore.pl $(DESTDIR)$(datadir)/utils/postgis_restore.pl
-+	$(INSTALL_DATA) profile_intersects.pl $(DESTDIR)$(datadir)/utils/profile_intersects.pl
-+	$(INSTALL_DATA) test_estimation.pl $(DESTDIR)$(datadir)/utils/test_estimation.pl
-+	$(INSTALL_DATA) test_joinestimation.pl $(DESTDIR)$(datadir)/utils/test_joinestimation.pl
diff -Nru postgis.old/pkg-plist postgis/pkg-plist
--- postgis.old/pkg-plist	2006-01-22 03:52:10.000000000 -0200
+++ postgis/pkg-plist	2009-08-07 15:28:47.000000000 -0300
@@ -1,19 +1,21 @@
 bin/pgsql2shp
 bin/shp2pgsql
-lib/liblwgeom.so
-lib/liblwgeom.so.1
+lib/postgresql/postgis-1.4.so
+lib/postgresql/postgis.so
+lib/postgresql/liblwgeom.so
 lib/postgresql/liblwgeom.so.1
-%%DATADIR%%/lwpostgis.sql
-%%DATADIR%%/lwpostgis_upgrade.sql
-%%DATADIR%%/spatial_ref_sys.sql
-%%DATADIR%%/utils/postgis_restore.pl
-%%DATADIR%%/utils/profile_intersects.pl
-%%DATADIR%%/utils/test_estimation.pl
-%%DATADIR%%/utils/test_joinestimation.pl
-%%DATADIR%%/utils/create_undef.pl
-%%DATADIR%%/utils/README
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+share/postgis/contrib/postgis.sql
+share/postgis/contrib/postgis_upgrade.sql
+share/postgis/contrib/spatial_ref_sys.sql
+share/postgis/contrib/uninstall_postgis.sql
+share/postgis/utils/create_undef.pl
+share/postgis/utils/new_postgis_restore.pl
+share/postgis/utils/postgis_proc_upgrade.pl
+share/postgis/utils/postgis_restore.pl
+share/postgis/utils/profile_intersects.pl
+share/postgis/utils/test_estimation.pl
+share/postgis/utils/test_joinestimation.pl
+@dirrm share/postgis/utils
+@dirrm share/postgis/contrib
+@dirrm share/postgis
 @dirrmtry lib/postgresql
-@dirrmtry %%DATADIR%%/utils
-@dirrmtry %%DATADIR%%
-@dirrmtry lib