From nobody Wed Aug 31 11:42:48 2022 X-Original-To: dev-commits-ports-main@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 4MHj3F2Ld7z4b7gC; Wed, 31 Aug 2022 11:42:49 +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 4MHj3F05VQz4Kfw; Wed, 31 Aug 2022 11:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661946169; 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=VZDSCJQF7skqbW0AwR+90+/VVxUpJHiVclcYy1I8ukI=; b=qvuVPz1Ai++ZEz5oyOeWZVb/H1hvZDP62ovxC79mg1VUiuvRnOuDGcJZs86GrN5DSI9KYc caE4RBpQwma7MK3UasaLrgMwDqoPmb0EAw83TaRRoirl5UVoCc1o9BVZ3u/QI8D4YzVljQ HK7GsRuAnYRSCuip0XxOBdufFeY7SMPhCqH980t4HpkEE6xw659T8d2NAyOPlV1R2k8a0D mdYdcWko+JmrWqOVIR8IP7k8Il4aIFmE7oUT4rIJcS1PGTPkKqIZGgDUERdtF9N+9DEBHm JI3OlIXRN4n/CyYfE0zVI6O16OWI6WG46qVG3FrsbIkDwsBQ1hgz9ZgDGdGSug== 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 4MHj3D6KHGz16lZ; Wed, 31 Aug 2022 11:42:48 +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 27VBgm88094189; Wed, 31 Aug 2022 11:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VBgmq4094188; Wed, 31 Aug 2022 11:42:48 GMT (envelope-from git) Date: Wed, 31 Aug 2022 11:42:48 GMT Message-Id: <202208311142.27VBgmq4094188@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 71a4cedd0383 - main - science/libkml: Update to newer snapshot (916a801) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71a4cedd0383a76f847f0fa1ab32b9209df20959 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661946169; 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=VZDSCJQF7skqbW0AwR+90+/VVxUpJHiVclcYy1I8ukI=; b=aGCkCkzDKeGVAQhNaoW8GST8hc1ZKcoxq2f7xEVLBruyM8AY8U1CI8djtWvQkeHonUcogq 4xxBoa+V4dHQxHZ/SwwgV0ai00kEktzqg/NgLN5MPX8IA9mPmKsdXBRR+mv5/oKCqcKkHd cK79JysRNyqsHUVRsb+WvZ0hz+J4In7nlzJT5h0bd/JXH03q7O+aKvqHkvsfoN1xl3X6BM F3UFtYxeABJwcCYZGHNy0tRXRU0J11upyhDa4OYQm7hzI4rXcqT84jOCiPO5D1ncK/CkSg M1GhslQZFiw/3wBMsA6CGTq+GUPOf1FChdcf3GR057D0ww7g57oq+ydZCp5GZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661946169; a=rsa-sha256; cv=none; b=UvwAx0jngp5bg1Wkg+f5+HQjjpjacrs4NgCLsgFn153zCX5+HCDbLoRWa+DMySFnL5PNmH kJ1m3+Zqa9VKfkmk5S8NemFMhi64enpG8GwWBw5GtcMJDj4Bmkob7ebbdbyo7TLfVqHlLO p7ye9jpKzcwXA3TRw5mQ39ZwgSl3wPtJmYgAIdYJrKft2SAiljBNWhd96PjEtu47XyEprG pB6V+HgxGAPm8jqGTucrnQUHwu+BN5o4KknmxLuYVhQXT1n2Xlm2EQQwgpVMrYQRRC7mPf qafpNmVblNjfLs57M1LkPQnw72XuFpi9BwojscICwVD3PVuWPopHGUSh2th4+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=71a4cedd0383a76f847f0fa1ab32b9209df20959 commit 71a4cedd0383a76f847f0fa1ab32b9209df20959 Author: Po-Chuan Hsieh AuthorDate: 2022-08-31 11:21:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-08-31 11:40:53 +0000 science/libkml: Update to newer snapshot (916a801) - Bump PORTREVISION for package change Local patches have been merged by upstream in 916a801 [1]. Changes: https://github.com/libkml/libkml/commits/master Reference: https://github.com/libkml/libkml/commit/916a801ed3143ab82c07ec108bad271aa441da16 [1] --- science/libkml/Makefile | 12 ++++++++---- science/libkml/distinfo | 6 +++--- .../libkml/files/patch-examples-domviewer-CMakeLists.txt | 7 ------- science/libkml/files/patch-examples-engine-CMakeLists.txt | 9 --------- science/libkml/files/patch-examples-gpx-CMakeLists.txt | 9 --------- science/libkml/files/patch-examples-gx-CMakeLists.txt | 10 ---------- .../libkml/files/patch-examples-hellonet-CMakeLists.txt | 14 -------------- science/libkml/files/patch-examples-java-CMakeLists.txt | 13 ------------- science/libkml/files/patch-examples-kml-CMakeLists.txt | 9 --------- science/libkml/files/patch-examples-python-CMakeLists.txt | 9 --------- .../libkml/files/patch-examples-regionator-CMakeLists.txt | 9 --------- science/libkml/files/patch-examples-xsd-CMakeLists.txt | 11 ----------- science/libkml/pkg-plist | 13 +++++++------ 13 files changed, 18 insertions(+), 113 deletions(-) diff --git a/science/libkml/Makefile b/science/libkml/Makefile index fa90705fd7d6..d71ac7da15cc 100644 --- a/science/libkml/Makefile +++ b/science/libkml/Makefile @@ -1,6 +1,6 @@ PORTNAME= libkml PORTVERSION= 1.3.0 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org @@ -9,21 +9,25 @@ COMMENT= Reference implementation of OGC KML 2.2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= boost-libs>=1.44.0:devel/boost-libs +BUILD_DEPENDS= boost-libs>=1.55.0:devel/boost-libs \ + expat>=2.1.0:textproc/expat2 \ + uriparser>=0.7.5:net/uriparser LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ liburiparser.so:net/uriparser -OPTIONS_DEFINE= EXAMPLES - USES= cmake compiler:c11 minizip pathfix CMAKE_OFF= BUILD_TESTING WITH_JAVA WITH_PYTHON WITH_SWIG CMAKE_ON= BUILD_SHARED_LIBS +LDFLAGS+= -lz USE_CXXSTD= gnu++98 USE_LDCONFIG= yes USE_GITHUB= yes +GH_TAGNAME= 916a801 + +OPTIONS_DEFINE= EXAMPLES EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES INSTALL_EXAMPLES EXAMPLES_CMAKE_ON= -DKML_EXAMPLES_DIR=${EXAMPLESDIR} diff --git a/science/libkml/distinfo b/science/libkml/distinfo index 95bb121b0428..f9bcebc8127c 100644 --- a/science/libkml/distinfo +++ b/science/libkml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483245177 -SHA256 (libkml-libkml-1.3.0_GH0.tar.gz) = 8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963 -SIZE (libkml-libkml-1.3.0_GH0.tar.gz) = 6639857 +TIMESTAMP = 1661599149 +SHA256 (libkml-libkml-1.3.0-916a801_GH0.tar.gz) = 233fffbbe7a7c349421349f5d5cc8e515d20344b6e7261171a092373488bd793 +SIZE (libkml-libkml-1.3.0-916a801_GH0.tar.gz) = 6647901 diff --git a/science/libkml/files/patch-examples-domviewer-CMakeLists.txt b/science/libkml/files/patch-examples-domviewer-CMakeLists.txt deleted file mode 100644 index 8068aa15fe4c..000000000000 --- a/science/libkml/files/patch-examples-domviewer-CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ ---- examples/domviewer/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/domviewer/CMakeLists.txt -@@ -1,3 +1,3 @@ - if(INSTALL_EXAMPLES) -- install( FILES kml-aliases.txt DESTINATION ${KML_EXAMPLES_DIR} COMPONENT Development) -+ install( FILES domviewer.py DESTINATION ${KML_EXAMPLES_DIR} COMPONENT Development) - endif() diff --git a/science/libkml/files/patch-examples-engine-CMakeLists.txt b/science/libkml/files/patch-examples-engine-CMakeLists.txt deleted file mode 100644 index a25ede748975..000000000000 --- a/science/libkml/files/patch-examples-engine-CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- examples/engine/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/engine/CMakeLists.txt -@@ -60,5 +60,5 @@ build_example( - - if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") -- install(FILES ${eg_files} DESTINATION examples/engine) -+ install(FILES ${eg_files} DESTINATION ${KML_EXAMPLES_DIR}/engine) - endif(INSTALL_EXAMPLES) diff --git a/science/libkml/files/patch-examples-gpx-CMakeLists.txt b/science/libkml/files/patch-examples-gpx-CMakeLists.txt deleted file mode 100644 index 7d7fcb65170a..000000000000 --- a/science/libkml/files/patch-examples-gpx-CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- examples/gpx/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/gpx/CMakeLists.txt -@@ -9,5 +9,5 @@ build_example( - - if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") -- install(FILES ${eg_files} DESTINATION examples/gpx) -+ install(FILES ${eg_files} DESTINATION ${KML_EXAMPLES_DIR}/gpx) - endif(INSTALL_EXAMPLES) diff --git a/science/libkml/files/patch-examples-gx-CMakeLists.txt b/science/libkml/files/patch-examples-gx-CMakeLists.txt deleted file mode 100644 index 6f68d63c26af..000000000000 --- a/science/libkml/files/patch-examples-gx-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- examples/gx/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/gx/CMakeLists.txt -@@ -12,5 +12,5 @@ if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") - install( - FILES ${eg_files} -- DESTINATION examples/gx) -+ DESTINATION ${KML_EXAMPLES_DIR}/gx) - endif() -\ No newline at end of file diff --git a/science/libkml/files/patch-examples-hellonet-CMakeLists.txt b/science/libkml/files/patch-examples-hellonet-CMakeLists.txt deleted file mode 100644 index 8ae3c8c5978b..000000000000 --- a/science/libkml/files/patch-examples-hellonet-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- examples/hellonet/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/hellonet/CMakeLists.txt -@@ -78,9 +78,9 @@ if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") - install( - FILES ${eg_files} -- DESTINATION examples/hellonet) -+ DESTINATION ${KML_EXAMPLES_DIR}/hellonet) - - install( - FILES README curlfetch.h prompt.h -- DESTINATION examples/hellonet) -+ DESTINATION ${KML_EXAMPLES_DIR}/hellonet) - endif() diff --git a/science/libkml/files/patch-examples-java-CMakeLists.txt b/science/libkml/files/patch-examples-java-CMakeLists.txt deleted file mode 100644 index 64be4ecfb94b..000000000000 --- a/science/libkml/files/patch-examples-java-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- examples/java/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/java/CMakeLists.txt -@@ -2,8 +2,8 @@ if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.java") - install( - FILES ${eg_files} -- DESTINATION examples/java) ##compile java -+ DESTINATION ${KML_EXAMPLES_DIR}/java) ##compile java - install( - FILES run.sh -- DESTINATION examples/java) ## -+ DESTINATION ${KML_EXAMPLES_DIR}/java) ## - endif() diff --git a/science/libkml/files/patch-examples-kml-CMakeLists.txt b/science/libkml/files/patch-examples-kml-CMakeLists.txt deleted file mode 100644 index 3c537cea96ef..000000000000 --- a/science/libkml/files/patch-examples-kml-CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- examples/kml/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/kml/CMakeLists.txt -@@ -2,5 +2,5 @@ if(INSTALL_EXAMPLES) - file(GLOB kml_files "${CMAKE_CURRENT_SOURCE_DIR}/*.kml") - install( - FILES ${kml_files} -- DESTINATION examples/kml) -+ DESTINATION ${KML_EXAMPLES_DIR}/kml) - endif() diff --git a/science/libkml/files/patch-examples-python-CMakeLists.txt b/science/libkml/files/patch-examples-python-CMakeLists.txt deleted file mode 100644 index 4f3fc9ab6053..000000000000 --- a/science/libkml/files/patch-examples-python-CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- examples/python/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/python/CMakeLists.txt -@@ -2,5 +2,5 @@ if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.py") - install( - FILES ${eg_files} -- DESTINATION examples/python) ##compile python -+ DESTINATION ${KML_EXAMPLES_DIR}/python) ##compile python - endif() diff --git a/science/libkml/files/patch-examples-regionator-CMakeLists.txt b/science/libkml/files/patch-examples-regionator-CMakeLists.txt deleted file mode 100644 index 593533b913d3..000000000000 --- a/science/libkml/files/patch-examples-regionator-CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- examples/regionator/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/regionator/CMakeLists.txt -@@ -10,5 +10,5 @@ if(INSTALL_EXAMPLES) - file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") - install( - FILES ${eg_files} -- DESTINATION examples/regionator) -+ DESTINATION ${KML_EXAMPLES_DIR}/regionator) - endif() diff --git a/science/libkml/files/patch-examples-xsd-CMakeLists.txt b/science/libkml/files/patch-examples-xsd-CMakeLists.txt deleted file mode 100644 index 4d79e4f87bb9..000000000000 --- a/science/libkml/files/patch-examples-xsd-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/xsd/CMakeLists.txt.orig 2015-12-21 17:23:05 UTC -+++ examples/xsd/CMakeLists.txt -@@ -1,5 +1,5 @@ - if(INSTALL_EXAMPLES) -- install(FILES -- domviewer.py -- DESTINATION examples/xsd) #compile py -+ file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") -+ install(FILES ${eg_files} DESTINATION ${KML_EXAMPLES_DIR}/xsd) -+ install(FILES kml-aliases.txt DESTINATION ${KML_EXAMPLES_DIR}/xsd) - endif() diff --git a/science/libkml/pkg-plist b/science/libkml/pkg-plist index d350eb80788f..c84995275ba9 100644 --- a/science/libkml/pkg-plist +++ b/science/libkml/pkg-plist @@ -54,6 +54,7 @@ include/kml/dom/gx_tour.h include/kml/dom/hotspot.h include/kml/dom/iconstyle.h include/kml/dom/kml.h +include/kml/dom/kml22.cc include/kml/dom/kml22.h include/kml/dom/kml_cast.h include/kml/dom/kml_factory.h @@ -141,22 +142,22 @@ lib/cmake/libkml/LibKMLTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libkml/LibKMLTargets.cmake lib/libkmlbase.so lib/libkmlbase.so.1 -lib/libkmlbase.so.1.3.0 +lib/libkmlbase.so.1.3.1 lib/libkmlconvenience.so lib/libkmlconvenience.so.1 -lib/libkmlconvenience.so.1.3.0 +lib/libkmlconvenience.so.1.3.1 lib/libkmldom.so lib/libkmldom.so.1 -lib/libkmldom.so.1.3.0 +lib/libkmldom.so.1.3.1 lib/libkmlengine.so lib/libkmlengine.so.1 -lib/libkmlengine.so.1.3.0 +lib/libkmlengine.so.1.3.1 lib/libkmlregionator.so lib/libkmlregionator.so.1 -lib/libkmlregionator.so.1.3.0 +lib/libkmlregionator.so.1.3.1 lib/libkmlxsd.so lib/libkmlxsd.so.1 -lib/libkmlxsd.so.1.3.0 +lib/libkmlxsd.so.1.3.1 libdata/pkgconfig/libkml.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklinks.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circlegen.cc