From nobody Fri Sep 29 16:19:52 2023 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 4RxwY43Z9qz4v6Qb; Fri, 29 Sep 2023 16:19:52 +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 4RxwY438bGz4PYP; Fri, 29 Sep 2023 16:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696004392; 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=cRDYy2fqVl+HB5pl9R9epTDa8oVLYz6qCmXPCI0Jdps=; b=Clma3BkJiTFladdF6F5nhEbrUgBUVevZSZPDTnFVJuyc5JvR6765GHyiBoU7Q3GTb6cwrH f8VEY1AVQqDjp83Wxsmpdu8tgDEKHn5y6YHlVX/OudzTFlMgV4PZKwdWC6dnmzFPJLzhhr gQ6WhMbhUczZRyRAmAEDoG5/NGeeQKQsWVriSMrSfygdcEJYqcP0pqifI0IqKOaID+/cfL nsDKKJoibuC0IFSZiIwbwgcnNHcZzw4pY4g2CU1RQZ0Seyo2e6B7rJsFO/is3CwG5wGlXD 6ufo97c2a8xXXIkArLKy6kb0IxfPSF9Dw1d18JI/jsBWnHMZZKtnZDF4Y/R/ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696004392; a=rsa-sha256; cv=none; b=wDnjrzBlYwglyaGLiML8AMWNT61lHFeKzch40KlN/7gk40BjcJMJKMW4ehax1P6U1DV6pz A7cMICry8FSqw83g9FWkqtRE9plC+BbZnUAzOGeQNvOQkkXiLTA2U4sjDYcTrfmWuz+3pI a0ToMV/kkRhz+ejZD7wz61j/kY9QgQSnSHb9gfyYzdwEiDgUbj8VHkC8XBN3Hd8Xl8zDbP Pq3EYc0rAkrXTei30YHuTyeAssXeMh5E0DvEX/Y0f2XHHXpjCuRPUU/EenvRUspW2QrF8l /ngkGCc0CU563YNcDeMtR0IX0TdYJz+rzlHEs3vxFAOBaB5cBrG9CUNvyl3++Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696004392; 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=cRDYy2fqVl+HB5pl9R9epTDa8oVLYz6qCmXPCI0Jdps=; b=fl5HqJO2qydWe7guHQ12kggkhj1BESgmLuXMO/u8jIAf66innZf7NzgBCy6c1DCvaxYvIQ ce7hySxk6ehI2RaJZvHr63rLJfNG4pG962ZRykHJ26oeu7Knac2YgX/SJsZtIdYfIlbM8K 4itHILDw8gw9SXL9p4fxSzIii8LUy9CuE8Vto4WYjDG8gRqoyFPbXotWNoTvQvW1bh7C3M xt4vismZS0MpyDZIAV3I2NM0nh8/BN3rBCZwvl7OriyvV87uRaAgdeBDvbFy2fjVM44kYI Umx7X6VJ58xmwlas1EcHWbm9Mo6NQPzY4zmqRkQ+fTBQH3XgwPVHNelENysjDg== 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 4RxwY42F24z1B3h; Fri, 29 Sep 2023 16:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38TGJqIg050028; Fri, 29 Sep 2023 16:19:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38TGJqrS050025; Fri, 29 Sep 2023 16:19:52 GMT (envelope-from git) Date: Fri, 29 Sep 2023 16:19:52 GMT Message-Id: <202309291619.38TGJqrS050025@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: e17f183ac7cb - 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: e17f183ac7cb12907ae44e3e4d71258de6e6afda Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e17f183ac7cb12907ae44e3e4d71258de6e6afda commit e17f183ac7cb12907ae44e3e4d71258de6e6afda Author: Po-Chuan Hsieh AuthorDate: 2023-09-29 16:13:35 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-29 16:13:35 +0000 science/libkml: Update to newer snapshot (916a801) - Re-apply 71a4cedd0383a76f847f0fa1ab32b9209df20959 - Clean up BUILD_DEPENDS: all of them are in the ports tree for years - Bump PORTREVISION of dependent port (graphics/gdal) for shlib change - Bump PORTREVISION for package change Local patches have been merged by upstream in 916a801 [1]. Tested all dependent ports of graphics/gdal in case of potential breakage. - math/openturns and science/paraview are skipped due to ceres-solver breakage - graphics/mapnik is skipped due to potential boost-libs breakage [2][3] Changes: https://github.com/libkml/libkml/commits/master Reference: https://github.com/libkml/libkml/commit/916a801ed3143ab82c07ec108bad271aa441da16 [1] https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/p3b548e384d0b_sfc4a676827/logs/mapnik-3.1.0_3.log [2] https://pkg-status.freebsd.org/beefy16/data/132amd64-default/3b548e384d0b/logs/mapnik-3.1.0_3.log [3] PR: 266221, 266252 --- graphics/gdal/Makefile | 1 + science/libkml/Makefile | 8 ++++---- science/libkml/distinfo | 6 +++--- .../libkml/files/patch-examples-domviewer-CMakeLists.txt | 7 ------- science/libkml/files/patch-examples-engine-CMakeLists.txt | 10 ---------- science/libkml/files/patch-examples-gpx-CMakeLists.txt | 10 ---------- science/libkml/files/patch-examples-gx-CMakeLists.txt | 11 ----------- .../libkml/files/patch-examples-hellonet-CMakeLists.txt | 15 --------------- science/libkml/files/patch-examples-java-CMakeLists.txt | 14 -------------- science/libkml/files/patch-examples-kml-CMakeLists.txt | 10 ---------- science/libkml/files/patch-examples-python-CMakeLists.txt | 10 ---------- .../libkml/files/patch-examples-regionator-CMakeLists.txt | 10 ---------- science/libkml/files/patch-examples-xsd-CMakeLists.txt | 12 ------------ science/libkml/pkg-plist | 13 +++++++------ 14 files changed, 15 insertions(+), 122 deletions(-) diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 73ef643d879a..4ec686323913 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -1,5 +1,6 @@ PORTNAME= gdal PORTVERSION= 3.7.2 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/science/libkml/Makefile b/science/libkml/Makefile index c59fc16cc70d..e0ea47db04f9 100644 --- a/science/libkml/Makefile +++ b/science/libkml/Makefile @@ -1,6 +1,6 @@ PORTNAME= libkml PORTVERSION= 1.3.0 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org @@ -10,19 +10,19 @@ WWW= https://github.com/libkml/libkml LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= boost-libs>=1.44.0:devel/boost-libs LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ liburiparser.so:net/uriparser -USES= cmake compiler:c11 minizip pathfix +USES= cmake compiler:c++11-lang minizip pathfix CMAKE_OFF= BUILD_TESTING WITH_JAVA WITH_PYTHON WITH_SWIG CMAKE_ON= BUILD_SHARED_LIBS -USE_CXXSTD= gnu++98 +LDFLAGS+= -lz USE_LDCONFIG= yes USE_GITHUB= yes +GH_TAGNAME= 916a801 OPTIONS_DEFINE= EXAMPLES 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 e72eadcea34d..000000000000 --- a/science/libkml/files/patch-examples-engine-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -@ -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 6fb838a3999e..000000000000 --- a/science/libkml/files/patch-examples-gpx-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -@ -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 63ea5edf78d1..000000000000 --- a/science/libkml/files/patch-examples-gx-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -@ -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 b88337891b67..000000000000 --- a/science/libkml/files/patch-examples-hellonet-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -@ -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 566b7898ff2f..000000000000 --- a/science/libkml/files/patch-examples-java-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -@ -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 ad31765272c4..000000000000 --- a/science/libkml/files/patch-examples-kml-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -@ -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 d0cd531702a3..000000000000 --- a/science/libkml/files/patch-examples-python-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -@ -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 1bef0d4b1ac4..000000000000 --- a/science/libkml/files/patch-examples-regionator-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -@ -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 665a92dd4bb8..000000000000 --- a/science/libkml/files/patch-examples-xsd-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -@ -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