From owner-svn-ports-head@freebsd.org Mon Oct 17 00:59:04 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14E21C12051; Mon, 17 Oct 2016 00:59:04 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D90A3173B; Mon, 17 Oct 2016 00:59:03 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9H0x2r2058245; Mon, 17 Oct 2016 00:59:02 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9H0x2aV058244; Mon, 17 Oct 2016 00:59:02 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201610170059.u9H0x2aV058244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Mon, 17 Oct 2016 00:59:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424086 - in head/graphics/mapserver: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Oct 2016 00:59:04 -0000 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)