Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Jan 2017 20:02:17 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r431300 - in head: graphics/gdal science/libkml science/libkml/files
Message-ID:  <201701122002.v0CK2H59039005@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Jan 12 20:02:17 2017
New Revision: 431300
URL: https://svnweb.freebsd.org/changeset/ports/431300

Log:
  Update to 1.3.0
  
  - Update COMMENT
  - Update LICENSE_FILE
  - Add EXAMPLES option
  - Update pkg-descr
  - Update WWW
  - Bump PORTREVISION for dependent ports
  
  Changes:	https://github.com/libkml/libkml/releases

Added:
  head/science/libkml/files/patch-examples-domviewer-CMakeLists.txt   (contents, props changed)
  head/science/libkml/files/patch-examples-xsd-CMakeLists.txt   (contents, props changed)
Deleted:
  head/science/libkml/files/patch-configure.ac
  head/science/libkml/files/patch-examples-helloworld-Makefile.am
  head/science/libkml/files/patch-src-kml-base-Makefile.am
  head/science/libkml/files/patch-src-kml-base-file_posix.cc
  head/science/libkml/files/patch-src-swig-Makefile.am
  head/science/libkml/files/patch-third_party-Makefile.am
Modified:
  head/graphics/gdal/Makefile
  head/science/libkml/Makefile
  head/science/libkml/distinfo
  head/science/libkml/pkg-descr
  head/science/libkml/pkg-plist

Modified: head/graphics/gdal/Makefile
==============================================================================
--- head/graphics/gdal/Makefile	Thu Jan 12 20:02:12 2017	(r431299)
+++ head/graphics/gdal/Makefile	Thu Jan 12 20:02:17 2017	(r431300)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \

Modified: head/science/libkml/Makefile
==============================================================================
--- head/science/libkml/Makefile	Thu Jan 12 20:02:12 2017	(r431299)
+++ head/science/libkml/Makefile	Thu Jan 12 20:02:17 2017	(r431300)
@@ -2,36 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	libkml
-PORTVERSION=	1.2
-DISTVERSIONPREFIX=	release-
-PORTREVISION=	6
+PORTVERSION=	1.3.0
 CATEGORIES=	science
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Library for parse, generate, and operate on KML
+COMMENT=	Reference implementation of OGC KML 2.2
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	curl-config:ftp/curl
-LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+BUILD_DEPENDS=	boost-libs>=1.44.0:devel/boost-libs \
+		googletest>=1.7.0:devel/googletest \
+		minizip>=1.2.8:archivers/minizip
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libexpat.so:textproc/expat2 \
+		libgtest.so:devel/googletest \
+		libminizip.so:archivers/minizip \
 		liburiparser.so:net/uriparser
 
-OPTIONS_DEFINE=	SWIG
+OPTIONS_DEFINE=	EXAMPLES
 
-CONFIGURE_ARGS=	--disable-java --disable-python
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+CMAKE_ARGS=	-DWITH_JAVA=OFF -DWITH_PYTHON=OFF -DWITH_SWIG=OFF
 USE_LDCONFIG=	yes
-USES=		autoreconf gmake libtool localbase
+USES=		cmake pathfix
+
+PORTEXAMPLES=	*
 
-GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
-SWIG_BUILD_DEPENDS=	swig:devel/swig13
-SWIG_CONFIGURE_OFF=	--disable-swig
+EXAMPLES_CMAKE_OFF=	-DBUILD_EXAMPLES=OFF -DINSTALL_EXAMPLES=OFF
+EXAMPLES_CMAKE_ON=	-DBUILD_EXAMPLES=ON -DINSTALL_EXAMPLES=ON -DKML_EXAMPLES_DIR=${EXAMPLESDIR}
+EXAMPLES_LIB_DEPENDS=	libcurl.so:ftp/curl
 
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.am -exec ${REINPLACE_CMD} -e 's|-Werror||; s| -ansi -pedantic||' {} +
+post-patch-EXAMPLES-on:
+	@${REINPLACE_CMD} -e 's|DESTINATION examples/|DESTINATION $${KML_EXAMPLES_DIR}/|' ${WRKSRC}/examples/*/CMakeLists.txt
 
 .include <bsd.port.mk>

Modified: head/science/libkml/distinfo
==============================================================================
--- head/science/libkml/distinfo	Thu Jan 12 20:02:12 2017	(r431299)
+++ head/science/libkml/distinfo	Thu Jan 12 20:02:17 2017	(r431300)
@@ -1,2 +1,3 @@
-SHA256 (google-libkml-release-1.2_GH0.tar.gz) = 98b0808ac243390c09288bbc90c248879572ca7455f22dc4610aab32848d130d
-SIZE (google-libkml-release-1.2_GH0.tar.gz) = 8784768
+TIMESTAMP = 1483245177
+SHA256 (libkml-libkml-1.3.0_GH0.tar.gz) = 8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+SIZE (libkml-libkml-1.3.0_GH0.tar.gz) = 6639857

Added: head/science/libkml/files/patch-examples-domviewer-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/libkml/files/patch-examples-domviewer-CMakeLists.txt	Thu Jan 12 20:02:17 2017	(r431300)
@@ -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()

Added: head/science/libkml/files/patch-examples-xsd-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/libkml/files/patch-examples-xsd-CMakeLists.txt	Thu Jan 12 20:02:17 2017	(r431300)
@@ -0,0 +1,11 @@
+--- 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()

Modified: head/science/libkml/pkg-descr
==============================================================================
--- head/science/libkml/pkg-descr	Thu Jan 12 20:02:12 2017	(r431299)
+++ head/science/libkml/pkg-descr	Thu Jan 12 20:02:17 2017	(r431300)
@@ -2,4 +2,7 @@ This is Google's reference implementatio
 implementations of Google's gx: extensions used by Google Earth, as well as
 several utility libraries for working with other formats.
 
-WWW: https://github.com/google/libkml
+All of original documentation written by google is imported into "wiki" branch:
+https://github.com/libkml/libkml/tree/wiki
+
+WWW: https://github.com/libkml/libkml

Modified: head/science/libkml/pkg-plist
==============================================================================
--- head/science/libkml/pkg-plist	Thu Jan 12 20:02:12 2017	(r431299)
+++ head/science/libkml/pkg-plist	Thu Jan 12 20:02:17 2017	(r431300)
@@ -34,6 +34,7 @@ include/kml/convenience/google_picasa_we
 include/kml/convenience/google_spreadsheets.h
 include/kml/convenience/gpx_trk_pt_handler.h
 include/kml/convenience/http_client.h
+include/kml/convenience/kml_feature_list_saver.h
 include/kml/convenience/kmz_check_links.h
 include/kml/dom.h
 include/kml/dom/abstractlatlonbox.h
@@ -84,6 +85,7 @@ include/kml/dom/vec2.h
 include/kml/dom/visitor.h
 include/kml/dom/visitor_driver.h
 include/kml/dom/xal.h
+include/kml/dom/xsd.h
 include/kml/engine.h
 include/kml/engine/bbox.h
 include/kml/engine/clone.h
@@ -123,23 +125,6 @@ include/kml/regionator/region_handler.h
 include/kml/regionator/regionator.h
 include/kml/regionator/regionator_qid.h
 include/kml/regionator/regionator_util.h
-include/kml/third_party/boost_1_34_1/boost/assert.hpp
-include/kml/third_party/boost_1_34_1/boost/checked_delete.hpp
-include/kml/third_party/boost_1_34_1/boost/config.hpp
-include/kml/third_party/boost_1_34_1/boost/config/compiler/gcc.hpp
-include/kml/third_party/boost_1_34_1/boost/config/no_tr1/utility.hpp
-include/kml/third_party/boost_1_34_1/boost/config/platform/linux.hpp
-include/kml/third_party/boost_1_34_1/boost/config/platform/macos.hpp
-include/kml/third_party/boost_1_34_1/boost/config/posix_features.hpp
-include/kml/third_party/boost_1_34_1/boost/config/select_compiler_config.hpp
-include/kml/third_party/boost_1_34_1/boost/config/select_platform_config.hpp
-include/kml/third_party/boost_1_34_1/boost/config/select_stdlib_config.hpp
-include/kml/third_party/boost_1_34_1/boost/config/stdlib/libstdcpp3.hpp
-include/kml/third_party/boost_1_34_1/boost/config/suffix.hpp
-include/kml/third_party/boost_1_34_1/boost/config/user.hpp
-include/kml/third_party/boost_1_34_1/boost/detail/workaround.hpp
-include/kml/third_party/boost_1_34_1/boost/intrusive_ptr.hpp
-include/kml/third_party/boost_1_34_1/boost/scoped_ptr.hpp
 include/kml/xsd/xsd_complex_type.h
 include/kml/xsd/xsd_element.h
 include/kml/xsd/xsd_file.h
@@ -150,31 +135,26 @@ include/kml/xsd/xsd_simple_type.h
 include/kml/xsd/xsd_type.h
 include/kml/xsd/xsd_util.h
 include/kml/xsd/xst_parser.h
-lib/libkmlbase.a
+lib/cmake/libkml/LibKMLConfig.cmake
+lib/cmake/libkml/LibKMLConfigVersion.cmake
+lib/cmake/libkml/LibKMLTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libkml/LibKMLTargets.cmake
 lib/libkmlbase.so
-lib/libkmlbase.so.0
-lib/libkmlbase.so.0.0.0
-lib/libkmlconvenience.a
+lib/libkmlbase.so.1
+lib/libkmlbase.so.1.3.0
 lib/libkmlconvenience.so
-lib/libkmlconvenience.so.0
-lib/libkmlconvenience.so.0.0.0
-lib/libkmldom.a
+lib/libkmlconvenience.so.1
+lib/libkmlconvenience.so.1.3.0
 lib/libkmldom.so
-lib/libkmldom.so.0
-lib/libkmldom.so.0.0.0
-lib/libkmlengine.a
+lib/libkmldom.so.1
+lib/libkmldom.so.1.3.0
 lib/libkmlengine.so
-lib/libkmlengine.so.0
-lib/libkmlengine.so.0.0.0
-lib/libkmlminizip.a
-lib/libkmlminizip.so
-lib/libkmlminizip.so.0
-lib/libkmlminizip.so.0.0.0
-lib/libkmlregionator.a
+lib/libkmlengine.so.1
+lib/libkmlengine.so.1.3.0
 lib/libkmlregionator.so
-lib/libkmlregionator.so.0
-lib/libkmlregionator.so.0.0.0
-lib/libkmlxsd.a
+lib/libkmlregionator.so.1
+lib/libkmlregionator.so.1.3.0
 lib/libkmlxsd.so
-lib/libkmlxsd.so.0
-lib/libkmlxsd.so.0.0.0
+lib/libkmlxsd.so.1
+lib/libkmlxsd.so.1.3.0
+libdata/pkgconfig/libkml.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701122002.v0CK2H59039005>