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

Update to mapserver 7.4.0.

Browse Source 
Reenable php bindings via phpmapscriptng.
This commit is contained in:
landry 2019-05-23 19:24:47 +00:00
parent 855ca7034a
commit a44e15b350
7 changed files with 142 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
geo/mapserver/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.63 2019/05/17 16:45:26 sthen Exp $
# $OpenBSD: Makefile,v 1.64 2019/05/23 19:24:47 landry Exp $
MULTI_PACKAGES= -utils -main -perl -python
MULTI_PACKAGES= -utils -main -perl -php -python
COMMENT-main= GIS CGI server
COMMENT-utils= mapserver utilities
@ -8,18 +8,14 @@ COMMENT-php= PHP Mapscript extension
COMMENT-perl= Perl Mapscript binding
COMMENT-python= Python Mapscript binding
V = 7.2.2
V = 7.4.0
DISTNAME= mapserver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}
PKGNAME-php= php-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
PKGNAME-python= py3-mapscript-${V}
SHARED_LIBS += mapserver 3.0
REVISION-main= 1
REVISION-perl= 1
REVISION-python=1
REVISION-utils= 1
SHARED_LIBS += mapserver 4.0
CATEGORIES= geo www
@ -34,10 +30,8 @@ MASTER_SITES= http://download.osgeo.org/mapserver/
COMPILER = base-clang ports-gcc base-gcc
MODULES= lang/python devel/cmake
MODULES= lang/php lang/python devel/cmake
MODPHP_RUNDEP= No
#notyet, cf https://github.com/mapserver/mapserver/issues/5252
#MODPHP_VERSION= 7.0
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
CONFIGURE_STYLE=cmake
@ -53,21 +47,18 @@ LIB_DEPENDS= devel/proj \
graphics/cairo \
geo/gdal \
geo/geos \
graphics/giflib \
graphics/giflib
LIB_DEPENDS-main= ${LIB_DEPENDS} \
www/fcgi
WANTLIB += curl freetype jpeg m png pq xml2 z proj
WANTLIB += gdal geos_c cairo fribidi gif harfbuzz protobuf-c
LIB_DEPENDS-utils = STEM->=${V}:${BUILD_PKGPATH},-main
LIB_DEPENDS-php = STEM->=${V}:${BUILD_PKGPATH},-main
LIB_DEPENDS-perl = STEM->=${V}:${BUILD_PKGPATH},-main
LIB_DEPENDS-python = STEM->=${V}:${BUILD_PKGPATH},-main
WANTLIB-main = ${WANTLIB} c fcgi pthread ${COMPILER_LIBCXX}
WANTLIB-utils = ${WANTLIB} c mapserver
WANTLIB-php = ${WANTLIB} mapserver
WANTLIB-perl = ${WANTLIB} c mapserver perl
WANTLIB-python = ${WANTLIB} mapserver ${MODPY_WANTLIB}
WANTLIB-utils = ${WANTLIB} c
WANTLIB-php = ${WANTLIB}
WANTLIB-perl = ${WANTLIB} c perl
WANTLIB-python = ${WANTLIB} ${MODPY_WANTLIB}
CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN} \
-DWITH_CLIENT_WFS=1 \
@ -83,8 +74,8 @@ CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN} \
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
CONFIGURE_ARGS += -DPHP_CONFIG_EXECUTABLE=${LOCALBASE}/bin/php-config-${MODPHP_VERSION} \
-DWITH_PHPNG=1
PREFIX-main= ${VARBASE}/www
SUBST_VARS+= PREFIX-main VARBASE
@ -94,14 +85,14 @@ post-extract:
post-install:
${INSTALL_DATA_DIR} ${WRKINST}/${PREFIX-main}/cgi-bin
# ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${MODPHP_VERSION}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${MODPHP_VERSION}
${INSTALL_PROGRAM} ${PREFIX}/bin/mapserv ${WRKINST}/${PREFIX-main}/cgi-bin
# echo "; Enable Mapscript extension module\nextension=php_mapscript.so" \
# > ${PREFIX}/share/examples/php-${MODPHP_VERSION}/mapscript.ini
echo "; Enable Mapscript extension module\nextension=php_mapscriptng.so" \
> ${PREFIX}/share/examples/php-${MODPHP_VERSION}/mapscriptng.ini
.for l in perl python
.for l in perl
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mapserver/${l}
${INSTALL_DATA} ${WRKSRC}/mapscript/${l}/examples/* \
${PREFIX}/share/examples/mapserver/${l}

4
geo/mapserver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mapserver-7.2.2.tar.gz) = KH+N/hCWG8aFu4fhGLeqgTgt+Qeys5YdZVkWm1J7qVw=
SIZE (mapserver-7.2.2.tar.gz) = 2677800
SHA256 (mapserver-7.4.0.tar.gz) = /HFPWDYCP9OQBSlmZcViAi+ilDSOzCRLk2R7O6HjYfU=
SIZE (mapserver-7.4.0.tar.gz) = 2686054

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

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.7 2018/08/05 07:22:59 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.8 2019/05/23 19:24:47 landry Exp $
Ensure it uses our FindIconv.cmake module
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -378,9 +378,9 @@ find_package(Freetype)
@@ -383,9 +383,9 @@ find_package(Freetype)
if(NOT FREETYPE_FOUND)
report_mandatory_not_found(FREETYPE)
endif(NOT FREETYPE_FOUND)
@ -15,7 +15,7 @@ Index: CMakeLists.txt
if(WITH_PROJ)
@@ -457,7 +457,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
@@ -462,7 +462,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
if(WITH_ICONV)

9
geo/mapserver/pkg/PLIST-php
View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST-php,v 1.7 2018/09/04 12:46:14 espie Exp $
lib/php-${MODPHP_VERSION}/modules/
lib/php-${MODPHP_VERSION}/modules/php_mapscript.so
@comment $OpenBSD: PLIST-php,v 1.8 2019/05/23 19:24:47 landry Exp $
lib/php-${MODPHP_VERSION}/modules/php_mapscriptng.so
share/doc/pkg-readmes/${PKGSTEM}
share/examples/php-${MODPHP_VERSION}/mapscript.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscript.ini
share/examples/php-${MODPHP_VERSION}/mapscriptng.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscriptng.ini

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

@ -1,3 +1,107 @@
@comment $OpenBSD: PLIST-python,v 1.1 2018/08/05 07:22:59 landry Exp $
lib/python${MODPY_VERSION}/site-packages/_mapscript.so
lib/python${MODPY_VERSION}/site-packages/mapscript.py
@comment $OpenBSD: PLIST-python,v 1.2 2019/05/23 19:24:47 landry Exp $
lib/python${MODPY_VERSION}/site-packages/mapscript/
lib/python${MODPY_VERSION}/site-packages/mapscript-7.4.0-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/mapscript-7.4.0-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/mapscript-7.4.0-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/mapscript-7.4.0-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/mapscript-7.4.0-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/mapscript/__init__.py
lib/python${MODPY_VERSION}/site-packages/mapscript/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mapscript/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/${MODPY_PYCACHE}mapscript.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/_mapscript.so
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/__init__.py
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/${MODPY_PYCACHE}project_csv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/${MODPY_PYCACHE}shpdump.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/${MODPY_PYCACHE}shpinfo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/${MODPY_PYCACHE}wxs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/project_csv.py
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/shpdump.py
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/shpinfo.py
lib/python${MODPY_VERSION}/site-packages/mapscript/examples/wxs.py
lib/python${MODPY_VERSION}/site-packages/mapscript/mapscript.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/__init__.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}/
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}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
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}image_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}label_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}layer_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}line_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}map_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}outputformat_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}ows_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}parentreference_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}pgtest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}point_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}rect_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}refcount_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}resultcache_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}shape_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}shapefile_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}style_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}symbol_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}symbolset_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/${MODPY_PYCACHE}thread_test.${MODPY_PYC_MAGIC_TAG}pyc
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/color_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/cities.csv
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/fonts.txt
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/home.png
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/line.dbf
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/line.shp
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/line.shx
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/point.dbf
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/point.shp
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/point.shx
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/polygon.dbf
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/polygon.shp
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/polygon.shx
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/raster.tfw
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/raster.tif
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/symbols.txt
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/test.map
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/test.png
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/test_nofontset.map
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/vera/
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/vera/COPYRIGHT.TXT
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/vera/README.TXT
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/vera/RELEASENOTES.TXT
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/vera/Vera.ttf
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/vera/VeraBd.ttf
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/data/xmarks.png
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/font_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/hash_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/image_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/label_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/layer_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/line_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/map_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/outputformat_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/ows_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/parentreference_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/pgtest.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/point_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/rect_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/refcount_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/resultcache_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/shape_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/shapefile_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/style_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/symbol_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/symbolset_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/testing.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/thread_test.py
lib/python${MODPY_VERSION}/site-packages/mapscript/tests/zoom_test.py

7
geo/mapserver/pkg/PLIST-utils
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-utils,v 1.7 2018/08/05 07:22:59 landry Exp $
@comment $OpenBSD: PLIST-utils,v 1.8 2019/05/23 19:24:47 landry Exp $
@bin bin/legend
@bin bin/msencrypt
@bin bin/scalebar
@ -67,11 +67,6 @@ share/examples/mapserver/perl/shp_in_shp.pl
share/examples/mapserver/perl/shpinfo.pl
share/examples/mapserver/perl/thin.pl
share/examples/mapserver/perl/wxs.pl
share/examples/mapserver/python/
share/examples/mapserver/python/geocode_addresses.py
share/examples/mapserver/python/project_csv.py
share/examples/mapserver/python/shpdump.py
share/examples/mapserver/python/shpinfo.py
share/mapserver/
share/mapserver/cmake/
share/mapserver/cmake/mapserver-config-version.cmake

17
geo/mapserver/pkg/README-php
View File

@ -1,21 +1,20 @@
$OpenBSD: README-php,v 1.4 2018/09/04 12:46:14 espie Exp $
$OpenBSD: README-php,v 1.5 2019/05/23 19:24:47 landry Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
+-----------------------------------------------------------------------
You can enable this module by creating a symbolic
link from ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscript.ini to
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscript.ini.
link from ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscriptng.ini to
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscriptng.ini.
# ln -fs ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscript.ini \
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscript.ini
# ln -fs ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscriptng.ini \
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscriptng.ini
If you plan to use PHP mapscript extension with a chrooted web server, make
sure to copy the libs needed by mapscript.so file binary from ${LOCALBASE}/lib,
but also the projection definitions from libgeotiff and proj packages to the
sure to copy the libs needed by mapscriptng.so file binary from ${LOCALBASE}/lib,
but also the projection definitions from proj package to the chroot:
chroot:
# mkdir -p /var/www/${LOCALBASE}/share/{epsg_csv,proj}
# cp ${LOCALBASE}/share/epsg_csv/* /var/www/${LOCALBASE}/share/epsg_csv
# mkdir -p /var/www/${LOCALBASE}/share/proj
# cp ${LOCALBASE}/share/proj/* /var/www/${LOCALBASE}/share/proj