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

Update to mapservr 7.0.4.

Browse Source 
See http://mapserver.org/development/changelog/changelog-7-0.html#changelog-7-0-4
Backport an upstream patch to fix php bindings build, remove a patch
merged upstream.
This commit is contained in:
landry 2017-02-07 08:17:57 +00:00
parent ffecdbbb4d
commit d52802ecf3
4 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
geo/mapserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2016/10/31 15:47:58 landry Exp $
# $OpenBSD: Makefile,v 1.43 2017/02/07 08:17:57 landry Exp $
MULTI_PACKAGES= -utils -main -php -perl
@ -7,7 +7,7 @@ COMMENT-utils= mapserver utilities
COMMENT-php= PHP Mapscript extension
COMMENT-perl= Perl Mapscript binding
V = 7.0.2
V = 7.0.4
DISTNAME= mapserver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}

4
geo/mapserver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mapserver-7.0.2.tar.gz) = tGvFfV1cOIqghYANMiSTcV+Zue8gaEXRdnvacbUL308=
SIZE (mapserver-7.0.2.tar.gz) = 2617399
SHA256 (mapserver-7.0.4.tar.gz) = yR1A2lzCQrIMp+KcQb2esjCXuYp3kIsdcI6XCPb2z2k=
SIZE (mapserver-7.0.4.tar.gz) = 2624614

15
geo/mapserver/patches/patch-cmake_FindPHP5_cmake Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-cmake_FindPHP5_cmake,v 1.1 2017/02/07 08:17:57 landry Exp $
https://github.com/mapserver/mapserver/commit/8fd1c73d75cd66caa2a04a2da5a7d0390b4b9dd6
--- cmake/FindPHP5.cmake.orig Mon Feb 6 14:34:08 2017
+++ cmake/FindPHP5.cmake Mon Feb 6 14:34:43 2017
@@ -86,6 +86,10 @@ IF(PHP5_CONFIG_EXECUTABLE)
MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
+ IF(NOT PHP5_INCLUDE_PATH)
+ set(PHP5_INCLUDE_PATH ${PHP5_INCLUDES})
+ ENDIF(NOT PHP5_INCLUDE_PATH)
+
IF(PHP5_VERSION LESS 5)
MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
ENDIF(PHP5_VERSION LESS 5)

24
geo/mapserver/patches/patch-mapscript_php_error_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-mapscript_php_error_c,v 1.1 2016/09/02 15:28:24 landry Exp $
Fix build with php 5.6.25
https://github.com/mapserver/mapserver/issues/5318
--- mapscript/php/error.c.orig Fri Sep 2 17:23:55 2016
+++ mapscript/php/error.c Fri Sep 2 17:24:26 2016
@@ -31,6 +31,15 @@
#include "php_mapscript.h"
+#undef ZVAL_STRING
+#define ZVAL_STRING(z, s, duplicate) do { \
+ const char *__s=(s); \
+ zval *__z = (z); \
+ Z_STRLEN_P(__z) = strlen(__s); \
+ Z_STRVAL_P(__z) = (duplicate?estrndup(__s, Z_STRLEN_P(__z)):(char*)__s);\
+ Z_TYPE_P(__z) = IS_STRING; \
+ } while (0)
+
zend_class_entry *mapscript_ce_error;
ZEND_BEGIN_ARG_INFO_EX(error___get_args, 0, 0, 1)