Date: Tue, 28 Apr 2015 17:50:44 +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: r384927 - in head/science/libkml: . files Message-ID: <201504281750.t3SHoinQ017127@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Tue Apr 28 17:50:43 2015 New Revision: 384927 URL: https://svnweb.freebsd.org/changeset/ports/384927 Log: - Use net/uriparser instead of bundled one - Bump PORTREVISION for dependency and package change PR: 199682 (based on) Submitted by: mat Added: head/science/libkml/files/patch-src-kml-base-Makefile.am (contents, props changed) head/science/libkml/files/patch-src-swig-Makefile.am (contents, props changed) Modified: head/science/libkml/Makefile head/science/libkml/files/patch-third_party-Makefile.am head/science/libkml/pkg-plist Modified: head/science/libkml/Makefile ============================================================================== --- head/science/libkml/Makefile Tue Apr 28 17:47:33 2015 (r384926) +++ head/science/libkml/Makefile Tue Apr 28 17:50:43 2015 (r384927) @@ -3,7 +3,7 @@ PORTNAME= libkml PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org @@ -13,6 +13,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/bin/curl-config:${PORTSDIR}/ftp/curl \ ${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= liburiparser.so:${PORTSDIR}/net/uriparser OPTIONS_DEFINE= SWIG Added: head/science/libkml/files/patch-src-kml-base-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/libkml/files/patch-src-kml-base-Makefile.am Tue Apr 28 17:50:43 2015 (r384927) @@ -0,0 +1,37 @@ +--- src/kml/base/Makefile.am.orig 2010-02-19 15:52:05 UTC ++++ src/kml/base/Makefile.am +@@ -1,7 +1,6 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/third_party/boost_1_34_1 \ + -I$(top_srcdir)/third_party/googletest-r108/include \ +- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \ + -I$(top_srcdir)/third_party/zlib-1.2.3/contrib + + if GCC +@@ -32,7 +31,7 @@ libkmlbase_la_SOURCES = \ + + libkmlbase_la_LIBADD = \ + $(top_builddir)/third_party/libminizip.la \ +- $(top_builddir)/third_party/liburiparser.la ++ -luriparser + + # These header files will be installed in $(includedir)/kml/base + libkmlbaseincludedir = $(includedir)/kml/base +@@ -138,7 +137,7 @@ math_util_test_LDADD = libkmlbase.la \ + net_cache_test_SOURCES = net_cache_test.cc + net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) + net_cache_test_LDADD = libkmlbase.la \ +- $(top_builddir)/third_party/liburiparser.la \ ++ -luriparser \ + $(top_builddir)/third_party/libgtest.la + + referent_test_SOURCES = referent_test.cc +@@ -164,7 +163,7 @@ time_util_test_LDADD= libkmlbase.la \ + uri_parser_test_SOURCES = uri_parser_test.cc + uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) + uri_parser_test_LDADD= libkmlbase.la \ +- $(top_builddir)/third_party/liburiparser.la \ ++ -luriparser \ + $(top_builddir)/third_party/libgtest.la + + util_test_SOURCES = util_test.cc Added: head/science/libkml/files/patch-src-swig-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/libkml/files/patch-src-swig-Makefile.am Tue Apr 28 17:50:43 2015 (r384927) @@ -0,0 +1,12 @@ +--- src/swig/Makefile.am.orig 2010-02-19 15:52:05 UTC ++++ src/swig/Makefile.am +@@ -1,8 +1,7 @@ + SUBDIRS = java python + + AM_CPPFLAGS = -I$(top_srcdir)/src \ +- -I$(top_srcdir)/third_party/boost_1_34_1 \ +- -I$(top_srcdir)/third_party/uriparser-0.7.5/include ++ -I$(top_srcdir)/third_party/boost_1_34_1 + + COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \ + $(top_builddir)/src/kml/dom/libkmldom.la \ Modified: head/science/libkml/files/patch-third_party-Makefile.am ============================================================================== --- head/science/libkml/files/patch-third_party-Makefile.am Tue Apr 28 17:47:33 2015 (r384926) +++ head/science/libkml/files/patch-third_party-Makefile.am Tue Apr 28 17:50:43 2015 (r384927) @@ -1,9 +1,23 @@ --- third_party/Makefile.am.orig 2010-02-19 15:52:05 UTC +++ third_party/Makefile.am -@@ -16,24 +16,24 @@ libminizip_la_SOURCES = \ +@@ -1,11 +1,8 @@ +-uriparser = uriparser-0.7.5 +- + AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \ +- -I$(top_srcdir)/third_party/$(uriparser)/include \ + -I$(top_srcdir)/third_party/googletest-r108 \ + -I$(top_srcdir)/third_party/googletest-r108/include + +-lib_LTLIBRARIES = libminizip.la liburiparser.la ++lib_LTLIBRARIES = libminizip.la + noinst_LTLIBRARIES = libgtest.la + + libminizip_la_SOURCES = \ +@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \ + zlib-1.2.3/contrib/minizip/zip.c libminizip_la_LDFLAGS = -lz - liburiparser_la_SOURCES = \ +-liburiparser_la_SOURCES = \ - $(uriparser)/lib/UriCommon.c \ - $(uriparser)/lib/UriCommon.h \ - $(uriparser)/lib/UriCompare.c \ @@ -22,28 +36,12 @@ - $(uriparser)/lib/UriRecompose.c \ - $(uriparser)/lib/UriResolve.c \ - $(uriparser)/lib/UriShorten.c -+ uriparser-0.7.5/lib/UriCommon.c \ -+ uriparser-0.7.5/lib/UriCommon.h \ -+ uriparser-0.7.5/lib/UriCompare.c \ -+ uriparser-0.7.5/lib/UriEscape.c \ -+ uriparser-0.7.5/lib/UriFile.c \ -+ uriparser-0.7.5/lib/UriIp4.c \ -+ uriparser-0.7.5/lib/UriIp4Base.c \ -+ uriparser-0.7.5/lib/UriIp4Base.h \ -+ uriparser-0.7.5/lib/UriNormalize.c \ -+ uriparser-0.7.5/lib/UriNormalizeBase.c \ -+ uriparser-0.7.5/lib/UriNormalizeBase.h \ -+ uriparser-0.7.5/lib/UriParse.c \ -+ uriparser-0.7.5/lib/UriParseBase.c \ -+ uriparser-0.7.5/lib/UriParseBase.h \ -+ uriparser-0.7.5/lib/UriQuery.c \ -+ uriparser-0.7.5/lib/UriRecompose.c \ -+ uriparser-0.7.5/lib/UriResolve.c \ -+ uriparser-0.7.5/lib/UriShorten.c - liburiparser_la_LDFLAGS = -version-info 1:5:0 - +-liburiparser_la_LDFLAGS = -version-info 1:5:0 +- boost_root = boost_1_34_1 -@@ -79,13 +79,13 @@ libboostconfigplatforminclude_HEADERS = + boost = $(boost_root)/boost + boostinc = $(includedir)/kml/third_party/$(boost) +@@ -79,13 +55,13 @@ libboostconfigplatforminclude_HEADERS = googletest = googletest-r108 libgtest_la_SOURCES = \ @@ -64,3 +62,19 @@ EXTRA_DIST = \ expat.win32/expat.h \ +@@ -159,15 +135,6 @@ EXTRA_DIST = \ + $(googletest)/include/gtest/internal/gtest-port.h \ + $(googletest)/include/gtest/internal/gtest-string.h \ + $(googletest)/include/gtest/internal/gtest-type-util.h \ +- $(uriparser)/COPYING \ +- $(uriparser).win32/debug/uriparser.lib \ +- $(uriparser).win32/release/uriparser.lib \ +- $(uriparser)/include/uriparser/Uri.h \ +- $(uriparser)/include/uriparser/UriBase.h \ +- $(uriparser)/include/uriparser/UriDefsAnsi.h \ +- $(uriparser)/include/uriparser/UriDefsConfig.h \ +- $(uriparser)/include/uriparser/UriDefsUnicode.h \ +- $(uriparser)/include/uriparser/UriIp4.h \ + zlib-1.2.3/zconf.h \ + zlib-1.2.3/zlib.h \ + zlib-1.2.3/contrib/minizip/crypt.h \ Modified: head/science/libkml/pkg-plist ============================================================================== --- head/science/libkml/pkg-plist Tue Apr 28 17:47:33 2015 (r384926) +++ head/science/libkml/pkg-plist Tue Apr 28 17:50:43 2015 (r384927) @@ -178,7 +178,3 @@ lib/libminizip.a lib/libminizip.so lib/libminizip.so.0 lib/libminizip.so.0.0.0 -lib/liburiparser.a -lib/liburiparser.so -lib/liburiparser.so.1 -lib/liburiparser.so.1.0.5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504281750.t3SHoinQ017127>