Hi, This diff updates postgis to 1.5.2.
Please report to me if the regression tests don't pass and if it passed before the update. Read the instructions in the Makefile before running regress. Eric. Index: Makefile =================================================================== RCS file: /cvs/ports/geo/postgis/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 18 Oct 2010 21:50:39 -0000 1.5 +++ Makefile 28 Oct 2010 15:47:47 -0000 @@ -3,7 +3,7 @@ SHARED_ONLY= Yes COMMENT= geographic objects support for PostgreSQL -DISTNAME= postgis-1.4.0 +DISTNAME= postgis-1.5.2 CATEGORIES= geo databases HOMEPAGE= http://www.postgis.org/ @@ -18,12 +18,13 @@ MASTER_SITES= ${HOMEPAGE}download/ -WANTLIB= c m +WANTLIB= c geos_c m pq proj xml2 z + MODULES= converters/libiconv -LIB_DEPENDS= proj::devel/proj \ - pq:postgresql-client-*:databases/postgresql \ - geos_c::geo/geos +LIB_DEPENDS= ::devel/proj \ + ::databases/postgresql \ + ::geo/geos RUN_DEPENDS= :postgresql-server-*:databases/postgresql,-server BUILD_DEPENDS= ${RUN_DEPENDS} Index: distinfo =================================================================== RCS file: /cvs/ports/geo/postgis/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 6 Aug 2009 10:30:20 -0000 1.3 +++ distinfo 28 Oct 2010 15:47:47 -0000 @@ -1,5 +1,5 @@ -MD5 (postgis-1.4.0.tar.gz) = vFuX1Tmb0gypC/33hKtsMw== -RMD160 (postgis-1.4.0.tar.gz) = 5fbLfdx498IJVLCqOjkG4xWBodc= -SHA1 (postgis-1.4.0.tar.gz) = RU2HAhxGyfpPZXgZ4xp0uPx1GTo= -SHA256 (postgis-1.4.0.tar.gz) = ccX/3lSi7LuI+/+hLKGMYX7P4kBPuQSZQM0began440= -SIZE (postgis-1.4.0.tar.gz) = 3143966 +MD5 (postgis-1.5.2.tar.gz) = dy7B0PBNaADNfiQgqXp0gw== +RMD160 (postgis-1.5.2.tar.gz) = W6JR9rQTjVoahe8motCLbU8oDg4= +SHA1 (postgis-1.5.2.tar.gz) = sTaMCPKg0iv3rcV6tBnx4wysv1Y= +SHA256 (postgis-1.5.2.tar.gz) = CuJ3iBa2qGAm84uh4qlBgkeoHDZK1GjWpb4Md7EGXwg= +SIZE (postgis-1.5.2.tar.gz) = 3749293 Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/geo/postgis/patches/patch-doc_Makefile_in,v retrieving revision 1.1 diff -u -r1.1 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 6 Aug 2009 10:30:20 -0000 1.1 +++ patches/patch-doc_Makefile_in 28 Oct 2010 15:47:47 -0000 @@ -1,26 +1,29 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1 2009/08/06 10:30:20 eric Exp $ ---- doc/Makefile.in.orig Wed Jul 8 17:16:53 2009 -+++ doc/Makefile.in Mon Aug 3 14:07:35 2009 -@@ -41,8 +41,8 @@ DBLATEX = @DBLATEX@ - IMAGEMAGICK = @IMAGEMAGICK@ +$OpenBSD$ +--- doc/Makefile.in.orig Fri Oct 8 17:33:27 2010 ++++ doc/Makefile.in Fri Oct 8 17:33:18 2010 +@@ -41,9 +41,9 @@ dblat...@dblatex@ + imagemagi...@imagemagick@ # Directories for postgresql subdirectories -pgsql_docd...@pgsql_docdir@ -pgsql_mand...@pgsql_mandir@ +-pgsql_shared...@pgsql_sharedir@ +pgsql_docdir=${wrkin...@pgsql_docdir@ +pgsql_mandir=${wrkin...@pgsql_mandir@ - pgsql_shared...@pgsql_sharedir@ ++pgsql_sharedir=${wrkin...@pgsql_sharedir@ # If XSLTPROC or XSLBASE were not found during configure, we cannot -@@ -77,11 +77,6 @@ chunked-html: postgis-out.xml + # build the documentation +@@ -75,12 +75,6 @@ chunked-html: postgis-out.xml images + --output html/ \ + --stringparam saxon.character.representation decimal \ $(CHUNK_HTML_DOCBOOK_XSL) \ - $< - --html/postgis.html: postgis-out.xml +- $< +- +-html/postgis.html: postgis-out.xml images - $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \ - --output html/postgis.html \ - $(HTML_DOCBOOK_XSL) \ -- $< + $< - postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf: postgis-out.xml Index: patches/patch-loader_Makefile_in =================================================================== RCS file: /cvs/ports/geo/postgis/patches/patch-loader_Makefile_in,v retrieving revision 1.1 diff -u -r1.1 patch-loader_Makefile_in --- patches/patch-loader_Makefile_in 6 Aug 2009 10:30:20 -0000 1.1 +++ patches/patch-loader_Makefile_in 28 Oct 2010 15:47:47 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-loader_Makefile_in,v 1.1 2009/08/06 10:30:20 eric Exp $ ---- loader/Makefile.in.orig Mon Aug 3 12:24:41 2009 -+++ loader/Makefile.in Mon Aug 3 12:25:28 2009 -@@ -24,7 +24,7 @@ pgsql_fe_cppfla...@pgsql_fe_cppflags@ +$OpenBSD$ +--- loader/Makefile.in.orig Fri Oct 8 16:08:26 2010 ++++ loader/Makefile.in Fri Oct 8 16:08:13 2010 +@@ -35,7 +35,7 @@ pgsql_fe_cppfla...@pgsql_fe_cppflags@ pgsql_fe_ldfla...@pgsql_fe_ldflags@ # iconv flags -iconv_ldfla...@iconv_ldflags@ +ICONV_LDFLAGS=-L${LOCALBASE}/lib @ICONV_LDFLAGS@ + iconv_cfla...@iconv_cflags@ # liblwgeom - LIBLWGEOM=../liblwgeom/liblwgeom.a Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/geo/postgis/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 6 Aug 2009 10:30:20 -0000 1.3 +++ pkg/PLIST 28 Oct 2010 15:47:47 -0000 @@ -1,7 +1,7 @@ @comment $OpenBSD: PLIST,v 1.3 2009/08/06 10:30:20 eric Exp $ @bin bin/pgsql2shp @bin bin/shp2pgsql -lib/postgresql/postgis-1.4.so +lib/postgresql/postgis-1.5.so libexec/postgis/ libexec/postgis/utils/ libexec/postgis/utils/README @@ -10,7 +10,10 @@ libexec/postgis/utils/postgis_proc_upgrade.pl libexec/postgis/utils/postgis_restore.pl libexec/postgis/utils/profile_intersects.pl +libexec/postgis/utils/read_scripts_version.pl libexec/postgis/utils/test_estimation.pl +libexec/postgis/utils/test_geography_estimation.pl +libexec/postgis/utils/test_geography_joinestimation.pl libexec/postgis/utils/test_joinestimation.pl @man man/man1/pgsql2shp.1 @man man/man1/shp2pgsql.1 @@ -18,7 +21,10 @@ share/doc/postgresql/postgis/README.postgis share/doc/postgresql/postgis/postgis.html share/postgresql/contrib/ -share/postgresql/contrib/postgis.sql -share/postgresql/contrib/postgis_upgrade.sql -share/postgresql/contrib/spatial_ref_sys.sql -share/postgresql/contrib/uninstall_postgis.sql +share/postgresql/contrib/postgis-1.5/ +share/postgresql/contrib/postgis-1.5/postgis.sql +share/postgresql/contrib/postgis-1.5/postgis_upgrade_13_to_15.sql +share/postgresql/contrib/postgis-1.5/postgis_upgrade_14_to_15.sql +share/postgresql/contrib/postgis-1.5/postgis_upgrade_15_minor.sql +share/postgresql/contrib/postgis-1.5/spatial_ref_sys.sql +share/postgresql/contrib/postgis-1.5/uninstall_postgis.sql
