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

Update to mapserver 7.6.0.

Browse Source 
See https://mapserver.org/development/announce/7-6.html#announce-7-6
This commit is contained in:
landry 2020-05-14 13:57:03 +00:00
parent 1047190abd
commit 3463055364
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
geo/mapserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.72 2020/03/23 11:46:20 landry Exp $
# $OpenBSD: Makefile,v 1.73 2020/05/14 13:57:03 landry Exp $
MULTI_PACKAGES= -utils -main -perl -php -python
@ -8,7 +8,7 @@ COMMENT-php= PHP Mapscript extension
COMMENT-perl= Perl Mapscript binding
COMMENT-python= Python Mapscript binding
V = 7.4.4
V = 7.6.0
DISTNAME= mapserver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}
@ -16,7 +16,7 @@ PKGNAME-php= php-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
PKGNAME-python= py3-mapscript-${V}
SHARED_LIBS += mapserver 4.0
SHARED_LIBS += mapserver 5.0
CATEGORIES= geo www
@ -81,11 +81,6 @@ 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 += -DPHP_CONFIG_EXECUTABLE=${LOCALBASE}/bin/php-config-${MODPHP_VERSION} \
-DWITH_PHPNG=1
PREFIX-main= ${VARBASE}/www

4
geo/mapserver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mapserver-7.4.4.tar.gz) = YThXRrSndV1g7+m7YeQe7pDJED9vpPu8AtH5k926F9g=
SIZE (mapserver-7.4.4.tar.gz) = 2690001
SHA256 (mapserver-7.6.0.tar.gz) = EjgHN85x14Ug3arZDRVip+MhQ2rXjUY5I5mQMKA7S9o=
SIZE (mapserver-7.6.0.tar.gz) = 2713965

8
geo/mapserver/patches/patch-CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.8 2019/05/23 19:24:47 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.9 2020/05/14 13:57:03 landry Exp $
Ensure it uses our FindIconv.cmake module
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -383,9 +383,9 @@ find_package(Freetype)
@@ -400,9 +400,9 @@ find_package(Freetype)
if(NOT FREETYPE_FOUND)
report_mandatory_not_found(FREETYPE)
endif(NOT FREETYPE_FOUND)
@ -14,8 +14,8 @@ Index: CMakeLists.txt
+list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
if(WITH_PROJ)
@@ -462,7 +462,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
find_package(Proj)
@@ -472,7 +472,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
if(WITH_ICONV)

4
geo/mapserver/pkg/PLIST-perl
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-perl,v 1.5 2020/01/02 14:54:04 landry Exp $
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
@comment $OpenBSD: PLIST-perl,v 1.6 2020/05/14 13:57:03 landry Exp $
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/mapscript/
@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/mapscript/mapscript.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/mapscript.pm

4
geo/mapserver/pkg/PLIST-python
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-python,v 1.4 2020/01/02 14:54:04 landry Exp $
@comment $OpenBSD: PLIST-python,v 1.5 2020/05/14 13:57:03 landry Exp $
lib/python${MODPY_VERSION}/site-packages/mapscript/
lib/python${MODPY_VERSION}/site-packages/mapscript-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/mapscript-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -29,6 +29,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}class_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}clone_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}cluster_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}color_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}font_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}hash_test.${MODPY_PYC_MAGIC_TAG}pyc
@ -55,6 +56,7 @@ lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}thread_
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}zoom_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/class_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/clone_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/cluster_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/color_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/cities.csv