diff options
| author | Wen Heping <wen@FreeBSD.org> | 2016-10-17 00:59:02 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2016-10-17 00:59:02 +0000 |
| commit | 447e3183e37fe1fd92c18261578986d480407f97 (patch) | |
| tree | ffb5224dcde5c07b7cd26253af2bb7dcbbd85511 /graphics | |
| parent | cad/feappv: fix after change in USES=localbase behavior (diff) | |
- Apply a upstream patch to fix the build with php
Reported by: ivtopol@gmail.com(via email)
Notes
Notes:
svn path=/head/; revision=424086
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/mapserver/Makefile | 1 | ||||
| -rw-r--r-- | graphics/mapserver/files/patch-mapscript_php_error.c | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index d39397b89c8a..60e2db03fa56 100644 --- 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/ diff --git a/graphics/mapserver/files/patch-mapscript_php_error.c b/graphics/mapserver/files/patch-mapscript_php_error.c new file mode 100644 index 000000000000..a494c14c1ddb --- /dev/null +++ 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) |