From nobody Sun Sep 04 15:29:35 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 4MLFv412XTz4c0Yp; Sun, 4 Sep 2022 15:29:36 +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 4MLFv40SmVz3gpN; Sun, 4 Sep 2022 15:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662305376; 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=csvStplSHMGTi1PBy6y8ymK2eeLtG4hoz7yQEinNG5I=; b=VbEfRS4wirf8sVG5TJ4TD3edd1FjVw7JSjCMDUr7YfJzimALBwuYnQ8E/nLaL0wSXfs1YB B4FinRMQyqXP7oQM5cXXBg0A9p69OBRS5h7473ow6z/EOKR8NdWoGFypL3OOaj0bFlY94P +4SWA7V5SH+L/Jk4mrNgWnJiV0ry7zaVI65PhUSjIz41OQgof5v0Dw4nmJpBjS2U/3OMeg ftmW1Tro/qXIoEz6naYr+2ZIISKLdwdtsYUQCPxkvx8tNL/PtEduxK1A7NZU9R/YP1PW3O ivGGZ0JDX2wh393fEWXZbCfTrbf5EIwK9UmFtb8IpyMDLJLXHeRBaCg8Wi6qnw== 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 4MLFv36hpHzXJn; Sun, 4 Sep 2022 15:29:35 +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 284FTZuJ047420; Sun, 4 Sep 2022 15:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 284FTZBw047419; Sun, 4 Sep 2022 15:29:35 GMT (envelope-from git) Date: Sun, 4 Sep 2022 15:29:35 GMT Message-Id: <202209041529.284FTZBw047419@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: 357b6cc9c09c - main - science/libkml: Revert 71a4cedd0383a76f847f0fa1ab32b9209df20959 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: 357b6cc9c09c1d3eedd36f9d93757bd00cc0641e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662305376; 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=csvStplSHMGTi1PBy6y8ymK2eeLtG4hoz7yQEinNG5I=; b=DbK2/krBBdvlVTxXDOwMcPym9RUcpj1zv5RXLKzyHgZf1CIvq7m/Ojiv5Ns6ChlgaBvEHr h8M7bFvULswU8s1GNDNZ3Io3vGVan1TmlFQpU7xytYgfStIvTUVVsoTQJq+KSXav0vZnY+ vxOJJZWSVJpQGDjT1XonjVavfbiX1KvrzkG3wO4VQ6p0pGHfDQ4BrCkmV4FhUE6jndsL1x HcaD159cJ+Olv8mFkc32ZoJWMm8pwM+N5X/5kIm1a+WHu20isnU0BKvSkudCPJGFPmm8Ju Msze6GWyMZ/6yjFVxRy4ggjPvXNfMaP29IhYpiHtYi4AaJpgCRbllw2t1fL/hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662305376; a=rsa-sha256; cv=none; b=D+7xOtRel61tHapaB/zdky2HvwyFIUhIegyEyUcLSLtgwHFqJLmIqE6d2QY5iKfHLGwNEH 4Cg1sLIBW+8oaWLmp8JWlezb6kgn2WwclcEorRtrea2KwbyicT+n9JQnRtN4WcKtcMQJ1Y ybE+Kl0tX9NG/TPvhVL7PvkVIoOKT7DGajmRVJwh41VI5Jw7+fRbVvslUSvruWGAiz8Rfk PkQz4iaOPhEYO3SRNVJQKyVzbbD4Qh6xZtJv/nd8qLG2ehazvgbKd8z878WF8MJf9+wuFJ VvIshHH0o7Sgjec+sgqfYzQSfcyAnV74UC+oZm7ziKiBgPHXeYIrWwR46DIh/g== 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=357b6cc9c09c1d3eedd36f9d93757bd00cc0641e commit 357b6cc9c09c1d3eedd36f9d93757bd00cc0641e Author: Po-Chuan Hsieh AuthorDate: 2022-09-04 15:24:42 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-09-04 15:24:42 +0000 science/libkml: Revert 71a4cedd0383a76f847f0fa1ab32b9209df20959 - Bump PORTREVISION for dependency and package change PR: 266221 Reported by: thierry --- 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 ++++++------- 13 files changed, 120 insertions(+), 16 deletions(-) diff --git a/science/libkml/Makefile b/science/libkml/Makefile index d71ac7da15cc..0da5289f50f5 100644 --- a/science/libkml/Makefile +++ b/science/libkml/Makefile @@ -1,6 +1,6 @@ PORTNAME= libkml PORTVERSION= 1.3.0 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org @@ -9,9 +9,7 @@ COMMENT= Reference implementation of OGC KML 2.2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= boost-libs>=1.55.0:devel/boost-libs \ - expat>=2.1.0:textproc/expat2 \ - uriparser>=0.7.5:net/uriparser +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 @@ -20,12 +18,10 @@ 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 diff --git a/science/libkml/distinfo b/science/libkml/distinfo index f9bcebc8127c..95bb121b0428 100644 --- a/science/libkml/distinfo +++ b/science/libkml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661599149 -SHA256 (libkml-libkml-1.3.0-916a801_GH0.tar.gz) = 233fffbbe7a7c349421349f5d5cc8e515d20344b6e7261171a092373488bd793 -SIZE (libkml-libkml-1.3.0-916a801_GH0.tar.gz) = 6647901 +TIMESTAMP = 1483245177 +SHA256 (libkml-libkml-1.3.0_GH0.tar.gz) = 8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963 +SIZE (libkml-libkml-1.3.0_GH0.tar.gz) = 6639857 diff --git a/science/libkml/files/patch-examples-domviewer-CMakeLists.txt b/science/libkml/files/patch-examples-domviewer-CMakeLists.txt new file mode 100644 index 000000000000..8068aa15fe4c --- /dev/null +++ b/science/libkml/files/patch-examples-domviewer-CMakeLists.txt @@ -0,0 +1,7 @@ +--- 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 new file mode 100644 index 000000000000..e72eadcea34d --- /dev/null +++ b/science/libkml/files/patch-examples-engine-CMakeLists.txt @@ -0,0 +1,10 @@ +@ -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 new file mode 100644 index 000000000000..6fb838a3999e --- /dev/null +++ b/science/libkml/files/patch-examples-gpx-CMakeLists.txt @@ -0,0 +1,10 @@ +@ -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 new file mode 100644 index 000000000000..63ea5edf78d1 --- /dev/null +++ b/science/libkml/files/patch-examples-gx-CMakeLists.txt @@ -0,0 +1,11 @@ +@ -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 new file mode 100644 index 000000000000..b88337891b67 --- /dev/null +++ b/science/libkml/files/patch-examples-hellonet-CMakeLists.txt @@ -0,0 +1,15 @@ +@ -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 new file mode 100644 index 000000000000..566b7898ff2f --- /dev/null +++ b/science/libkml/files/patch-examples-java-CMakeLists.txt @@ -0,0 +1,14 @@ +@ -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 new file mode 100644 index 000000000000..ad31765272c4 --- /dev/null +++ b/science/libkml/files/patch-examples-kml-CMakeLists.txt @@ -0,0 +1,10 @@ +@ -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 new file mode 100644 index 000000000000..d0cd531702a3 --- /dev/null +++ b/science/libkml/files/patch-examples-python-CMakeLists.txt @@ -0,0 +1,10 @@ +@ -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 new file mode 100644 index 000000000000..1bef0d4b1ac4 --- /dev/null +++ b/science/libkml/files/patch-examples-regionator-CMakeLists.txt @@ -0,0 +1,10 @@ +@ -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 new file mode 100644 index 000000000000..665a92dd4bb8 --- /dev/null +++ b/science/libkml/files/patch-examples-xsd-CMakeLists.txt @@ -0,0 +1,12 @@ +@ -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 c84995275ba9..d350eb80788f 100644 --- a/science/libkml/pkg-plist +++ b/science/libkml/pkg-plist @@ -54,7 +54,6 @@ 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 @@ -142,22 +141,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.1 +lib/libkmlbase.so.1.3.0 lib/libkmlconvenience.so lib/libkmlconvenience.so.1 -lib/libkmlconvenience.so.1.3.1 +lib/libkmlconvenience.so.1.3.0 lib/libkmldom.so lib/libkmldom.so.1 -lib/libkmldom.so.1.3.1 +lib/libkmldom.so.1.3.0 lib/libkmlengine.so lib/libkmlengine.so.1 -lib/libkmlengine.so.1.3.1 +lib/libkmlengine.so.1.3.0 lib/libkmlregionator.so lib/libkmlregionator.so.1 -lib/libkmlregionator.so.1.3.1 +lib/libkmlregionator.so.1.3.0 lib/libkmlxsd.so lib/libkmlxsd.so.1 -lib/libkmlxsd.so.1.3.1 +lib/libkmlxsd.so.1.3.0 libdata/pkgconfig/libkml.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklinks.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circlegen.cc