Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Oct 2016 00:59:02 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424086 - in head/graphics/mapserver: . files
Message-ID:  <201610170059.u9H0x2aV058244@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Mon Oct 17 00:59:02 2016
New Revision: 424086
URL: https://svnweb.freebsd.org/changeset/ports/424086

Log:
  - Apply a upstream patch to fix the build with php
  
  Reported by:	ivtopol@gmail.com(via email)

Added:
  head/graphics/mapserver/files/
  head/graphics/mapserver/files/patch-mapscript_php_error.c   (contents, props changed)
Modified:
  head/graphics/mapserver/Makefile

Modified: head/graphics/mapserver/Makefile
==============================================================================
--- head/graphics/mapserver/Makefile	Sun Oct 16 22:53:54 2016	(r424085)
+++ head/graphics/mapserver/Makefile	Mon Oct 17 00:59:02 2016	(r424086)
@@ -3,6 +3,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		7.0.2
+PORTREVISION=		1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 

Added: head/graphics/mapserver/files/patch-mapscript_php_error.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/mapserver/files/patch-mapscript_php_error.c	Mon Oct 17 00:59:02 2016	(r424086)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610170059.u9H0x2aV058244>