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

Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 to CFLAGS/CXXFLAGS where

Browse Source 
appropriate in various devel/proj consumers to fix build with upcoming
proj 6 update, which will be commited in a month or so.

Thx to https://github.com/OSGeo/proj.4/wiki/proj.h-adoption-status for
linking the various upstream issues about it.
This commit is contained in:
landry 2019-04-16 20:13:09 +00:00
parent 86a1029472
commit 67f9b56af4
9 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comms/xastir/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2017/11/21 00:12:59 naddy Exp $
# $OpenBSD: Makefile,v 1.36 2019/04/16 20:13:09 landry Exp $
COMMENT= X amateur station tracking and info reporting
@ -26,6 +26,8 @@ MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
.if ${MACHINE} == "sparc64"
MAKE_FLAGS= CFLAGS="${CFLAGS} -fno-tree-ter"
.endif
# https://github.com/Xastir/Xastir/issues/47 proj 6
CONFIGURE_ENV += CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
CONFIGURE_ARGS= --with-shapelib \
--with-pcre \

5
geo/libosmium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2018/10/29 08:11:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2019/04/16 20:13:09 landry Exp $
COMMENT = fast, flexible library for working with OpenStreetMap data
@ -25,6 +25,9 @@ BUILD_DEPENDS = devel/boost \
geo/gdal \
geo/geos
# https://github.com/osmcode/libosmium/issues/277
CXXFLAGS+=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
# include/osmium/io/detail/opl_parser_functions.hpp
# #include <utf8.h>
RUN_DEPENDS = devel/utfcpp

7
geo/mapserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2019/02/23 09:00:19 landry Exp $
# $OpenBSD: Makefile,v 1.61 2019/04/16 20:13:09 landry Exp $
MULTI_PACKAGES= -utils -main -perl -python
@ -74,6 +74,11 @@ CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN} \
-DWITH_PYTHON=1 \
-DWITH_PERL=1
# https://github.com/mapserver/mapserver/issues/5766
# mapserver builds cpp and c files so both are needed..
CFLAGS+=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
CXXFLAGS+=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
#CONFIGURE_ARGS += -DPHP5_CONFIG_EXECUTABLE=${LOCALBASE}/bin/php-config-${MODPHP_VERSION} \
# -DWITH_PHP=1
PREFIX-main= ${VARBASE}/www

6
geo/merkaartor/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2019/03/08 20:00:46 cwen Exp $
# $OpenBSD: Makefile,v 1.37 2019/04/16 20:13:09 landry Exp $
COMMENT = OpenStreetMap editor
@ -36,6 +36,10 @@ WANTLIB += c gdal m proj quazip5 z ${COMPILER_LIBCXX}
# C++11
COMPILER = base-clang ports-gcc
# proj 6.0
# https://github.com/openstreetmap/merkaartor/issues/178
CXXFLAGS+= -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
#generate the .qm files from the .ts files before configure runs
pre-configure:
cd ${WRKSRC} && lrelease-qt5 src/src.pro

4
geo/osm2pgsql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2018/12/13 19:53:24 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2019/04/16 20:13:09 landry Exp $
COMMENT = OSM data to PostgreSQL converter
@ -45,10 +45,12 @@ MODPY_ADJ_FILES = tests/regression-test.py
MODLUA_VERSION = 5.2
MODLUA_SA = Yes
# https://github.com/openstreetmap/osm2pgsql/issues/922 for proj6
CONFIGURE_ARGS = -DBUILD_TESTS=ON \
-DEXTERNAL_LIBOSMIUM=ON \
-DEXTERNAL_PROTOZERO=ON \
-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/utfcpp \
-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 \
${CXXFLAGS}"
# bump postgresql,-server limits according to its README otherwise some

5
geo/qlandkartegt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2019/03/18 13:09:28 cwen Exp $
# $OpenBSD: Makefile,v 1.31 2019/04/16 20:13:09 landry Exp $
COMMENT = garmin GPS map management tool
@ -31,7 +31,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
geo/garmindev \
geo/gpsbabel
CONFIGURE_ARGS = -DQK_QT5_PORT=No
CONFIGURE_ARGS = -DQK_QT5_PORT=No \
-DCMAKE_CXX_FLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
post-extract:
@find ${WRKDIST} -name *.orig -exec rm {} \;

5
geo/spatialite/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.4 2016/04/09 23:38:55 naddy Exp $
# $OpenBSD: Makefile.inc,v 1.5 2019/04/16 20:13:09 landry Exp $
CATEGORIES ?= geo
@ -12,7 +12,8 @@ CONFIGURE_STYLE ?= gnu
# libpng header needed by gaiagraphics & librasterlite
# lt_cv_dlopen_libs= needed by libspatialite
CONFIGURE_ENV ?= CPPFLAGS="-I${LOCALBASE}/include" \
# 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" \
LDFLAGS="-L${LOCALBASE}/lib" lt_cv_dlopen_libs=
LIBTOOL_FLAGS ?= --tag=disable-static

4
geo/spatialite/gis/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2019/01/02 12:44:07 jca Exp $
# $OpenBSD: Makefile,v 1.13 2019/04/16 20:13:09 landry Exp $
COMMENT = minimalistic GIS on top of spatialite and rasterlite
PROJECT = spatialite_gis
@ -28,6 +28,8 @@ WANTLIB += xcb xcb-render xcb-shm xml2 z
COMPILER = base-clang ports-gcc base-gcc
MAKE_ENV = CXXFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
${INSTALL_DATA} ${WRKSRC}/gnome_resource/*.desktop ${PREFIX}/share/applications/

4
geo/spatialite/gui/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2019/01/08 19:13:56 landry Exp $
# $OpenBSD: Makefile,v 1.15 2019/04/16 20:13:09 landry Exp $
COMMENT = GUI for spatialite
DISTNAME = spatialite_gui-1.7.1
@ -28,7 +28,7 @@ WANTLIB += xcb xcb-render xcb-shm xml2 z
COMPILER = base-clang ports-gcc base-gcc
# so that it finds all libs without rpath..
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
post-install: