diff options
author | sunpoet <sunpoet@FreeBSD.org> | 2016-04-07 21:28:46 +0800 |
---|---|---|
committer | sunpoet <sunpoet@FreeBSD.org> | 2016-04-07 21:28:46 +0800 |
commit | 63ec267806b5ff322d3afe6fcd9bcbf1386e9897 (patch) | |
tree | 8942bf2aeab509bd5bf00a7c161af7414ff7c7a1 /science/libkml | |
parent | cb6380896567ca27485ea16eb4c75622d6255dad (diff) | |
download | freebsd-ports-gnome-63ec267806b5ff322d3afe6fcd9bcbf1386e9897.tar.gz freebsd-ports-gnome-63ec267806b5ff322d3afe6fcd9bcbf1386e9897.tar.zst freebsd-ports-gnome-63ec267806b5ff322d3afe6fcd9bcbf1386e9897.zip |
- Resolve conflict with archivers/minizip: rename libminizip to libkmlminizip
- Bump PORTREVISION for science/libkml shlib change
PR: 206560 (based on)
Submitted by: Martin Birgmeier <la5lbtyi@aon.at>
Diffstat (limited to 'science/libkml')
-rw-r--r-- | science/libkml/Makefile | 2 | ||||
-rw-r--r-- | science/libkml/files/patch-examples-helloworld-Makefile.am | 11 | ||||
-rw-r--r-- | science/libkml/files/patch-src-kml-base-Makefile.am | 15 | ||||
-rw-r--r-- | science/libkml/files/patch-third_party-Makefile.am | 19 | ||||
-rw-r--r-- | science/libkml/pkg-plist | 8 |
5 files changed, 40 insertions, 15 deletions
diff --git a/science/libkml/Makefile b/science/libkml/Makefile index 99d7226f4fd0..b237856866de 100644 --- a/science/libkml/Makefile +++ b/science/libkml/Makefile @@ -4,7 +4,7 @@ PORTNAME= libkml PORTVERSION= 1.2 DISTVERSIONPREFIX= release- -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org diff --git a/science/libkml/files/patch-examples-helloworld-Makefile.am b/science/libkml/files/patch-examples-helloworld-Makefile.am new file mode 100644 index 000000000000..f8c12159112d --- /dev/null +++ b/science/libkml/files/patch-examples-helloworld-Makefile.am @@ -0,0 +1,11 @@ +--- examples/helloworld/Makefile.am.orig 2010-02-19 15:52:05 UTC ++++ examples/helloworld/Makefile.am +@@ -10,7 +10,7 @@ endif + noinst_LTLIBRARIES = libhelloutil.la + + libhelloutil_la_SOURCES = print.cc +-libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la ++libhelloutil_la_LIBADD = $(top_builddir)/third_party/libkmlminizip.la + + noinst_PROGRAMS = countkml createkml checklinks circlegen helloattrs helloenum \ + hellofeatures hellofolder hellogeometry hellohref hellokmz \ diff --git a/science/libkml/files/patch-src-kml-base-Makefile.am b/science/libkml/files/patch-src-kml-base-Makefile.am index 92c259dc4f19..873635622418 100644 --- a/science/libkml/files/patch-src-kml-base-Makefile.am +++ b/science/libkml/files/patch-src-kml-base-Makefile.am @@ -8,11 +8,13 @@ -I$(top_srcdir)/third_party/zlib-1.2.3/contrib if GCC -@@ -32,7 +31,7 @@ libkmlbase_la_SOURCES = \ +@@ -31,8 +30,8 @@ libkmlbase_la_SOURCES = \ + zip_file.cc libkmlbase_la_LIBADD = \ - $(top_builddir)/third_party/libminizip.la \ +- $(top_builddir)/third_party/libminizip.la \ - $(top_builddir)/third_party/liburiparser.la ++ $(top_builddir)/third_party/libkmlminizip.la \ + -luriparser # These header files will be installed in $(includedir)/kml/base @@ -35,3 +37,12 @@ $(top_builddir)/third_party/libgtest.la util_test_SOURCES = util_test.cc +@@ -205,7 +204,7 @@ xmlns_test_LDADD= libkmlbase.la \ + zip_file_test_SOURCES = zip_file_test.cc + zip_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) + zip_file_test_LDADD= libkmlbase.la \ +- $(top_builddir)/third_party/libminizip.la \ ++ $(top_builddir)/third_party/libkmlminizip.la \ + $(top_builddir)/third_party/libgtest.la + + CLEANFILES = check_PROGRAMS diff --git a/science/libkml/files/patch-third_party-Makefile.am b/science/libkml/files/patch-third_party-Makefile.am index d3e1f7655edb..d4a5b6b775aa 100644 --- a/science/libkml/files/patch-third_party-Makefile.am +++ b/science/libkml/files/patch-third_party-Makefile.am @@ -1,6 +1,6 @@ --- third_party/Makefile.am.orig 2010-02-19 15:52:05 UTC +++ third_party/Makefile.am -@@ -1,11 +1,8 @@ +@@ -1,40 +1,16 @@ -uriparser = uriparser-0.7.5 - AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \ @@ -9,14 +9,17 @@ -I$(top_srcdir)/third_party/googletest-r108/include -lib_LTLIBRARIES = libminizip.la liburiparser.la -+lib_LTLIBRARIES = libminizip.la ++lib_LTLIBRARIES = libkmlminizip.la noinst_LTLIBRARIES = libgtest.la - libminizip_la_SOURCES = \ -@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \ +-libminizip_la_SOURCES = \ ++libkmlminizip_la_SOURCES = \ + zlib-1.2.3/contrib/minizip/unzip.c \ + zlib-1.2.3/contrib/minizip/ioapi.c \ + zlib-1.2.3/contrib/minizip/iomem_simple.c \ zlib-1.2.3/contrib/minizip/zip.c - libminizip_la_LDFLAGS = -lz - +-libminizip_la_LDFLAGS = -lz +- -liburiparser_la_SOURCES = \ - $(uriparser)/lib/UriCommon.c \ - $(uriparser)/lib/UriCommon.h \ @@ -37,10 +40,10 @@ - $(uriparser)/lib/UriResolve.c \ - $(uriparser)/lib/UriShorten.c -liburiparser_la_LDFLAGS = -version-info 1:5:0 -- ++libkmlminizip_la_LDFLAGS = -lz + boost_root = boost_1_34_1 boost = $(boost_root)/boost - boostinc = $(includedir)/kml/third_party/$(boost) @@ -79,13 +55,13 @@ libboostconfigplatforminclude_HEADERS = googletest = googletest-r108 diff --git a/science/libkml/pkg-plist b/science/libkml/pkg-plist index 8ced233c0652..63480291f536 100644 --- a/science/libkml/pkg-plist +++ b/science/libkml/pkg-plist @@ -166,6 +166,10 @@ lib/libkmlengine.a 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/libkmlregionator.so lib/libkmlregionator.so.0 @@ -174,7 +178,3 @@ 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 |