- Apply a upstream patch to fix the build with php

Reported by: ivtopol@gmail.com(via email)
svn path=/head/; revision=424086
2016-10-17 00:59:02 +00:00 · 2016-10-17 00:59:02 +00:00 · 447e3183e3 · 2021-03-31 03:12:20 +00:00
commit 447e3183e3
parent 364db093bb
2 changed files with 19 additions and 0 deletions
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@ -3,6 +3,7 @@

 PORTNAME=		mapserver
 PORTVERSION=		7.0.2
+PORTREVISION=		1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/

--- a/graphics/mapserver/files/patch-mapscript_php_error.c
+++ b/graphics/mapserver/files/patch-mapscript_php_error.c
@ -0,0 +1,18 @@
+--- mapscript/php/error.c.orig	2016-09-21 17:57:25 UTC
+++ mapscript/php/error.c
+@@ -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)