Index: head/science/libkml/Makefile =================================================================== --- head/science/libkml/Makefile (revision 384926) +++ head/science/libkml/Makefile (revision 384927) @@ -1,38 +1,39 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= libkml PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for parse, generate, and operate on KML 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 CONFIGURE_ARGS= --disable-java --disable-python \ --with-expat-include-dir=${LOCALBASE}/include \ --with-expat-lib-dir=${LOCALBASE}/lib GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USES= autoreconf gmake libtool GH_ACCOUNT= google GH_PROJECT= ${PORTNAME} GH_TAGNAME= release-${PORTVERSION} USE_GITHUB= yes SWIG_BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 SWIG_CONFIGURE_OFF= --disable-swig post-patch: @${FIND} ${WRKSRC} -name Makefile.am -exec ${REINPLACE_CMD} 's|-Werror||; s| -ansi -pedantic||' '{}' \; .include Index: head/science/libkml/files/patch-src-kml-base-Makefile.am =================================================================== --- head/science/libkml/files/patch-src-kml-base-Makefile.am (nonexistent) +++ head/science/libkml/files/patch-src-kml-base-Makefile.am (revision 384927) @@ -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 Property changes on: head/science/libkml/files/patch-src-kml-base-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/libkml/files/patch-src-swig-Makefile.am =================================================================== --- head/science/libkml/files/patch-src-swig-Makefile.am (nonexistent) +++ head/science/libkml/files/patch-src-swig-Makefile.am (revision 384927) @@ -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 \ Property changes on: head/science/libkml/files/patch-src-swig-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/libkml/files/patch-third_party-Makefile.am =================================================================== --- head/science/libkml/files/patch-third_party-Makefile.am (revision 384926) +++ head/science/libkml/files/patch-third_party-Makefile.am (revision 384927) @@ -1,66 +1,80 @@ --- 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 \ - $(uriparser)/lib/UriEscape.c \ - $(uriparser)/lib/UriFile.c \ - $(uriparser)/lib/UriIp4.c \ - $(uriparser)/lib/UriIp4Base.c \ - $(uriparser)/lib/UriIp4Base.h \ - $(uriparser)/lib/UriNormalize.c \ - $(uriparser)/lib/UriNormalizeBase.c \ - $(uriparser)/lib/UriNormalizeBase.h \ - $(uriparser)/lib/UriParse.c \ - $(uriparser)/lib/UriParseBase.c \ - $(uriparser)/lib/UriParseBase.h \ - $(uriparser)/lib/UriQuery.c \ - $(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 = \ - $(googletest)/src/gtest.cc \ - $(googletest)/src/gtest-death-test.cc \ - $(googletest)/src/gtest-filepath.cc \ - $(googletest)/src/gtest-internal-inl.h \ - $(googletest)/src/gtest-port.cc \ - $(googletest)/src/gtest-test-part.cc \ - $(googletest)/src/gtest-typed-test.cc + googletest-r108/src/gtest.cc \ + googletest-r108/src/gtest-death-test.cc \ + googletest-r108/src/gtest-filepath.cc \ + googletest-r108/src/gtest-internal-inl.h \ + googletest-r108/src/gtest-port.cc \ + googletest-r108/src/gtest-test-part.cc \ + googletest-r108/src/gtest-typed-test.cc 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 \ Index: head/science/libkml/pkg-plist =================================================================== --- head/science/libkml/pkg-plist (revision 384926) +++ head/science/libkml/pkg-plist (revision 384927) @@ -1,184 +1,180 @@ include/kml/base/attributes.h include/kml/base/color32.h include/kml/base/csv_splitter.h include/kml/base/date_time.h include/kml/base/expat_handler.h include/kml/base/expat_handler_ns.h include/kml/base/expat_parser.h include/kml/base/file.h include/kml/base/math_util.h include/kml/base/memory_file.h include/kml/base/mimetypes.h include/kml/base/net_cache.h include/kml/base/referent.h include/kml/base/string_util.h include/kml/base/tempfile.h include/kml/base/time_util.h include/kml/base/util.h include/kml/base/vec3.h include/kml/base/version.h include/kml/base/xml_element.h include/kml/base/xml_file.h include/kml/base/xml_namespaces.h include/kml/base/xmlns.h include/kml/base/zip_file.h include/kml/convenience/atom_util.h include/kml/convenience/convenience.h include/kml/convenience/csv_file.h include/kml/convenience/csv_parser.h include/kml/convenience/element_counter.h include/kml/convenience/feature_list.h include/kml/convenience/google_doc_list.h include/kml/convenience/google_maps_data.h include/kml/convenience/google_picasa_web.h include/kml/convenience/google_spreadsheets.h include/kml/convenience/gpx_trk_pt_handler.h include/kml/convenience/http_client.h include/kml/convenience/kmz_check_links.h include/kml/dom.h include/kml/dom/abstractlatlonbox.h include/kml/dom/abstractview.h include/kml/dom/atom.h include/kml/dom/balloonstyle.h include/kml/dom/colorstyle.h include/kml/dom/container.h include/kml/dom/document.h include/kml/dom/element.h include/kml/dom/extendeddata.h include/kml/dom/feature.h include/kml/dom/folder.h include/kml/dom/geometry.h include/kml/dom/gx_timeprimitive.h 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.h include/kml/dom/kml_cast.h include/kml/dom/kml_factory.h include/kml/dom/kml_funcs.h include/kml/dom/kml_ptr.h include/kml/dom/kmldom.h include/kml/dom/labelstyle.h include/kml/dom/linestyle.h include/kml/dom/link.h include/kml/dom/liststyle.h include/kml/dom/model.h include/kml/dom/networklink.h include/kml/dom/networklinkcontrol.h include/kml/dom/object.h include/kml/dom/overlay.h include/kml/dom/parser.h include/kml/dom/parser_observer.h include/kml/dom/placemark.h include/kml/dom/polystyle.h include/kml/dom/region.h include/kml/dom/schema.h include/kml/dom/snippet.h include/kml/dom/style.h include/kml/dom/stylemap.h include/kml/dom/styleselector.h include/kml/dom/substyle.h include/kml/dom/timeprimitive.h include/kml/dom/vec2.h include/kml/dom/visitor.h include/kml/dom/visitor_driver.h include/kml/dom/xal.h include/kml/engine.h include/kml/engine/bbox.h include/kml/engine/clone.h include/kml/engine/engine_types.h include/kml/engine/entity_mapper.h include/kml/engine/feature_balloon.h include/kml/engine/feature_view.h include/kml/engine/feature_visitor.h include/kml/engine/find.h include/kml/engine/find_xml_namespaces.h include/kml/engine/get_link_parents.h include/kml/engine/get_links.h include/kml/engine/href.h include/kml/engine/id_mapper.h include/kml/engine/kml_cache.h include/kml/engine/kml_file.h include/kml/engine/kml_stream.h include/kml/engine/kml_uri.h include/kml/engine/kmz_cache.h include/kml/engine/kmz_file.h include/kml/engine/link_util.h include/kml/engine/location_util.h include/kml/engine/merge.h include/kml/engine/object_id_parser_observer.h include/kml/engine/old_schema_parser_observer.h include/kml/engine/parse_old_schema.h include/kml/engine/schema_parser_observer.h include/kml/engine/shared_style_parser_observer.h include/kml/engine/style_inliner.h include/kml/engine/style_merger.h include/kml/engine/style_resolver.h include/kml/engine/style_splitter.h include/kml/engine/update.h include/kml/regionator/feature_list_region_handler.h include/kml/regionator/feature_list_regionator.h 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 include/kml/xsd/xsd_handler.h include/kml/xsd/xsd_primitive_type.h include/kml/xsd/xsd_schema.h 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/libkmlbase.so lib/libkmlbase.so.0 lib/libkmlbase.so.0.0.0 lib/libkmlconvenience.a lib/libkmlconvenience.so lib/libkmlconvenience.so.0 lib/libkmlconvenience.so.0.0.0 lib/libkmldom.a lib/libkmldom.so lib/libkmldom.so.0 lib/libkmldom.so.0.0.0 lib/libkmlengine.a lib/libkmlengine.so lib/libkmlengine.so.0 lib/libkmlengine.so.0.0.0 lib/libkmlregionator.a lib/libkmlregionator.so lib/libkmlregionator.so.0 lib/libkmlregionator.so.0.0.0 lib/libkmlxsd.a lib/libkmlxsd.so lib/libkmlxsd.so.0 lib/libkmlxsd.so.0.0.0 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