cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

geo/postgis: update to 3.1.0

Browse Source 
See http://postgis.net/2020/12/18/postgis-3.1.0/

add a patch to workaround an openbsd libtool issue, to be investigated
This commit is contained in:
landry 2020-12-23 10:19:18 +00:00
parent cb70cd0868
commit c57865b334
5 changed files with 72 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geo/postgis/Makefile
View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.61 2020/11/24 09:22:28 landry Exp $
# $OpenBSD: Makefile,v 1.62 2020/12/23 10:19:18 landry Exp $
V = 3.0.3
V = 3.1.0
COMMENT= geographic objects support for PostgreSQL
DISTNAME= postgis-${V}
CATEGORIES= geo databases
SHARED_LIBS += lwgeom 0.0 lwgeom-3.0 0.0 # 4.0
HOMEPAGE= http://www.postgis.net/
MAINTAINER= Landry Breuil <landry@openbsd.org>

4
geo/postgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (postgis-3.0.3.tar.gz) = B/7b0EbL7VXSS7IkdIkKRlHQIjtuEtLawVF7mkNnSBc=
SIZE (postgis-3.0.3.tar.gz) = 16871696
SHA256 (postgis-3.1.0.tar.gz) = 2gbiRWh2zQxqm+4GNv9wCYLpAMWX0eTLgKmaJiNAAgE=
SIZE (postgis-3.1.0.tar.gz) = 17262134

16
geo/postgis/patches/patch-liblwgeom_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-liblwgeom_Makefile_in,v 1.1 2020/12/23 10:19:18 landry Exp $
our libtool doesnt link the contents of libryu.a ?
Index: liblwgeom/Makefile.in
--- liblwgeom/Makefile.in.orig
+++ liblwgeom/Makefile.in
@@ -179,7 +179,7 @@ $(RYU_LIBPATH): ../deps/ryu/d2s.c
$(MAKE) -C ../deps/ryu @RYU_LIB@
liblwgeom.la: $(LT_OBJS) $(RYU_LIBPATH)
- $(LIBTOOL) --tag=CC --mode=link $(CC) -rpath $(libdir) $(LT_OBJS) $(RYU_LIBPATH)\
+ $(LIBTOOL) --tag=CC --mode=link $(CC) -rpath $(libdir) $(LT_OBJS) ../deps/ryu/d2s.lo \
-release $(SOVER) -version-info $(VERSION_INFO) $(LDFLAGS) -static -o $@
maintainer-clean: clean

6
geo/postgis/patches/patch-postgis_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-postgis_Makefile_in,v 1.2 2020/02/25 10:24:12 landry Exp $
$OpenBSD: patch-postgis_Makefile_in,v 1.3 2020/12/23 10:19:18 landry Exp $
Modify include paths order to prevent postgis from using system wide
devel/uthash headers if they are installed.
@ -8,7 +8,7 @@ https://trac.osgeo.org/postgis/ticket/4573
Index: postgis/Makefile.in
--- postgis/Makefile.in.orig
+++ postgis/Makefile.in
@@ -142,7 +142,7 @@ OBJS=$(PG_OBJS)
@@ -136,7 +136,7 @@ OBJS=$(PG_OBJS)
# to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
# older version of PostGIS, rather than with the static liblwgeom.a
# supplied with newer versions of PostGIS
@ -16,4 +16,4 @@ Index: postgis/Makefile.in
+PG_CPPFLAGS += -I../liblwgeom $(UTHASH_INCLUDE) @CFLAGS@ -I../libpgcommon $(WAYGU_INCLUDE) @CPPFLAGS@ @PICFLAGS@
SHLIB_LINK_F = $(WAYGU_LIB) ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
# Add SFCGAL Flags if defined
# Extra files to remove during 'make clean'

76
geo/postgis/pkg/PLIST
View File

@ -1,9 +1,7 @@
@comment $OpenBSD: PLIST,v 1.32 2020/11/24 09:22:28 landry Exp $
@comment $OpenBSD: PLIST,v 1.33 2020/12/23 10:19:18 landry Exp $
@bin bin/pgsql2shp
@bin bin/raster2pgsql
@bin bin/shp2pgsql
@comment lib/postgresql/liblwgeom.a
@comment lib/postgresql/liblwgeom.la
@so lib/postgresql/address_standardizer-3.so
@so lib/postgresql/postgis-3.so
@so lib/postgresql/postgis_raster-3.so
@ -78,7 +76,6 @@ share/doc/postgresql/postgis/images/st_buffer11.png
share/doc/postgresql/postgis/images/st_buffer12.png
share/doc/postgresql/postgis/images/st_buffer13.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
@ -135,6 +132,9 @@ share/doc/postgresql/postgis/images/st_extrude04.png
share/doc/postgresql/postgis/images/st_generatepoints01.png
share/doc/postgresql/postgis/images/st_generatepoints02.png
share/doc/postgresql/postgis/images/st_geometricmedian01.png
share/doc/postgresql/postgis/images/st_hexagongrid01.png
share/doc/postgresql/postgis/images/st_hexagongrid02.png
share/doc/postgresql/postgis/images/st_hexagongrid03.png
share/doc/postgresql/postgis/images/st_invdistweight4ma_equation.png
share/doc/postgresql/postgis/images/st_issimple01.png
share/doc/postgresql/postgis/images/st_issimple02.png
@ -162,6 +162,10 @@ 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_makevalid01.png
share/doc/postgresql/postgis/images/st_makevalid02.png
share/doc/postgresql/postgis/images/st_makevalid03.png
share/doc/postgresql/postgis/images/st_makevalid04.png
share/doc/postgresql/postgis/images/st_mapalgebraexpr01.png
share/doc/postgresql/postgis/images/st_mapalgebraexpr02.png
share/doc/postgresql/postgis/images/st_mapalgebraexpr2_01.png
@ -179,6 +183,8 @@ share/doc/postgresql/postgis/images/st_mapalgebramask01.png
share/doc/postgresql/postgis/images/st_mapalgebramask02.png
share/doc/postgresql/postgis/images/st_mapalgebramask03.png
share/doc/postgresql/postgis/images/st_mapalgebramask04.png
share/doc/postgresql/postgis/images/st_maximuminscribedcircle01.png
share/doc/postgresql/postgis/images/st_maximuminscribedcircle02.png
share/doc/postgresql/postgis/images/st_minimumboundingcircle01.png
share/doc/postgresql/postgis/images/st_minkowskisum01.png
share/doc/postgresql/postgis/images/st_minkowskisum02.png
@ -237,29 +243,27 @@ share/doc/postgresql/postgis/images/warning.png
share/doc/postgresql/postgis/postgis.html
share/doc/postgresql/postgis/style.css
share/postgresql/contrib/
share/postgresql/contrib/postgis-3.0/
share/postgresql/contrib/postgis-3.0/legacy.sql
share/postgresql/contrib/postgis-3.0/legacy_gist.sql
share/postgresql/contrib/postgis-3.0/legacy_minimal.sql
share/postgresql/contrib/postgis-3.0/postgis.sql
share/postgresql/contrib/postgis-3.0/postgis_comments.sql
share/postgresql/contrib/postgis-3.0/postgis_proc_set_search_path.sql
share/postgresql/contrib/postgis-3.0/postgis_restore.pl
share/postgresql/contrib/postgis-3.0/postgis_upgrade.sql
share/postgresql/contrib/postgis-3.0/raster_comments.sql
share/postgresql/contrib/postgis-3.0/rtpostgis.sql
share/postgresql/contrib/postgis-3.0/rtpostgis_legacy.sql
share/postgresql/contrib/postgis-3.0/rtpostgis_proc_set_search_path.sql
share/postgresql/contrib/postgis-3.0/rtpostgis_upgrade.sql
share/postgresql/contrib/postgis-3.0/sfcgal_comments.sql
share/postgresql/contrib/postgis-3.0/spatial_ref_sys.sql
share/postgresql/contrib/postgis-3.0/topology.sql
share/postgresql/contrib/postgis-3.0/topology_comments.sql
share/postgresql/contrib/postgis-3.0/topology_upgrade.sql
share/postgresql/contrib/postgis-3.0/uninstall_legacy.sql
share/postgresql/contrib/postgis-3.0/uninstall_postgis.sql
share/postgresql/contrib/postgis-3.0/uninstall_rtpostgis.sql
share/postgresql/contrib/postgis-3.0/uninstall_topology.sql
share/postgresql/contrib/postgis-3.1/
share/postgresql/contrib/postgis-3.1/legacy.sql
share/postgresql/contrib/postgis-3.1/legacy_gist.sql
share/postgresql/contrib/postgis-3.1/legacy_minimal.sql
share/postgresql/contrib/postgis-3.1/postgis.sql
share/postgresql/contrib/postgis-3.1/postgis_comments.sql
share/postgresql/contrib/postgis-3.1/postgis_restore.pl
share/postgresql/contrib/postgis-3.1/postgis_upgrade.sql
share/postgresql/contrib/postgis-3.1/raster_comments.sql
share/postgresql/contrib/postgis-3.1/rtpostgis.sql
share/postgresql/contrib/postgis-3.1/rtpostgis_legacy.sql
share/postgresql/contrib/postgis-3.1/rtpostgis_upgrade.sql
share/postgresql/contrib/postgis-3.1/sfcgal_comments.sql
share/postgresql/contrib/postgis-3.1/spatial_ref_sys.sql
share/postgresql/contrib/postgis-3.1/topology.sql
share/postgresql/contrib/postgis-3.1/topology_comments.sql
share/postgresql/contrib/postgis-3.1/topology_upgrade.sql
share/postgresql/contrib/postgis-3.1/uninstall_legacy.sql
share/postgresql/contrib/postgis-3.1/uninstall_postgis.sql
share/postgresql/contrib/postgis-3.1/uninstall_rtpostgis.sql
share/postgresql/contrib/postgis-3.1/uninstall_topology.sql
share/postgresql/extension/address_standardizer--1.0--${V}.sql
share/postgresql/extension/address_standardizer--2.0.0--${V}.sql
share/postgresql/extension/address_standardizer--2.0.1--${V}.sql
@ -319,8 +323,11 @@ share/postgresql/extension/address_standardizer--2.5.5--${V}.sql
share/postgresql/extension/address_standardizer--3.0.0--${V}.sql
share/postgresql/extension/address_standardizer--3.0.1--${V}.sql
share/postgresql/extension/address_standardizer--3.0.2--${V}.sql
share/postgresql/extension/address_standardizer--3.0.3--${V}.sql
share/postgresql/extension/address_standardizer--${V}--${V}.sql
share/postgresql/extension/address_standardizer--${V}--${V}next.sql
share/postgresql/extension/address_standardizer--${V}.sql
share/postgresql/extension/address_standardizer--${V}dev--${V}.sql
share/postgresql/extension/address_standardizer--${V}next--${V}.sql
share/postgresql/extension/address_standardizer--ANY--${V}.sql
share/postgresql/extension/address_standardizer.control
@ -388,11 +395,15 @@ share/postgresql/extension/postgis--2.5.5--${V}.sql
share/postgresql/extension/postgis--3.0.0--${V}.sql
share/postgresql/extension/postgis--3.0.1--${V}.sql
share/postgresql/extension/postgis--3.0.2--${V}.sql
share/postgresql/extension/postgis--3.0.3--${V}.sql
share/postgresql/extension/postgis--${V}--${V}.sql
share/postgresql/extension/postgis--${V}--${V}next.sql
share/postgresql/extension/postgis--${V}.sql
share/postgresql/extension/postgis--${V}dev--${V}.sql
share/postgresql/extension/postgis--${V}next--${V}.sql
share/postgresql/extension/postgis--ANY--${V}.sql
share/postgresql/extension/postgis--unpackaged--${V}.sql
share/postgresql/extension/postgis--unpackaged.sql
share/postgresql/extension/postgis.control
share/postgresql/extension/postgis_raster--2.0.0--${V}.sql
share/postgresql/extension/postgis_raster--2.0.1--${V}.sql
@ -452,11 +463,15 @@ share/postgresql/extension/postgis_raster--2.5.5--${V}.sql
share/postgresql/extension/postgis_raster--3.0.0--${V}.sql
share/postgresql/extension/postgis_raster--3.0.1--${V}.sql
share/postgresql/extension/postgis_raster--3.0.2--${V}.sql
share/postgresql/extension/postgis_raster--3.0.3--${V}.sql
share/postgresql/extension/postgis_raster--${V}--${V}.sql
share/postgresql/extension/postgis_raster--${V}--${V}next.sql
share/postgresql/extension/postgis_raster--${V}.sql
share/postgresql/extension/postgis_raster--${V}dev--${V}.sql
share/postgresql/extension/postgis_raster--${V}next--${V}.sql
share/postgresql/extension/postgis_raster--ANY--${V}.sql
share/postgresql/extension/postgis_raster--unpackaged--${V}.sql
share/postgresql/extension/postgis_raster--unpackaged.sql
share/postgresql/extension/postgis_raster.control
share/postgresql/extension/postgis_tiger_geocoder--2.0.0--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.0.1--${V}.sql
@ -516,8 +531,11 @@ share/postgresql/extension/postgis_tiger_geocoder--2.5.5--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--3.0.0--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--3.0.1--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--3.0.2--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--3.0.3--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}--${V}next.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}dev--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}next--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--ANY--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--unpackaged--${V}.sql
@ -580,9 +598,13 @@ share/postgresql/extension/postgis_topology--2.5.5--${V}.sql
share/postgresql/extension/postgis_topology--3.0.0--${V}.sql
share/postgresql/extension/postgis_topology--3.0.1--${V}.sql
share/postgresql/extension/postgis_topology--3.0.2--${V}.sql
share/postgresql/extension/postgis_topology--3.0.3--${V}.sql
share/postgresql/extension/postgis_topology--${V}--${V}.sql
share/postgresql/extension/postgis_topology--${V}--${V}next.sql
share/postgresql/extension/postgis_topology--${V}.sql
share/postgresql/extension/postgis_topology--${V}dev--${V}.sql
share/postgresql/extension/postgis_topology--${V}next--${V}.sql
share/postgresql/extension/postgis_topology--ANY--${V}.sql
share/postgresql/extension/postgis_topology--unpackaged--${V}.sql
share/postgresql/extension/postgis_topology--unpackaged.sql
share/postgresql/extension/postgis_topology.control