- Update to 1.0.0-RC5

PR:		ports/79083, ports/79301
Submitted by:	Anderson S. Ferreira <anderson@cnpm.embrapa.br> (maintainer)

13 files changed, 76 insertions, 63 deletions

diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile
index 84b1bad6b00b..fb1a0267ba9f 100644
--- a/databases/postgis/Makefile
+++ b/databases/postgis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postgis
-DISTVERSION=	1.0.0-rc3
+DISTVERSION=	1.0.0-rc5
 CATEGORIES=	databases
 MASTER_SITES=	http://postgis.refractions.net/
 
@@ -71,8 +71,6 @@ pre-configure:
 	${MV} ${WRKDIR}/pgsql/postgresql* ${PGSQL_SRC} \
 
 post-install:
-	@ ${INSTALL_DATA} ${FILESDIR}/updatedb.default ${PREFIX}/share/postgis
-	@ ${INSTALL_DATA} ${FILESDIR}/README.upgrade ${PREFIX}/share/postgis
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/databases/postgis/distinfo b/databases/postgis/distinfo
index 38e18837bdd7..7e846bbc65de 100644
--- a/databases/postgis/distinfo
+++ b/databases/postgis/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgis-1.0.0-rc3.tar.gz) = 46091f2a9b8a32a23c5970e58d5f20bf
-SIZE (postgis-1.0.0-rc3.tar.gz) = 1358189
+MD5 (postgis-1.0.0-rc5.tar.gz) = 6918a4c11ca70ab5685effd0f39b3ecf
+SIZE (postgis-1.0.0-rc5.tar.gz) = 1372632
diff --git a/databases/postgis/files/README.upgrade b/databases/postgis/files/README.upgrade
deleted file mode 100644
index 88eb5382d465..000000000000
--- a/databases/postgis/files/README.upgrade
+++ /dev/null
@@ -1,16 +0,0 @@
-Updating databases from old versions of Postgis
-
-The postgis library has its name changed, now the library is called
-liblwgeom.so.1 instead of libpostgis.so.0 .
-Databases created with older versions of postgis won't work properly, 
-until all references of libpostgis.so.0 be corrected.
-To solve this problem, please, make a dump (on text format) of your
-database and use the PREFIX/share/updatedb script.
-
- sh PREFIX/share/updatedb dump.sql
-
-A new file with '.updated' extension will be created with the library 
-references updated.
-After that, you can restore your database using the updated file. 
-
- psql -f dump.sql.updated database
diff --git a/databases/postgis/files/patch-a b/databases/postgis/files/patch-doc
index 9052c9938605..dc97f38b2b7d 100644
--- a/databases/postgis/files/patch-a
+++ b/databases/postgis/files/patch-doc
@@ -1,34 +1,40 @@
---- doc/Makefile	Thu Jan 13 07:42:40 2005
-+++ doc/Makefile	Mon Jan 31 16:48:51 2005
-@@ -1,20 +1,22 @@
+--- doc/Makefile	Fri Mar  4 16:34:47 2005
++++ doc/Makefile	Mon Mar 21 09:07:57 2005
+@@ -1,11 +1,14 @@
  COMMONOPTS = -f docbook -b html -e no-valid
- LAST_RELEASE_VERSION = 1.0.0RC1
  
 +include ../Makefile.config
 +include $(top_srcdir)/src/Makefile.shlib
++
+ # fetch version numbers from central repository
+ include ../Version.config
  
- postgis-out.xml: postgis.xml
- 	cat $< | sed "s/@@LAST_RELEASE_VERSION@@/$(LAST_RELEASE_VERSION)/g" > $@
+ LAST_RELEASE_VERSION = $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_MICRO_VERSION)
  
+-XSLBASE?=/usr/share/sgml/docbook/xsl-stylesheets
++XSLBASE?=/usr/local/share/xsl/docbook
+ 
+ all: html
+ 
+@@ -15,14 +18,13 @@
  chunked-html: postgis-out.xml
  	xsltproc \
+ 		--output html/ \
 -		--param shade.verbatim 1 \
-+		--output html/ \
  		--param chunk.section.depth 0 \
  		--param section.autolabel 1 \
  		--param section.label.includes.component.label 1 \
  		--stringparam html.stylesheet style.css \
  		--stringparam saxon.character.representation decimal \
--		/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl \
+ 		$(XSLBASE)/html/chunk.xsl \
 -		$<
-+		/usr/local/share/xsl/docbook/html/chunk.xsl \
 +		$< && touch chunked-html
  
- html: postgis-out.xml
+ html/postgis.html: postgis-out.xml
  	xsltproc \
-@@ -53,3 +55,12 @@
- 		postgis.out \
- 		postgis.log
+@@ -66,5 +68,15 @@
+ maintainer-clean: clean
+ 	@rm -f html/*.html
  
 +install: chunked-html
 +	$(mkinstalldirs) $(DOCSDIR)
@@ -39,3 +45,6 @@
 +	$(INSTALL_DATA)	html/ch04.html $(DOCSDIR)/ch04.html
 +	$(INSTALL_DATA)	html/ch05.html $(DOCSDIR)/ch05.html
 +	$(INSTALL_DATA)	html/ch06.html $(DOCSDIR)/ch06.html
++	$(INSTALL_DATA)	html/ch07.html $(DOCSDIR)/ch07.html
+ 
+ .PHONY: html 
diff --git a/databases/postgis/files/patch-b b/databases/postgis/files/patch-loader
index b7686f0ab4ea..b7686f0ab4ea 100644
--- a/databases/postgis/files/patch-b
+++ b/databases/postgis/files/patch-loader
diff --git a/databases/postgis/files/patch-d b/databases/postgis/files/patch-lwgeom
index f0a45875c854..d596d42e62d5 100644
--- a/databases/postgis/files/patch-d
+++ b/databases/postgis/files/patch-lwgeom
@@ -1,7 +1,7 @@
---- lwgeom/Makefile	Wed Jan 26 06:35:56 2005
-+++ lwgeom/Makefile	Mon Jan 31 13:28:00 2005
+--- lwgeom/Makefile	Fri Mar 18 09:43:23 2005
++++ lwgeom/Makefile	Mon Mar 21 08:58:26 2005
 @@ -21,10 +21,10 @@
- SCRIPTS_VERSION=0.1.0
+ 
  ifeq (${USE_VERSION},71) 
  	MODULE_FILENAME = $(LPATH)/$(shlib)
 -	MODULE_INSTALLDIR = $(libdir)
@@ -13,26 +13,29 @@
  endif
  
  #---------------------------------------------------------------
-@@ -123,7 +123,7 @@
+@@ -143,9 +143,9 @@
  install: all installdirs install-lwgeom-lib install-lwgeom-scripts
  
  install-lwgeom-scripts:
--	$(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)
+-	$(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)/contrib/lwpostgis.sql
+-	$(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(datadir)/contrib/spatial_ref_sys.sql
+-	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/contrib/README.postgis
 +	$(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql.default
++	$(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(DATADIR)/spatial_ref_sys.sql
++	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(DATADIR)/README.postgis
  
  #- This has been copied from postgresql and adapted
  install-lwgeom-lib: $(shlib)
-@@ -147,10 +147,11 @@
+@@ -169,9 +169,9 @@
  	sh ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
  
  installdirs:
--	$(mkinstalldirs) $(libdir)
+-	$(mkinstalldirs) $(DESTDIR)$(MODULE_INSTALLDIR)
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/contrib
+-	$(mkinstalldirs) $(DESTDIR)$(docdir)/contrib
 +	$(mkinstalldirs) $(LIBDIR)
 +	$(mkinstalldirs) $(DATADIR)
++	$(mkinstalldirs) $(DOCSDIR)
  
  uninstall-lwgeom-scripts:
--	rm -f $(DESTDIR)$(datadir)/lwpostgis.sql
-+	rm -f $(DESTDIR)$(DATADIR)/lwpostgis.sql
- 
- uninstall: uninstall-lib uninstall-lwgeom-scripts
- 
+ 	rm -f $(DESTDIR)$(datadir)/contrib/lwpostgis.sql
diff --git a/databases/postgis/files/patch-c b/databases/postgis/files/patch-main
index 7c806d014fa7..20e86467469a 100644
--- a/databases/postgis/files/patch-c
+++ b/databases/postgis/files/patch-main
@@ -1,14 +1,15 @@
---- Makefile	Mon Jan 31 12:51:48 2005
-+++ Makefile	Mon Jan 31 12:56:14 2005
-@@ -5,8 +5,14 @@
+--- Makefile	Tue Mar  8 13:46:23 2005
++++ Makefile	Mon Mar 28 09:22:32 2005
+@@ -5,8 +5,15 @@
  #-----------------------------------------------------
  
- all: liblwgeom loaderdumper
+ all: liblwgeom loaderdumper utils
 +ifneq ($(WITH-DOC),)
 +	$(MAKE) -C doc chunked-html
 +endif
  
  install: all liblwgeom-install loaderdumper-install
++	$(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DATADIR=$(DATADIR) -C utils install
 +ifneq ($(WITH-DOC),)
 +	$(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DOCSDIR=$(DOCSDIR) -C doc install
 +endif
diff --git a/databases/postgis/files/patch-utils b/databases/postgis/files/patch-utils
new file mode 100644
index 000000000000..0d3ad32ec52b
--- /dev/null
+++ b/databases/postgis/files/patch-utils
@@ -0,0 +1,21 @@
+--- utils/Makefile	Tue Mar  8 09:11:29 2005
++++ utils/Makefile	Mon Mar 28 09:45:41 2005
+@@ -1,3 +1,6 @@
++include ../Makefile.config
++include $(top_srcdir)/src/Makefile.shlib
++
+ SCRIPTS = \
+ 	postgis_restore.pl \
+ 	profile_intersects.pl \
+@@ -6,3 +9,11 @@
+ 
+ all:
+ 	chmod +x $(SCRIPTS)
++
++install:
++	$(mkinstalldirs) $(DATADIR)/utils
++	$(INSTALL_DATA)	README $(DATADIR)/utils/README
++	$(INSTALL_DATA)	postgis_restore.pl $(DATADIR)/utils/postgis_restore.pl
++	$(INSTALL_DATA)	profile_intersects.pl $(DATADIR)/utils/profile_intersects.pl
++	$(INSTALL_DATA)	test_estimation.pl $(DATADIR)/utils/test_estimation.pl
++	$(INSTALL_DATA)	test_joinestimation.pl $(DATADIR)/utils/test_joinestimation.pl
diff --git a/databases/postgis/files/updatedb.default b/databases/postgis/files/updatedb.default
deleted file mode 100644
index b2d44e6848df..000000000000
--- a/databases/postgis/files/updatedb.default
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-LIBDIR=%%LIBDIR%%
-
-sed "s|'.*/libpostgis\.so\.0'|'${LIBDIR}/liblwgeom.so.1'|g
-     s|'.*/liblwgeom\.so\.1'|'${LIBDIR}/liblwgeom.so.1'|g $1 > $1.updated
diff --git a/databases/postgis/pkg-deinstall b/databases/postgis/pkg-deinstall
index cb750eeb08ed..919233a5ee57 100644
--- a/databases/postgis/pkg-deinstall
+++ b/databases/postgis/pkg-deinstall
@@ -1,11 +1,10 @@
 #!/bin/sh
 
-
 case "$2" in
   "POST-DEINSTALL")
 	PREF=${PREFIX:-$PKG_PREFIX}
 	SHAREDIR=${PREF}/share/postgis
-	rm -f ${SHAREDIR}/lwpostgis.sql ${SHAREDIR}/updatedb
+	rm -f ${SHAREDIR}/lwpostgis.sql
 	rmdir ${SHAREDIR}
   ;;
 esac
diff --git a/databases/postgis/pkg-install b/databases/postgis/pkg-install
index f6f3be016f4a..276ec257c4f4 100644
--- a/databases/postgis/pkg-install
+++ b/databases/postgis/pkg-install
@@ -42,8 +42,6 @@ case "$2" in
 	SHAREDIR=${PREF}/share/postgis
 	LIBDIR=${PREF}/lib
 	sed -e "s|\$libdir|${LIBDIR}|g" ${SHAREDIR}/lwpostgis.sql.default > ${SHAREDIR}/lwpostgis.sql
-	sed -e "s|%%LIBDIR%%|${LIBDIR}|g" ${SHAREDIR}/updatedb.default > ${SHAREDIR}/updatedb
-	chmod 0755 ${SHAREDIR}/updatedb
   ;;
   "MESSAGE")
 	msg
diff --git a/databases/postgis/pkg-message b/databases/postgis/pkg-message
index 17c88c36bb9c..fe8e71755310 100644
--- a/databases/postgis/pkg-message
+++ b/databases/postgis/pkg-message
@@ -4,6 +4,6 @@ Postgis Installation note
 
 * The name of the postgis library has changed.
   Users from older versions (0.9.1 or older), *must* read 
-  PREFIX/share/postgis/README.upgrade for instructions.
+  PREFIX/share/postgis/README.postgis for instructions.
 
 =============================================================
diff --git a/databases/postgis/pkg-plist b/databases/postgis/pkg-plist
index 08bd559b0985..27cd3f3e17ad 100644
--- a/databases/postgis/pkg-plist
+++ b/databases/postgis/pkg-plist
@@ -2,9 +2,15 @@ bin/pgsql2shp
 bin/shp2pgsql
 lib/liblwgeom.so
 lib/liblwgeom.so.1
-%%DATADIR%%/README.upgrade
-%%DATADIR%%/updatedb.default
+%%DATADIR%%/README.postgis
 %%DATADIR%%/lwpostgis.sql.default
+%%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/README
 %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@unexec rmdir %D/%%DATADIR%%/utils 2>/dev/null || true
 @unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
 @unexec rmdir %D/lib 2>/dev/null || true