hi, after years of being moribund and not seeing much development, spatialite gained some traction again and got new releases this summer. Upstream umbrella (https://www.gaia-gis.it/gaia-sins/index.html) provides several projects, some have been discontinued.
The below diff unlinks - geo/spatialite/librewms (superseded by spatialite-gui) - geo/spatialite/gis (superseded by spatialite-gui) - geo/spatialite/librasterlite (superseded by librasterlite2, only used by spatialite-gis)) - geo/spatialite/libgaiagraphics (superseded by librasterite2, unused) and adds geo/spatialite/virtualpg, which is a new dependency for spatialite-gui. Spatialite-GUI can also support libxlsxwriter (https://libxlsxwriter.github.io/) to access xls/csv datasets but we dont have a port for it (yet?), so some patches from an upstream ticket are added to fix the build. spatialite update itself depends on the new ports for minizip & librttopo that i've recently posted, and the consumers of spatialite (postgis, qgis, gdal) will probably need some WANTLIB tweaks. Looking for oks to import virtualpg, but they're welcome for the complete diff too :) Landry
virtualpg-2.0.0.tgz
Description: application/tar-gz
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/spatialite/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 2 Sep 2014 09:26:12 -0000 1.2
+++ Makefile 6 Oct 2020 07:55:41 -0000
@@ -2,14 +2,11 @@
SUBDIR =
SUBDIR += freexl
- SUBDIR += gis
SUBDIR += gui
- SUBDIR += libgaiagraphics
- SUBDIR += librasterlite
SUBDIR += librasterlite2
- SUBDIR += librewms
SUBDIR += libspatialite
SUBDIR += readosm
SUBDIR += tools
+ SUBDIR += virtualpg
.include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/geo/spatialite/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- Makefile.inc 13 Jul 2019 10:59:26 -0000 1.6
+++ Makefile.inc 6 Oct 2020 07:55:41 -0000
@@ -10,10 +10,9 @@
CONFIGURE_STYLE ?= gnu
-# libpng header needed by gaiagraphics & librasterlite
# lt_cv_dlopen_libs= needed by libspatialite
# https://www.gaia-gis.it/fossil/libspatialite/info/6eabdf0e6d3520a7 for proj
6.0.0
-CONFIGURE_ENV ?= CPPFLAGS="-I${LOCALBASE}/include
-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
+CONFIGURE_ENV ?= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" lt_cv_dlopen_libs=
LIBTOOL_FLAGS ?= --tag=disable-static
Index: gui/Makefile
===================================================================
RCS file: /cvs/ports/geo/spatialite/gui/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- gui/Makefile 17 May 2019 16:45:26 -0000 1.16
+++ gui/Makefile 6 Oct 2020 07:55:41 -0000
@@ -1,21 +1,24 @@
# $OpenBSD: Makefile,v 1.16 2019/05/17 16:45:26 sthen Exp $
COMMENT = GUI for spatialite
-DISTNAME = spatialite_gui-1.7.1
+DISTNAME = spatialite_gui-2.1.0-beta1
+PKGNAME = spatialite_gui-2.1.0beta1
PROJECT = spatialite_gui
-REVISION = 9
+MASTER_SITES = http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/
LIB_DEPENDS += x11/wxWidgets>=3.0.4 \
databases/sqlite3 \
- geo/spatialite/libspatialite \
- geo/spatialite/libgaiagraphics
-RUN_DEPENDS += devel/desktop-file-utils
+ geo/spatialite/libspatialite>=5.0.0rc1 \
+ geo/spatialite/librasterlite2>=1.1.0beta1 \
+ geo/spatialite/virtualpg
+RUN_DEPENDS += devel/desktop-file-utils \
+ x11/gtk+3,-guic
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
-WANTLIB += dbus-1 epoxy expat ffi fontconfig freetype freexl fribidi
-WANTLIB += gaiagraphics gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff
+WANTLIB += atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
+WANTLIB += epoxy expat ffi fontconfig freetype freexl fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl jpeg lzma m mspack
WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
@@ -24,13 +27,16 @@
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0
WANTLIB += xcb xcb-render xcb-shm xml2 z
+WANTLIB += Xss bz2 charset crypto curl gif lz4 minizip nghttp2
+WANTLIB += openjp2 pq rasterlite2 rttopo ssl virtualpg webp zstd
COMPILER = base-clang ports-gcc base-gcc
# so that it finds all libs without rpath..
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include
-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ARGS += --disable-xlsxwriter
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
${INSTALL_DATA} ${WRKSRC}/gnome_resource/*.desktop
${PREFIX}/share/applications/
Index: gui/distinfo
===================================================================
RCS file: /cvs/ports/geo/spatialite/gui/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- gui/distinfo 26 Aug 2014 19:02:54 -0000 1.2
+++ gui/distinfo 6 Oct 2020 07:55:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (spatialite_gui-1.7.1.tar.gz) =
y5yx7ef4Ol/F9SyDQ35VarnLVNas48VF0xsxf9NvBeQ=
-SIZE (spatialite_gui-1.7.1.tar.gz) = 1090178
+SHA256 (spatialite_gui-2.1.0-beta1.tar.gz) =
2hmUdTmh2GRbPjmGe2bXNIMClVM79Vj8wMEXAJwfTpk=
+SIZE (spatialite_gui-2.1.0-beta1.tar.gz) = 2018899
Index: gui/patches/patch-Main_cpp
===================================================================
RCS file: gui/patches/patch-Main_cpp
diff -N gui/patches/patch-Main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/patches/patch-Main_cpp 6 Oct 2020 07:55:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+disable builtin update check
+
+Index: Main.cpp
+--- Main.cpp.orig
++++ Main.cpp
+@@ -110,7 +110,6 @@ IMPLEMENT_APP(MyApp)
+ frame->Show(true);
+ SetTopWindow(frame);
+ frame->LoadConfig(path);
+- frame->CheckUpdates();
+ return true;
+ }
+
Index: gui/patches/patch-ResultSetView_cpp
===================================================================
RCS file: gui/patches/patch-ResultSetView_cpp
diff -N gui/patches/patch-ResultSetView_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/patches/patch-ResultSetView_cpp 6 Oct 2020 07:55:41 -0000
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+https://www.gaia-gis.it/fossil/spatialite_gui/info/de78c7158e87e94d
+
+Index: ResultSetView.cpp
+--- ResultSetView.cpp.orig
++++ ResultSetView.cpp
+@@ -185,8 +185,10 @@ wxPanel(parent, id, wxDefaultPosition, wxSize(440, 80)
+ (wxObjectEventFunction) & MyResultSetView::OnCmdExpSylk);
+ Connect(Grid_ExpDbf, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyResultSetView::OnCmdExpDbf);
++#ifdef ENABLE_XLSXWRITER
+ Connect(Grid_ExpXlsx, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyResultSetView::OnCmdExpXlsx);
++#endif
+ Connect(Grid_Filter, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyResultSetView::OnCmdFilter);
+ Connect(Grid_MapShow, wxEVT_COMMAND_MENU_SELECTED,
+@@ -1976,10 +1978,12 @@ done:
+ exportMenu->Append(menuItem);
+ menuItem = new wxMenuItem(exportMenu, Grid_ExpDbf, wxT("as &DBF archive"));
+ exportMenu->Append(menuItem);
++#ifdef ENABLE_XLSXWRITER
+ menuItem =
+ new wxMenuItem(exportMenu, Grid_ExpXlsx,
+ wxT("as MS &Excell Spreadsheet (XLSX)"));
+ exportMenu->Append(menuItem);
++#endif
+ menu.AppendSubMenu(exportMenu, wxT("&Export ResultSet"));
+ menu.AppendSeparator();
+ if (MainFrame->IsValidSqlFilter() == true)
+@@ -3670,6 +3674,7 @@ void MyResultSetView::OnCmdExpDbf(wxCommandEvent & WXU
+ }
+ }
+
++#ifdef ENABLE_XLSXWRITER
+ void MyResultSetView::OnCmdExpXlsx(wxCommandEvent & WXUNUSED(event))
+ {
+ //
+@@ -3705,3 +3710,4 @@ void MyResultSetView::OnCmdExpXlsx(wxCommandEvent & WX
+ ::wxEndBusyCursor();
+ }
+ }
++#endif
Index: gui/patches/patch-TableTree_cpp
===================================================================
RCS file: gui/patches/patch-TableTree_cpp
diff -N gui/patches/patch-TableTree_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/patches/patch-TableTree_cpp 6 Oct 2020 07:55:41 -0000
@@ -0,0 +1,83 @@
+$OpenBSD$
+
+https://www.gaia-gis.it/fossil/spatialite_gui/info/de78c7158e87e94d
+
+Index: TableTree.cpp
+--- TableTree.cpp.orig
++++ TableTree.cpp
+@@ -317,8 +317,10 @@ MyTableTree::MyTableTree(MyFrame * parent, wxWindowID
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpSylk);
+ Connect(Tree_DumpDbf, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpDbf);
++#ifdef ENABLE_XLSXWRITER
+ Connect(Tree_DumpXlsx, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpXlsx);
++#endif
+ Connect(Tree_DumpPostGIS, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpPostGIS);
+ Connect(Tree_Edit, wxEVT_COMMAND_MENU_SELECTED,
+@@ -3091,9 +3093,11 @@ void MyTableTree::DoMainTableContextMenu(wxPoint & pt,
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX
Spreadsheet"));
+ menu.Append(menuItem);
++#endif
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -3164,9 +3168,11 @@ void MyTableTree::DoMainViewContextMenu(wxPoint & pt,
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX
Spreadsheet"));
+ menu.Append(menuItem);
++#endif
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -3243,9 +3249,11 @@ void MyTableTree::DoAttachedTableContextMenu(wxPoint &
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX
Spreadsheet"));
+ menu.Append(menuItem);
++#endif
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -3294,9 +3302,11 @@ void MyTableTree::DoAttachedViewContextMenu(wxPoint &
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX
Spreadsheet"));
+ menu.Append(menuItem);
++#endif
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -7300,6 +7310,7 @@ void MyTableTree::OnCmdDumpDbf(wxCommandEvent & WXUNUS
+ }
+ }
+
++#ifdef ENABLE_XLSXWRITER
+ void MyTableTree::OnCmdDumpXlsx(wxCommandEvent & WXUNUSED(event))
+ {
+ //
+@@ -7338,7 +7349,7 @@ void MyTableTree::OnCmdDumpXlsx(wxCommandEvent & WXUNU
+ ::wxEndBusyCursor();
+ }
+ }
+-
++#endif
+ void MyTableTree::OnCmdDumpPostGIS(wxCommandEvent & WXUNUSED(event))
+ {
+ //
Index: gui/patches/patch-configure
===================================================================
RCS file: gui/patches/patch-configure
diff -N gui/patches/patch-configure
--- gui/patches/patch-configure 2 Jan 2019 12:44:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2019/01/02 12:44:07 jca Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -15543,7 +15543,7 @@ if test x$WX_CONFIG == xnot_found; then
- fi
- CXXFLAGS="$(wx-config --cxxflags)"
- AM_CXXFLAGS="$(wx-config --cxxflags)"
--WX_LIBS="$(wx-config --libs)"
-+WX_LIBS="$(wx-config --libs std,aui)"
-
-
- # Checks for header files.
Index: gui/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/spatialite/gui/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- gui/pkg/PLIST 27 Jun 2018 21:03:52 -0000 1.2
+++ gui/pkg/PLIST 6 Oct 2020 07:55:41 -0000
@@ -1,6 +1,32 @@
@comment $OpenBSD: PLIST,v 1.2 2018/06/27 21:03:52 espie Exp $
@bin bin/spatialite_gui
share/applications/spatialite-gui.desktop
+share/icons/hicolor/128x128/apps/spatialite-gui.png
+share/icons/hicolor/16x16/apps/spatialite-gui.png
+share/icons/hicolor/192x192/apps/spatialite-gui.png
+share/icons/hicolor/22x22/apps/spatialite-gui.png
+share/icons/hicolor/24x24/apps/spatialite-gui.png
+share/icons/hicolor/256x256/apps/spatialite-gui.png
+share/icons/hicolor/32x32/apps/spatialite-gui.png
+share/icons/hicolor/36x36/apps/spatialite-gui.png
+share/icons/hicolor/40x40/
+share/icons/hicolor/40x40/apps/
+share/icons/hicolor/40x40/apps/spatialite-gui.png
+share/icons/hicolor/42x42/
+share/icons/hicolor/42x42/apps/
+share/icons/hicolor/42x42/apps/spatialite-gui.png
+share/icons/hicolor/48x48/apps/spatialite-gui.png
+share/icons/hicolor/512x512/apps/spatialite-gui.png
+share/icons/hicolor/64x64/apps/spatialite-gui.png
+share/icons/hicolor/72x72/apps/spatialite-gui.png
+share/icons/hicolor/80x80/
+share/icons/hicolor/80x80/apps/
+share/icons/hicolor/80x80/apps/spatialite-gui.png
+share/icons/hicolor/8x8/
+share/icons/hicolor/8x8/apps/
+share/icons/hicolor/8x8/apps/spatialite-gui.png
+share/icons/hicolor/96x96/apps/spatialite-gui.png
share/pixmaps/
share/pixmaps/spatialite-gui.png
@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
Index: librasterlite2/Makefile
===================================================================
RCS file: /cvs/ports/geo/spatialite/librasterlite2/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- librasterlite2/Makefile 24 Oct 2018 14:28:04 -0000 1.10
+++ librasterlite2/Makefile 6 Oct 2020 07:55:41 -0000
@@ -2,23 +2,27 @@
COMMENT = store rasters coverages within spatialite
PROJECT = librasterlite2
-DISTNAME = ${PROJECT}-1.0.0-rc0
-PKGNAME = ${PROJECT}-1.0.0rc0
-REVISION = 6
+DISTNAME = ${PROJECT}-1.1.0-beta1
+PKGNAME = ${DISTNAME:S/-beta/beta/}
SHARED_LIBS += rasterlite2 0.0 # 1.0
+MASTER_SITES = http://www.gaia-gis.it/gaia-sins/librasterlite2-sources/
-LIB_DEPENDS += geo/spatialite/libspatialite>=4.1.0 \
+LIB_DEPENDS += geo/spatialite/libspatialite>=5.0.0rc1 \
+ geo/librttopo \
+ graphics/openjp2 \
databases/sqlite3 \
archivers/xz \
+ archivers/minizip \
net/curl \
graphics/cairo \
graphics/libwebp \
devel/geotiff
WANTLIB += X11 Xext Xrender c cairo crypto curl expat fontconfig
-WANTLIB += freetype freexl geos geos_c geotiff gif iconv intl jpeg lzma m
+WANTLIB += freetype freexl geos geos_c geotiff gif iconv jpeg lzma m
WANTLIB += nghttp2 pixman-1 png proj pthread spatialite sqlite3
WANTLIB += ssl ${COMPILER_LIBCXX} tiff webp xcb xcb-render xcb-shm xml2 z
+WANTLIB += bz2 charset lz4 minizip openjp2 rttopo zstd
COMPILER = base-clang ports-gcc base-gcc
Index: librasterlite2/distinfo
===================================================================
RCS file: /cvs/ports/geo/spatialite/librasterlite2/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- librasterlite2/distinfo 2 Sep 2014 09:24:23 -0000 1.1.1.1
+++ librasterlite2/distinfo 6 Oct 2020 07:55:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (librasterlite2-1.0.0-rc0.tar.gz) =
jd+OdkDswlkYBKl8x49UJjNi5n64rzCJ8BTcBYBg708=
-SIZE (librasterlite2-1.0.0-rc0.tar.gz) = 16400254
+SHA256 (librasterlite2-1.1.0-beta1.tar.gz) =
H4FZ3ZNi8y+Z2/9KpYkOaVIR+2RY0YoDBGbuZytEMjk=
+SIZE (librasterlite2-1.1.0-beta1.tar.gz) = 17857681
Index: librasterlite2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/spatialite/librasterlite2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- librasterlite2/pkg/PLIST 2 Sep 2014 09:24:23 -0000 1.1.1.1
+++ librasterlite2/pkg/PLIST 6 Oct 2020 07:55:41 -0000
@@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2014/09/02 09:24:23 landry Exp $
+@bin bin/rl2sniff
@bin bin/rl2tool
@bin bin/wmslite
include/rasterlite2/
include/rasterlite2/rasterlite2.h
include/rasterlite2/rl2graphics.h
+include/rasterlite2/rl2mapconfig.h
include/rasterlite2/rl2svg.h
include/rasterlite2/rl2tiff.h
include/rasterlite2/rl2wms.h
@@ -11,5 +13,5 @@
lib/librasterlite2.la
@lib lib/librasterlite2.so.${LIBrasterlite2_VERSION}
@comment lib/mod_rasterlite2.la
-lib/mod_rasterlite2.so
+@so lib/mod_rasterlite2.so
lib/pkgconfig/rasterlite2.pc
Index: libspatialite/Makefile
===================================================================
RCS file: /cvs/ports/geo/spatialite/libspatialite/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- libspatialite/Makefile 24 Oct 2018 14:28:04 -0000 1.11
+++ libspatialite/Makefile 6 Oct 2020 07:55:41 -0000
@@ -2,18 +2,21 @@
COMMENT= sqlite extented with spatial SQL capabilities
PROJECT = libspatialite
-DISTNAME = ${PROJECT}-4.3.0a
-SHARED_LIBS = spatialite 1.1 # 8.0.1
-REVISION = 2
+DISTNAME = ${PROJECT}-5.0.0
+SHARED_LIBS = spatialite 1.2 # 8.1
+
+CONFIGURE_ARGS += --enable-rttopo --enable-gcp #required by spatialite_gui
LIB_DEPENDS += converters/libiconv \
+ archivers/minizip \
databases/sqlite3 \
geo/spatialite/freexl \
+ geo/librttopo \
textproc/libxml \
geo/geos>=3.4.0 \
devel/proj
-WANTLIB += freexl geos geos_c iconv m proj pthread sqlite3 ${COMPILER_LIBCXX}
xml2 lzma z
+WANTLIB += bz2 charset freexl geos geos_c iconv m minizip proj pthread rttopo
sqlite3 ${COMPILER_LIBCXX} xml2 lzma z
COMPILER = base-clang ports-gcc base-gcc
Index: libspatialite/distinfo
===================================================================
RCS file: /cvs/ports/geo/spatialite/libspatialite/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- libspatialite/distinfo 18 Sep 2015 09:47:54 -0000 1.3
+++ libspatialite/distinfo 6 Oct 2020 07:55:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (libspatialite-4.3.0a.tar.gz) =
iJAAMKR2KQSniAJz8pLl6MprFbfGw/uI/6nmfuilpJk=
-SIZE (libspatialite-4.3.0a.tar.gz) = 4440660
+SHA256 (libspatialite-5.0.0.tar.gz) =
e3/XAkP1oLF1aW2HxG3eCs4DDqzCfzkkHCS6xd+sbaw=
+SIZE (libspatialite-5.0.0.tar.gz) = 6741184
Index: libspatialite/patches/patch-src_Makefile_in
===================================================================
RCS file:
/cvs/ports/geo/spatialite/libspatialite/patches/patch-src_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-src_Makefile_in
--- libspatialite/patches/patch-src_Makefile_in 18 Sep 2015 09:47:54 -0000
1.3
+++ libspatialite/patches/patch-src_Makefile_in 6 Oct 2020 07:55:41 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2015/09/18 09:47:54 landry Exp $
---- src/Makefile.in.orig Fri Sep 18 00:09:49 2015
-+++ src/Makefile.in Fri Sep 18 00:11:51 2015
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
@@ -90,10 +90,10 @@ build_triplet = @build@
host_triplet = @host@
@MINGW_TRUE@am__append_1 = -lm
@@ -14,9 +15,9 @@
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-@@ -448,7 +448,7 @@ mod_spatialite_la_LIBADD = ./gaiaaux/gaiaaux.la ./gaia
- mod_spatialite_la_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/src/headers -I. \
- -DLOADABLE_EXTENSION
+@@ -467,7 +467,7 @@ mod_spatialite_la_LIBADD = ./gaiaaux/gaiaaux.la ./gaia
+ mod_spatialite_la_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ \
+ -I$(top_srcdir)/src/headers -I. -DLOADABLE_EXTENSION
mod_spatialite_la_LIBTOOLFLAGS = --tag=disable-static
-@ANDROID_FALSE@@MINGW_FALSE@mod_spatialite_la_LDFLAGS = -module -version-info
8:0:1
+@ANDROID_FALSE@@MINGW_FALSE@mod_spatialite_la_LDFLAGS = -module -avoid-version
Index: libspatialite/patches/patch-src_shapefiles_shapefiles_c
===================================================================
RCS file: libspatialite/patches/patch-src_shapefiles_shapefiles_c
diff -N libspatialite/patches/patch-src_shapefiles_shapefiles_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libspatialite/patches/patch-src_shapefiles_shapefiles_c 6 Oct 2020
07:55:41 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+only include minizip header if enabled
+
+Index: src/shapefiles/shapefiles.c
+--- src/shapefiles/shapefiles.c.orig
++++ src/shapefiles/shapefiles.c
+@@ -79,7 +79,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
+ #endif
+ #endif
+
++#ifdef ENABLE_MINIZIP /* MINIZIP is enabled */
+ #include <minizip/unzip.h>
++#endif
+
+ #if defined(_WIN32) && !defined(__MINGW32__)
+ #define strcasecmp _stricmp
Index: libspatialite/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/spatialite/libspatialite/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- libspatialite/pkg/PLIST 18 Sep 2015 09:47:54 -0000 1.4
+++ libspatialite/pkg/PLIST 6 Oct 2020 07:55:41 -0000
@@ -3,10 +3,13 @@
include/spatialite.h
include/spatialite/control_points.h
include/spatialite/debug.h
+include/spatialite/gaia_network.h
+include/spatialite/gaia_topology.h
include/spatialite/gaiaaux.h
include/spatialite/gaiaexif.h
include/spatialite/gaiageo.h
include/spatialite/gaiamatrix.h
+include/spatialite/geojson.h
include/spatialite/geopackage.h
include/spatialite/gg_advanced.h
include/spatialite/gg_const.h
@@ -15,13 +18,15 @@
include/spatialite/gg_dynamic.h
include/spatialite/gg_formats.h
include/spatialite/gg_mbr.h
+include/spatialite/gg_sequence.h
include/spatialite/gg_structs.h
include/spatialite/gg_wfs.h
include/spatialite/gg_xml.h
include/spatialite/spatialite.h
include/spatialite/sqlite.h
+include/spatialite/stored_procedures.h
lib/libspatialite.la
@lib lib/libspatialite.so.${LIBspatialite_VERSION}
@comment lib/mod_spatialite.la
-lib/mod_spatialite.so
+@so lib/mod_spatialite.so
lib/pkgconfig/spatialite.pc
Index: tools/Makefile
===================================================================
RCS file: /cvs/ports/geo/spatialite/tools/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- tools/Makefile 24 Oct 2018 14:28:05 -0000 1.10
+++ tools/Makefile 6 Oct 2020 07:55:41 -0000
@@ -2,16 +2,16 @@
COMMENT = CLI tools for spatialite
PROJECT = spatialite-tools
-DISTNAME = ${PROJECT}-4.3.0
-REVISION = 2
+DISTNAME = ${PROJECT}-5.0.0
LIB_DEPENDS += converters/libiconv \
databases/sqlite3 \
- geo/spatialite/libspatialite>=4.3.0 \
+ geo/spatialite/libspatialite>=5.0.0 \
geo/spatialite/readosm
WANTLIB += c curses expat freexl geos geos_c iconv lzma m proj pthread
WANTLIB += readline readosm spatialite sqlite3 ${COMPILER_LIBCXX} xml2 z
+WANTLIB += bz2 charset minizip rttopo
COMPILER = base-clang ports-gcc base-gcc
Index: tools/distinfo
===================================================================
RCS file: /cvs/ports/geo/spatialite/tools/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- tools/distinfo 18 Sep 2015 09:48:26 -0000 1.3
+++ tools/distinfo 6 Oct 2020 07:55:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (spatialite-tools-4.3.0.tar.gz) =
9zmFm8BPOHNVkb4vdQCbmKI1kDNnWuMQ3/wxFKF8z4k=
-SIZE (spatialite-tools-4.3.0.tar.gz) = 540811
+SHA256 (spatialite-tools-5.0.0.tar.gz) =
rQktkMyyxIDzctHiSx5q2aqKS7dQ4JTv3MbDfttrbTI=
+SIZE (spatialite-tools-5.0.0.tar.gz) = 591215
