From nobody Thu Mar 16 11:44:15 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pclm03fQ2z3ylVg; Thu, 16 Mar 2023 11:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pclm011y1z4Hsj; Thu, 16 Mar 2023 11:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678967056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x4xlzyTZGw/UndvQUcD1zoI7ZT4A0OfF/2/VPAHizpI=; b=ybVBDDToGzyylda8VFimZK4I4J7i27sLtaVYDq7pIwgToPaZWkBUpojPaw84dp5d4U3pc8 TRj6MSzFNvtPrWIdvQC6J3h6yXjENdZZ1upv6EKQ5q30zozBpMG/DVbmAAbpc+2lZbLrsD jECmf9ekO0RCR6/2RcadkzJAtBkh2IP4pCWFERL8rPd0IRpzLFVX4liB0l/wLNB2HLZIfh dx3oUzyvVXRjKaK3eV6pv/zIYuNxaZm49udOJ1iY3KamliHQe3e3Pf4i7nnHERYE+tQ4JK mr56mcOhGyZRC5qislibEODc0FwuQVUn/h0mWIzo6tokTXcrZYgU8j5bXiROsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678967056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x4xlzyTZGw/UndvQUcD1zoI7ZT4A0OfF/2/VPAHizpI=; b=MVzrWIs34H/bmfQAXBiCvGJLr2u5iD38uJs12RSO6cbUEBwIRB+6ywntRKOY4t+FIja+P0 bOrLhNO1E4UrqRTLgz/nWtHenbEjJPJPni7ihHDuxO+cXRlFcfYbmR9TA12z8FzncNCZS/ cpVexmOoC+pApnnBwfPjLhEcEgO1ZODHz+BPczD5O6idFqusRBDgNTffNY/0k8bMkUBZw1 UlhL1M0Q7e4vjJirHBZAn9HNPYQZxhNj1g7ujE69FRg7u5S2BH56be9w90M4KlQudAX8RC tipY19ROWgcIaEk0Ro3hYulVr8aJHsXw5/6Xqg36ojtxUr3W6MC7z75dblsnNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678967056; a=rsa-sha256; cv=none; b=FgzCJ30zF80flTsDje3KcJ04MYkmly7JAMV15meqFwGMTg3+NXgxWmB8kcFyCc/i3arvGy 7jRoy0WDYydcn7wUC79stKhaCFslREgqunXx0wYb+1/WinTbi30xMR/pJvFio2AN2ho6OQ QxEbUJheMkq7n+BbstEe5wslAaQ//kQ7Zcgi+FRs9av2QZdXUfDtidkBRS7Fn5AJ1nBaDg KXi1Nh6vu7cc44IArRY4zeNDAVsfcVYePZQT9B/NiAzbwC4q5ZPd/6gLg52Yz2kWIDOgIP B+gnxeY9ogE8THi68cmDHmH4GslT+UL5Opx67jXrkB7AqOAraC2vMwkq7OJ79g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pcllz71tszhxT; Thu, 16 Mar 2023 11:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32GBiFNU029150; Thu, 16 Mar 2023 11:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32GBiFFO029149; Thu, 16 Mar 2023 11:44:15 GMT (envelope-from git) Date: Thu, 16 Mar 2023 11:44:15 GMT Message-Id: <202303161144.32GBiFFO029149@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: 064b501f72d9 - main - graphics/mapserver: Update to 8.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 064b501f72d9df02f4ed3e933fba363fd6db4894 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=064b501f72d9df02f4ed3e933fba363fd6db4894 commit 064b501f72d9df02f4ed3e933fba363fd6db4894 Author: Wen Heping AuthorDate: 2023-03-12 12:43:14 +0000 Commit: Wen Heping CommitDate: 2023-03-16 11:43:30 +0000 graphics/mapserver: Update to 8.0.0 --- graphics/mapserver/Makefile | 5 ++--- graphics/mapserver/distinfo | 6 +++--- graphics/mapserver/files/patch-mapscript_php_error.c | 18 ------------------ graphics/mapserver/pkg-plist | 3 +-- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 6dfd84752363..ef0059cbab6f 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -1,6 +1,5 @@ PORTNAME= mapserver -PORTVERSION= 7.6.4 -PORTREVISION= 4 +PORTVERSION= 8.0.0 CATEGORIES= graphics www geography MASTER_SITES= https://download.osgeo.org/mapserver/ @@ -26,7 +25,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ -DWITH_GD=1 MAKE_JOBS_UNSAFE= yes -PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \ +PROG_FILES= legend scalebar shptree shptreetst shptreevis \ sortshp msencrypt tile4ms mapserv OPTIONS_DEFINE= CAIRO CAIRO_SVG CLIENT_WMS CLIENT_WFS CURL DEBUG \ diff --git a/graphics/mapserver/distinfo b/graphics/mapserver/distinfo index d9847d169c85..445593c4d8d9 100644 --- a/graphics/mapserver/distinfo +++ b/graphics/mapserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626438445 -SHA256 (mapserver-7.6.4.tar.gz) = b46c884bc42bd49873806a05325872e4418fc34e97824d4e13d398e86ea474ac -SIZE (mapserver-7.6.4.tar.gz) = 2718735 +TIMESTAMP = 1678615472 +SHA256 (mapserver-8.0.0.tar.gz) = bb7ee625eb6fdce9bd9851f83664442845d70d041e449449e88ac855e97d773c +SIZE (mapserver-8.0.0.tar.gz) = 2945524 diff --git a/graphics/mapserver/files/patch-mapscript_php_error.c b/graphics/mapserver/files/patch-mapscript_php_error.c deleted file mode 100644 index a494c14c1ddb..000000000000 --- a/graphics/mapserver/files/patch-mapscript_php_error.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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) diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist index ea76e1158efe..9bedda4a0169 100644 --- a/graphics/mapserver/pkg-plist +++ b/graphics/mapserver/pkg-plist @@ -2,7 +2,6 @@ bin/legend bin/mapserv bin/msencrypt bin/scalebar -bin/shp2img bin/shptree bin/shptreetst bin/shptreevis @@ -11,7 +10,7 @@ bin/tile4ms %%PHP%%etc/php/ext-20-php_mapscript.ini lib/libmapserver.so lib/libmapserver.so.2 -lib/libmapserver.so.7.6.4 +lib/libmapserver.so.8.0.0 %%PHP%%lib/php/%%PHP_EXT_DIR%%/php_mapscript.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so