this moves the currently broken postgis to operational status. this diff is originally by eric@, i just updated to 2.0.1
added a BUILD_DEPENDS on textproc/libxslt because in the fake stage it is being used to convert the .xml into .sql sorted the order of LIB_DEPENDS ? postgis.diff Index: Makefile =================================================================== RCS file: /cvs/ports/geo/postgis/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 24 Sep 2012 19:54:54 -0000 1.12 +++ Makefile 16 Nov 2012 21:52:19 -0000 @@ -3,15 +3,13 @@ SHARED_ONLY= Yes COMMENT= geographic objects support for PostgreSQL -DISTNAME= postgis-1.5.3 +DISTNAME= postgis-2.0.1 CATEGORIES= geo databases HOMEPAGE= http://www.postgis.org/ MAINTAINER= Eric Faurot <e...@openbsd.org> -BROKEN= Doesn't build with PostgreSQL 9.2 - # GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -20,15 +18,22 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}download/ -WANTLIB= c geos_c m pq>=5.3 proj xml2 z + +WANTLIB= c crypto curl expat gdal geotiff geos geos_c gif idn intl \ + jasper jpeg json m png pq proj pthread ssl stdc++ tiff xml2 z MODULES= converters/libiconv -LIB_DEPENDS= devel/proj \ - databases/postgresql \ - geo/geos +BUILD_DEPENDS= textproc/libxslt + +LIB_DEPENDS= databases/postgresql \ + devel/json-c \ + devel/proj \ + geo/gdal \ + geo/geos \ + graphics/jasper + RUN_DEPENDS= databases/postgresql,-server -BUILD_DEPENDS= ${RUN_DEPENDS} USE_GMAKE= Yes CONFIGURE_ENV= PGXS=1 \ @@ -37,13 +42,6 @@ CONFIGURE_ENV= PGXS=1 \ CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --datadir=${PREFIX}/share/postgresql/contrib \ --libdir=${PREFIX}/lib/postgresql -USE_GROFF = Yes - -post-install: - ${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/postgis/utils - ${INSTALL_SCRIPT} ${WRKSRC}/utils/*.pl ${PREFIX}/libexec/postgis/utils - ${INSTALL_DATA} ${WRKSRC}/utils/README ${PREFIX}/libexec/postgis/utils - cd ${WRKSRC}/doc && WRKINST=${WRKINST} ${MAKE_PROGRAM} install # Note on running regress # @@ -52,8 +50,8 @@ post-install: # $ mkdir /tmp/pg && initdb -D /tmp/pg -U postgres && postgres -D /tmp/pg # - run make regress -do-regress: install - cd ${WRKSRC}/regress && PGUSER=postgres ${MAKE_PROGRAM} +#do-regress: install +# cd ${WRKSRC}/regress && PGUSER=postgres ${MAKE_PROGRAM} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/geo/postgis/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 21 Sep 2011 14:13:32 -0000 1.5 +++ distinfo 16 Nov 2012 21:52:19 -0000 @@ -1,5 +1,2 @@ -MD5 (postgis-1.5.3.tar.gz) = BaYd9eG3i/UcnOmL6lUm/A== -RMD160 (postgis-1.5.3.tar.gz) = 4wJ1iQsXXL4dcNWJnL5F7DTduvs= -SHA1 (postgis-1.5.3.tar.gz) = 6MVy4CWLp2Cme39xe9yDIbn2zVg= -SHA256 (postgis-1.5.3.tar.gz) = ojNPiyKURsBJfUikMKQBUqO3Gl2gL0FKA0CgoCXUFs8= -SIZE (postgis-1.5.3.tar.gz) = 3779956 +SHA256 (postgis-2.0.1.tar.gz) = MtGBu/DmSP4xyVs90j9+TkkJTZPLQnj99xyP7tTpWTw= +SIZE (postgis-2.0.1.tar.gz) = 5373194 Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/geo/postgis/patches/patch-doc_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 4 Nov 2010 13:45:54 -0000 1.2 +++ patches/patch-doc_Makefile_in 16 Nov 2012 21:52:19 -0000 @@ -1,48 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.2 2010/11/04 13:45:54 eric Exp $ ---- doc/Makefile.in.orig Sun Sep 19 14:21:28 2010 -+++ doc/Makefile.in Tue Nov 2 17:59:04 2010 -@@ -41,25 +41,14 @@ DBLATEX=@DBLATEX@ - IMAGEMAGICK=@IMAGEMAGICK@ - - # Directories for postgresql subdirectories --PGSQL_DOCDIR=@PGSQL_DOCDIR@ --PGSQL_MANDIR=@PGSQL_MANDIR@ -+PGSQL_DOCDIR=${WRKINST}@PGSQL_DOCDIR@ -+PGSQL_MANDIR=${WRKINST}@PGSQL_MANDIR@ - PGSQL_SHAREDIR=@PGSQL_SHAREDIR@ - -+ - # If XSLTPROC or XSLBASE were not found during configure, we cannot - # build the documentation --ifeq ($(XSLTPROC),) --all: requirements_not_met_xsltproc --else --ifeq ($(XSLBASE),) --all: requirements_not_met_xslbase --else --ifeq ($(IMAGEMAGICK),) --all: requirements_not_met_imagemagick --else --all: images html/postgis.html postgis_comments.sql --endif --endif --endif -+all: - - postgis_aggs_mm.xml: ./xsl/postgis_aggs_mm.xml.xsl postgis.xml - $(XSLTPROC) ./xsl/postgis_aggs_mm.xml.xsl postgis.xml > $@ -@@ -130,10 +119,13 @@ comments-install: comments - comments-uninstall: - make -f Makefile.comments uninstall - --install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1 -+install: - @mkdir -p $(PGSQL_DOCDIR)/postgis -+ @mkdir -p $(PGSQL_DOCDIR)/postgis/images - @mkdir -p $(PGSQL_MANDIR)/man1 -+ cp html/images/* $(PGSQL_DOCDIR)/postgis/images/ - cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html -+ cp html/style.css $(PGSQL_DOCDIR)/postgis/style.css - 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 Index: patches/patch-loader_Makefile_in =================================================================== RCS file: /cvs/ports/geo/postgis/patches/patch-loader_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-loader_Makefile_in --- patches/patch-loader_Makefile_in 4 Nov 2010 13:45:54 -0000 1.2 +++ patches/patch-loader_Makefile_in 16 Nov 2012 21:52:19 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-loader_Makefile_in,v 1.2 2010/11/04 13:45:54 eric Exp $ ---- 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_CPPFLAGS=@PGSQL_FE_CPPFLAGS@ - PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@ - - # iconv flags --ICONV_LDFLAGS=@ICONV_LDFLAGS@ -+ICONV_LDFLAGS=-L${LOCALBASE}/lib @ICONV_LDFLAGS@ - ICONV_CFLAGS=@ICONV_CFLAGS@ - - # liblwgeom Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/geo/postgis/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 21 Sep 2011 14:13:32 -0000 1.5 +++ pkg/PLIST 16 Nov 2012 21:52:19 -0000 @@ -1,122 +1,63 @@ @comment $OpenBSD: PLIST,v 1.5 2011/09/21 14:13:32 pea Exp $ @bin bin/pgsql2shp +@bin bin/raster2pgsql @bin bin/shp2pgsql -lib/postgresql/postgis-1.5.so -libexec/postgis/ -libexec/postgis/utils/ -libexec/postgis/utils/README -libexec/postgis/utils/create_undef.pl -libexec/postgis/utils/new_postgis_restore.pl -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 -share/doc/postgresql/ -share/doc/postgresql/postgis/ -share/doc/postgresql/postgis/README.postgis -share/doc/postgresql/postgis/images/ -share/doc/postgresql/postgis/images/caution.png -share/doc/postgresql/postgis/images/check.png -share/doc/postgresql/postgis/images/de9im01.png -share/doc/postgresql/postgis/images/de9im02.png -share/doc/postgresql/postgis/images/de9im03.png -share/doc/postgresql/postgis/images/de9im04.png -share/doc/postgresql/postgis/images/de9im05.png -share/doc/postgresql/postgis/images/de9im06.png -share/doc/postgresql/postgis/images/de9im07.png -share/doc/postgresql/postgis/images/de9im08.png -share/doc/postgresql/postgis/images/de9im09.png -share/doc/postgresql/postgis/images/de9im10.png -share/doc/postgresql/postgis/images/de9im11.png -share/doc/postgresql/postgis/images/de9im12.png -share/doc/postgresql/postgis/images/de9im13.png -share/doc/postgresql/postgis/images/important.png -share/doc/postgresql/postgis/images/matrix_autocast.png -share/doc/postgresql/postgis/images/matrix_checkmark.png -share/doc/postgresql/postgis/images/matrix_transform.png -share/doc/postgresql/postgis/images/note.png -share/doc/postgresql/postgis/images/st_buffer01.png -share/doc/postgresql/postgis/images/st_buffer02.png -share/doc/postgresql/postgis/images/st_buffer03.png -share/doc/postgresql/postgis/images/st_buffer04.png -share/doc/postgresql/postgis/images/st_buffer05.png -share/doc/postgresql/postgis/images/st_buffer06.png -share/doc/postgresql/postgis/images/st_buffer07.png -share/doc/postgresql/postgis/images/st_buffer08.png -share/doc/postgresql/postgis/images/st_buildarea01.png -share/doc/postgresql/postgis/images/st_buildarea02.png -share/doc/postgresql/postgis/images/st_centroid01.png -share/doc/postgresql/postgis/images/st_centroid02.png -share/doc/postgresql/postgis/images/st_centroid03.png -share/doc/postgresql/postgis/images/st_centroid04.png -share/doc/postgresql/postgis/images/st_closestpoint01.png -share/doc/postgresql/postgis/images/st_closestpoint02.png -share/doc/postgresql/postgis/images/st_contains01.png -share/doc/postgresql/postgis/images/st_contains02.png -share/doc/postgresql/postgis/images/st_contains03.png -share/doc/postgresql/postgis/images/st_contains04.png -share/doc/postgresql/postgis/images/st_contains05.png -share/doc/postgresql/postgis/images/st_contains06.png -share/doc/postgresql/postgis/images/st_convexhull01.png -share/doc/postgresql/postgis/images/st_crosses-math.gif -share/doc/postgresql/postgis/images/st_crosses01.png -share/doc/postgresql/postgis/images/st_crosses02.png -share/doc/postgresql/postgis/images/st_crosses03.png -share/doc/postgresql/postgis/images/st_crosses04.png -share/doc/postgresql/postgis/images/st_difference01.png -share/doc/postgresql/postgis/images/st_dumppoints01.png -share/doc/postgresql/postgis/images/st_issimple01.png -share/doc/postgresql/postgis/images/st_issimple02.png -share/doc/postgresql/postgis/images/st_issimple03.png -share/doc/postgresql/postgis/images/st_issimple04.png -share/doc/postgresql/postgis/images/st_issimple05.png -share/doc/postgresql/postgis/images/st_issimple06.png -share/doc/postgresql/postgis/images/st_issimple07.png -share/doc/postgresql/postgis/images/st_isvalid01.png -share/doc/postgresql/postgis/images/st_isvalid02.png -share/doc/postgresql/postgis/images/st_isvalid03.png -share/doc/postgresql/postgis/images/st_isvalid04.png -share/doc/postgresql/postgis/images/st_isvalid05.png -share/doc/postgresql/postgis/images/st_isvalid06.png -share/doc/postgresql/postgis/images/st_isvalid07.png -share/doc/postgresql/postgis/images/st_isvalid08.png -share/doc/postgresql/postgis/images/st_line_interpolate_point01.png -share/doc/postgresql/postgis/images/st_line_substring01.png -share/doc/postgresql/postgis/images/st_linecrossingdirection01.png -share/doc/postgresql/postgis/images/st_linecrossingdirection02.png -share/doc/postgresql/postgis/images/st_linecrossingdirection03.png -share/doc/postgresql/postgis/images/st_linecrossingdirection04.png -share/doc/postgresql/postgis/images/st_longestline01.png -share/doc/postgresql/postgis/images/st_longestline02.png -share/doc/postgresql/postgis/images/st_longestline03.png -share/doc/postgresql/postgis/images/st_minimumboundingcircle01.png -share/doc/postgresql/postgis/images/st_shortestline01.png -share/doc/postgresql/postgis/images/st_shortestline02.png -share/doc/postgresql/postgis/images/st_symdifference01.png -share/doc/postgresql/postgis/images/st_symdifference02.png -share/doc/postgresql/postgis/images/st_touches-math.gif -share/doc/postgresql/postgis/images/st_touches01.png -share/doc/postgresql/postgis/images/st_touches02.png -share/doc/postgresql/postgis/images/st_touches03.png -share/doc/postgresql/postgis/images/st_touches04.png -share/doc/postgresql/postgis/images/st_touches05.png -share/doc/postgresql/postgis/images/st_touches06.png -share/doc/postgresql/postgis/images/st_within01.png -share/doc/postgresql/postgis/images/tip.png -share/doc/postgresql/postgis/images/warning.png -share/doc/postgresql/postgis/postgis.html -share/doc/postgresql/postgis/style.css +include/liblwgeom.h +lib/postgresql/liblwgeom-2.0.1.so +lib/postgresql/liblwgeom.a +lib/postgresql/liblwgeom.la +lib/postgresql/liblwgeom.so +lib/postgresql/postgis-2.0.so +lib/postgresql/rtpostgis-2.0.so share/postgresql/contrib/ -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 +share/postgresql/contrib/postgis-2.0/ +share/postgresql/contrib/postgis-2.0/legacy.sql +share/postgresql/contrib/postgis-2.0/legacy_minimal.sql +share/postgresql/contrib/postgis-2.0/postgis.sql +share/postgresql/contrib/postgis-2.0/postgis_comments.sql +share/postgresql/contrib/postgis-2.0/postgis_restore.pl +share/postgresql/contrib/postgis-2.0/postgis_upgrade_20_minor.sql +share/postgresql/contrib/postgis-2.0/raster_comments.sql +share/postgresql/contrib/postgis-2.0/rtpostgis.sql +share/postgresql/contrib/postgis-2.0/rtpostgis_legacy.sql +share/postgresql/contrib/postgis-2.0/rtpostgis_upgrade_20_minor.sql +share/postgresql/contrib/postgis-2.0/spatial_ref_sys.sql +share/postgresql/contrib/postgis-2.0/topology.sql +share/postgresql/contrib/postgis-2.0/topology_comments.sql +share/postgresql/contrib/postgis-2.0/topology_upgrade_20_minor.sql +share/postgresql/contrib/postgis-2.0/uninstall_legacy.sql +share/postgresql/contrib/postgis-2.0/uninstall_postgis.sql +share/postgresql/contrib/postgis-2.0/uninstall_rtpostgis.sql +share/postgresql/contrib/postgis-2.0/uninstall_topology.sql +share/postgresql/extension/postgis--2.0.0--2.0.1.sql +share/postgresql/extension/postgis--2.0.0alpha1--2.0.1.sql +share/postgresql/extension/postgis--2.0.0alpha2--2.0.1.sql +share/postgresql/extension/postgis--2.0.0alpha3--2.0.1.sql +share/postgresql/extension/postgis--2.0.0alpha4--2.0.1.sql +share/postgresql/extension/postgis--2.0.0alpha5--2.0.1.sql +share/postgresql/extension/postgis--2.0.0alpha6--2.0.1.sql +share/postgresql/extension/postgis--2.0.0beta1--2.0.1.sql +share/postgresql/extension/postgis--2.0.0beta2--2.0.1.sql +share/postgresql/extension/postgis--2.0.0beta3--2.0.1.sql +share/postgresql/extension/postgis--2.0.0beta4--2.0.1.sql +share/postgresql/extension/postgis--2.0.0rc1--2.0.1.sql +share/postgresql/extension/postgis--2.0.0rc2--2.0.1.sql +share/postgresql/extension/postgis--2.0.1.sql +share/postgresql/extension/postgis--unpackaged--2.0.1.sql +share/postgresql/extension/postgis.control +share/postgresql/extension/postgis_topology--2.0.0--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0alpha1--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0alpha2--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0alpha3--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0alpha4--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0alpha5--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0alpha6--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0beta1--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0beta2--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0beta3--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0beta4--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0rc1--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.0rc2--2.0.1.sql +share/postgresql/extension/postgis_topology--2.0.1.sql +share/postgresql/extension/postgis_topology--unpackaged--2.0.1.sql +share/postgresql/extension/postgis_topology.control
