Attachment #168897 for bug #206560

View | Details | Raw Unified | Return to bug 206560
Collapse All | Expand All

Lines 1-10 Link Here

(-)./science/libkml/Makefile (-2 / +20 lines)
1	# Created by: Wen Heping <wen@FreeBSD.org>	1	# Created by: Wen Heping <wen@FreeBSD.org>
2	# $FreeBSD: head/science/libkml/Makefile 412349 2016-04-01 14:25:16Z mat $	2	# $FreeBSD: head/science/libkml/Makefile 412349 2016-04-01 14:25:16Z mat $
3		3
		4	SVN_REPO= http://libkml.googlecode.com
		5	SVN_PATH= svn/trunk
		6	SVN_CMD= svn co ${SVN_REPO}/${SVN_PATH}
		7
4	PORTNAME= libkml	8	PORTNAME= libkml
5	PORTVERSION= 1.2	9	PORTVERSION= 1.3
6	DISTVERSIONPREFIX= release-	10	DISTVERSIONPREFIX= release-
7	PORTREVISION= 4
8	CATEGORIES= science	11	CATEGORIES= science
9		12
10	MAINTAINER= sunpoet@FreeBSD.org	13	MAINTAINER= sunpoet@FreeBSD.org
Lines 24-35 Link Here
24	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
25	USES= autoreconf gmake libtool localbase	28	USES= autoreconf gmake libtool localbase
26		29
		30	.if defined(SVN_REPO) && defined(SVN_PATH) && defined(SVN_CMD)
		31	NO_CHECKSUM= yes
		32	EXTRACT_DEPENDS+= svn:${PORTSDIR}/devel/subversion
		33	.else
27	GH_ACCOUNT= google	34	GH_ACCOUNT= google
28	USE_GITHUB= yes	35	USE_GITHUB= yes
		36	.endif
29		37
30	SWIG_BUILD_DEPENDS= swig:devel/swig13	38	SWIG_BUILD_DEPENDS= swig:devel/swig13
31	SWIG_CONFIGURE_OFF= --disable-swig	39	SWIG_CONFIGURE_OFF= --disable-swig
32		40
		41	.if defined(SVN_REPO) && defined(SVN_PATH) && defined(SVN_CMD)
		42	do-fetch:
		43	@${ECHO_MSG} "using SVN, fetching is done during extraction"
		44
		45	do-extract:
		46	${MKDIR} ${WRKDIR}
		47	cd ${WRKDIR} && ${SVN_CMD}
		48	cd ${WRKDIR} && mv ${SVN_PATH:T} ${DISTNAME}
		49	.endif
		50
33	post-patch:	51	post-patch:
34	@${FIND} ${WRKSRC} -name Makefile.am -exec ${REINPLACE_CMD} 's\|-Werror\|\|; s\| -ansi -pedantic\|\|' '{}' \;	52	@${FIND} ${WRKSRC} -name Makefile.am -exec ${REINPLACE_CMD} 's\|-Werror\|\|; s\| -ansi -pedantic\|\|' '{}' \;
35		53

Line 0 Link Here

(-)./science/libkml/files/patch-examples-helloworld-Makefile.am.2 (+11 lines)
	1	--- ./examples/helloworld/Makefile.am.ORIG 2015-06-27 12:18:17.000000000 +0200
	2	+++ ./examples/helloworld/Makefile.am 2015-06-27 12:26:22.000000000 +0200
	3	@@ -10,7 +10,7 @@
	4	noinst_LTLIBRARIES = libhelloutil.la
	5
	6	libhelloutil_la_SOURCES = print.cc
	7	-libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la
	8	+libhelloutil_la_LIBADD = $(top_builddir)/third_party/libkmlminizip.la
	9
	10	noinst_PROGRAMS = countkml createkml checklinks circlegen helloattrs helloenum \
	11	hellofeatures hellofolder hellogeometry hellohref hellokmz \




--- src/kml/base/Makefile.am.orig	2015-06-27 14:13:04.000000000 +0200
+++ src/kml/base/Makefile.am	2015-06-27 14:15:52.000000000 +0200
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src \
               -I$(top_srcdir)/third_party/boost_1_34_1 \

               -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
 
 if GCC
@@ -32,7 +31,7 @@
 
 libkmlbase_la_LIBADD = \
 	$(top_builddir)/third_party/libminizip.la \

 
 # These header files will be installed in $(includedir)/kml/base
 libkmlbaseincludedir = $(includedir)/kml/base
@@ -138,7 +137,7 @@
 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_main.la
 
 referent_test_SOURCES = referent_test.cc
@@ -164,7 +163,7 @@
 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_main.la
 
 util_test_SOURCES = util_test.cc




--- src/kml/base/Makefile.am.orig	2015-06-27 14:18:03.000000000 +0200
+++ src/kml/base/Makefile.am	2015-06-27 14:18:45.000000000 +0200
@@ -30,7 +30,7 @@
 	zip_file.cc
 
 libkmlbase_la_LIBADD = \
-	$(top_builddir)/third_party/libminizip.la \
+	$(top_builddir)/third_party/libkmlminizip.la \
 	-luriparser
 
 # These header files will be installed in $(includedir)/kml/base
@@ -204,7 +204,7 @@
 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_main.la
 
 CLEANFILES = check_PROGRAMS




--- third_party/Makefile.am.orig	2015-06-27 14:20:39.000000000 +0200
+++ third_party/Makefile.am	2015-06-27 14:21:47.000000000 +0200
@@ -1,11 +1,8 @@
-uriparser = uriparser-0.7.5
-

 
-lib_LTLIBRARIES = libminizip.la liburiparser.la
+lib_LTLIBRARIES = libminizip.la
 noinst_LTLIBRARIES = libgtest.la libgtest_main.la
 
 libminizip_la_SOURCES = \
@@ -15,27 +12,6 @@
 	zlib-1.2.3/contrib/minizip/zip.c
 libminizip_la_LDFLAGS = -lz
 

 boost_root = boost_1_34_1
 boost = $(boost_root)/boost
 boostinc = $(includedir)/kml/third_party/$(boost)
@@ -79,13 +55,13 @@
 
 googletest = googletest-r108
 libgtest_la_SOURCES = \

+	googletest-r108/src/gtest-test-part.cc \
+	googletest-r108/src/gtest-typed-test.cc
 
 libgtest_main_la_SOURCES = $(googletest)/src/gtest_main.cc
 libgtest_main_la_LIBADD = libgtest.la
@@ -162,15 +138,6 @@
 	$(googletest)/include/gtest/internal/gtest-port.h \
 	$(googletest)/include/gtest/internal/gtest-string.h \
 	$(googletest)/include/gtest/internal/gtest-type-util.h \




--- third_party/Makefile.am.orig	2015-06-27 14:23:22.000000000 +0200
+++ third_party/Makefile.am	2015-06-27 14:24:09.000000000 +0200
@@ -2,15 +2,15 @@
 	      -I$(top_srcdir)/third_party/googletest-r108 \
 	      -I$(top_srcdir)/third_party/googletest-r108/include
 
-lib_LTLIBRARIES = libminizip.la
+lib_LTLIBRARIES = libkmlminizip.la
 noinst_LTLIBRARIES = libgtest.la libgtest_main.la
 
-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
+libkmlminizip_la_LDFLAGS = -lz
 
 boost_root = boost_1_34_1
 boost = $(boost_root)/boost




--- third_party/Makefile.am.bak	2015-06-27 14:25:22.000000000 +0200
+++ third_party/Makefile.am	2015-06-27 14:40:31.000000000 +0200
@@ -63,7 +63,7 @@
 	googletest-r108/src/gtest-test-part.cc \
 	googletest-r108/src/gtest-typed-test.cc
 
-libgtest_main_la_SOURCES = $(googletest)/src/gtest_main.cc
+libgtest_main_la_SOURCES = googletest-r108/src/gtest_main.cc
 libgtest_main_la_LIBADD = libgtest.la
 
 EXTRA_DIST = \
@@ -122,22 +122,22 @@
 	$(boost)/config/stdlib/sgi.hpp \
 	$(boost)/config/stdlib/stlport.hpp \
 	$(boost)/config/stdlib/vacpp.hpp \
-	$(googletest).win32/debug/gtest.lib \
-	$(googletest).win32/release/gtest.lib \
-	$(googletest)/include/gtest/gtest.h \
-	$(googletest)/include/gtest/gtest-death-test.h \
-	$(googletest)/include/gtest/gtest-message.h \
-	$(googletest)/include/gtest/gtest-spi.h \
-	$(googletest)/include/gtest/gtest_pred_impl.h \
-	$(googletest)/include/gtest/gtest_prod.h \
-	$(googletest)/include/gtest/gtest-test-part.h \
-	$(googletest)/include/gtest/gtest-typed-test.h \
-	$(googletest)/include/gtest/internal/gtest-death-test-internal.h \
-	$(googletest)/include/gtest/internal/gtest-filepath.h \
-	$(googletest)/include/gtest/internal/gtest-internal.h \
-	$(googletest)/include/gtest/internal/gtest-port.h \
-	$(googletest)/include/gtest/internal/gtest-string.h \
-	$(googletest)/include/gtest/internal/gtest-type-util.h \
+	googletest-r108.win32/debug/gtest.lib \
+	googletest-r108.win32/release/gtest.lib \
+	googletest-r108/include/gtest/gtest.h \
+	googletest-r108/include/gtest/gtest-death-test.h \
+	googletest-r108/include/gtest/gtest-message.h \
+	googletest-r108/include/gtest/gtest-spi.h \
+	googletest-r108/include/gtest/gtest_pred_impl.h \
+	googletest-r108/include/gtest/gtest_prod.h \
+	googletest-r108/include/gtest/gtest-test-part.h \
+	googletest-r108/include/gtest/gtest-typed-test.h \
+	googletest-r108/include/gtest/internal/gtest-death-test-internal.h \
+	googletest-r108/include/gtest/internal/gtest-filepath.h \
+	googletest-r108/include/gtest/internal/gtest-internal.h \
+	googletest-r108/include/gtest/internal/gtest-port.h \
+	googletest-r108/include/gtest/internal/gtest-string.h \
+	googletest-r108/include/gtest/internal/gtest-type-util.h \
 	zlib-1.2.3/zconf.h \
 	zlib-1.2.3/zlib.h \
 	zlib-1.2.3/contrib/minizip/crypt.h \

Lines 174-180 Link Here

(-)./science/libkml/pkg-plist (-4 / +4 lines)
174	lib/libkmlxsd.so	174	lib/libkmlxsd.so
175	lib/libkmlxsd.so.0	175	lib/libkmlxsd.so.0
176	lib/libkmlxsd.so.0.0.0	176	lib/libkmlxsd.so.0.0.0
177	lib/libminizip.a	177	lib/libkmlminizip.a
178	lib/libminizip.so	178	lib/libkmlminizip.so
179	lib/libminizip.so.0	179	lib/libkmlminizip.so.0
180	lib/libminizip.so.0.0.0	180	lib/libkmlminizip.so.0.0.0




--- ./configure.ORIG	2016-04-02 15:00:11.111477000 +0200
+++ ./configure	2016-04-02 15:11:27.922239000 +0200
@@ -24808,9 +24808,9 @@
             libkml_include_dir2="$libkml_prefix/include/kml"
             libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
             if test "$libkml_prefix" = "/usr"; then
-                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
             else
-                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
             fi
             run_libkml_test="yes"
         elif test "$libkml_requested" = "yes"; then




--- ./m4/ax_lib_libkml.m4.ORIG	2016-04-02 14:59:57.338342000 +0200
+++ ./m4/ax_lib_libkml.m4	2016-04-02 15:11:21.031713000 +0200
@@ -137,9 +137,9 @@
             libkml_include_dir2="$libkml_prefix/include/kml"
             libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
             if test "$libkml_prefix" = "/usr"; then
-                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
             else
-                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
             fi
             run_libkml_test="yes"
         elif test "$libkml_requested" = "yes"; then

Return to bug 206560

Lines 1-5 Link Here

(-)./science/libkml/files/patch-src-kml-base-Makefile.am (-9 / +9 lines)
1	--- src/kml/base/Makefile.am.orig 2010-02-19 15:52:05 UTC	1	--- src/kml/base/Makefile.am.orig 2015-06-27 14:13:04.000000000 +0200
2	+++ src/kml/base/Makefile.am	2	+++ src/kml/base/Makefile.am 2015-06-27 14:15:52.000000000 +0200
3	@@ -1,7 +1,6 @@	3	@@ -1,7 +1,6 @@
4	AM_CPPFLAGS = -I$(top_srcdir)/src \	4	AM_CPPFLAGS = -I$(top_srcdir)/src \
5	-I$(top_srcdir)/third_party/boost_1_34_1 \	5	-I$(top_srcdir)/third_party/boost_1_34_1 \
Lines 8-14 Link Here
8	-I$(top_srcdir)/third_party/zlib-1.2.3/contrib	8	-I$(top_srcdir)/third_party/zlib-1.2.3/contrib
9		9
10	if GCC	10	if GCC
11	@@ -32,7 +31,7 @@ libkmlbase_la_SOURCES = \	11	@@ -32,7 +31,7 @@
12		12
13	libkmlbase_la_LIBADD = \	13	libkmlbase_la_LIBADD = \
14	$(top_builddir)/third_party/libminizip.la \	14	$(top_builddir)/third_party/libminizip.la \
Lines 17-37 Link Here
17		17
18	# These header files will be installed in $(includedir)/kml/base	18	# These header files will be installed in $(includedir)/kml/base
19	libkmlbaseincludedir = $(includedir)/kml/base	19	libkmlbaseincludedir = $(includedir)/kml/base
20	@@ -138,7 +137,7 @@ math_util_test_LDADD = libkmlbase.la \	20	@@ -138,7 +137,7 @@
21	net_cache_test_SOURCES = net_cache_test.cc	21	net_cache_test_SOURCES = net_cache_test.cc
22	net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)	22	net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
23	net_cache_test_LDADD = libkmlbase.la \	23	net_cache_test_LDADD = libkmlbase.la \
24	- $(top_builddir)/third_party/liburiparser.la \	24	- $(top_builddir)/third_party/liburiparser.la \
25	+ -luriparser \	25	+ -luriparser \
26	$(top_builddir)/third_party/libgtest.la	26	$(top_builddir)/third_party/libgtest_main.la
27		27
28	referent_test_SOURCES = referent_test.cc	28	referent_test_SOURCES = referent_test.cc
29	@@ -164,7 +163,7 @@ time_util_test_LDADD= libkmlbase.la \	29	@@ -164,7 +163,7 @@
30	uri_parser_test_SOURCES = uri_parser_test.cc	30	uri_parser_test_SOURCES = uri_parser_test.cc
31	uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)	31	uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
32	uri_parser_test_LDADD= libkmlbase.la \	32	uri_parser_test_LDADD= libkmlbase.la \
33	- $(top_builddir)/third_party/liburiparser.la \	33	- $(top_builddir)/third_party/liburiparser.la \
34	+ -luriparser \	34	+ -luriparser \
35	$(top_builddir)/third_party/libgtest.la	35	$(top_builddir)/third_party/libgtest_main.la
36		36
37	util_test_SOURCES = util_test.cc	37	util_test_SOURCES = util_test.cc

Lines 1-5 Link Here

(-)./science/libkml/files/patch-third_party-Makefile.am (-8 / +8 lines)
1	--- third_party/Makefile.am.orig 2010-02-19 15:52:05 UTC	1	--- third_party/Makefile.am.orig 2015-06-27 14:20:39.000000000 +0200
2	+++ third_party/Makefile.am	2	+++ third_party/Makefile.am 2015-06-27 14:21:47.000000000 +0200
3	@@ -1,11 +1,8 @@	3	@@ -1,11 +1,8 @@
4	-uriparser = uriparser-0.7.5	4	-uriparser = uriparser-0.7.5
5	-	5	-
Lines 10-19 Link Here
10		10
11	-lib_LTLIBRARIES = libminizip.la liburiparser.la	11	-lib_LTLIBRARIES = libminizip.la liburiparser.la
12	+lib_LTLIBRARIES = libminizip.la	12	+lib_LTLIBRARIES = libminizip.la
13	noinst_LTLIBRARIES = libgtest.la	13	noinst_LTLIBRARIES = libgtest.la libgtest_main.la
14		14
15	libminizip_la_SOURCES = \	15	libminizip_la_SOURCES = \
16	@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \	16	@@ -15,27 +12,6 @@
17	zlib-1.2.3/contrib/minizip/zip.c	17	zlib-1.2.3/contrib/minizip/zip.c
18	libminizip_la_LDFLAGS = -lz	18	libminizip_la_LDFLAGS = -lz
19		19
Lines 41-47 Link Here
41	boost_root = boost_1_34_1	41	boost_root = boost_1_34_1
42	boost = $(boost_root)/boost	42	boost = $(boost_root)/boost
43	boostinc = $(includedir)/kml/third_party/$(boost)	43	boostinc = $(includedir)/kml/third_party/$(boost)
44	@@ -79,13 +55,13 @@ libboostconfigplatforminclude_HEADERS =	44	@@ -79,13 +55,13 @@
45		45
46	googletest = googletest-r108	46	googletest = googletest-r108
47	libgtest_la_SOURCES = \	47	libgtest_la_SOURCES = \
Lines 60-68 Link Here
60	+ googletest-r108/src/gtest-test-part.cc \	60	+ googletest-r108/src/gtest-test-part.cc \
61	+ googletest-r108/src/gtest-typed-test.cc	61	+ googletest-r108/src/gtest-typed-test.cc
62		62
63	EXTRA_DIST = \	63	libgtest_main_la_SOURCES = $(googletest)/src/gtest_main.cc
64	expat.win32/expat.h \	64	libgtest_main_la_LIBADD = libgtest.la
65	@@ -159,15 +135,6 @@ EXTRA_DIST = \	65	@@ -162,15 +138,6 @@
66	$(googletest)/include/gtest/internal/gtest-port.h \	66	$(googletest)/include/gtest/internal/gtest-port.h \
67	$(googletest)/include/gtest/internal/gtest-string.h \	67	$(googletest)/include/gtest/internal/gtest-string.h \
68	$(googletest)/include/gtest/internal/gtest-type-util.h \	68	$(googletest)/include/gtest/internal/gtest-type-util.h \

Line 0 Link Here

(-)./science/libkml/files/patch-third_party-Makefile.am.3 (+50 lines)
	1	--- third_party/Makefile.am.bak 2015-06-27 14:25:22.000000000 +0200
	2	+++ third_party/Makefile.am 2015-06-27 14:40:31.000000000 +0200
	3	@@ -63,7 +63,7 @@
	4	googletest-r108/src/gtest-test-part.cc \
	5	googletest-r108/src/gtest-typed-test.cc
	6
	7	-libgtest_main_la_SOURCES = $(googletest)/src/gtest_main.cc
	8	+libgtest_main_la_SOURCES = googletest-r108/src/gtest_main.cc
	9	libgtest_main_la_LIBADD = libgtest.la
	10
	11	EXTRA_DIST = \
	12	@@ -122,22 +122,22 @@
	13	$(boost)/config/stdlib/sgi.hpp \
	14	$(boost)/config/stdlib/stlport.hpp \
	15	$(boost)/config/stdlib/vacpp.hpp \
	16	- $(googletest).win32/debug/gtest.lib \
	17	- $(googletest).win32/release/gtest.lib \
	18	- $(googletest)/include/gtest/gtest.h \
	19	- $(googletest)/include/gtest/gtest-death-test.h \
	20	- $(googletest)/include/gtest/gtest-message.h \
	21	- $(googletest)/include/gtest/gtest-spi.h \
	22	- $(googletest)/include/gtest/gtest_pred_impl.h \
	23	- $(googletest)/include/gtest/gtest_prod.h \
	24	- $(googletest)/include/gtest/gtest-test-part.h \
	25	- $(googletest)/include/gtest/gtest-typed-test.h \
	26	- $(googletest)/include/gtest/internal/gtest-death-test-internal.h \
	27	- $(googletest)/include/gtest/internal/gtest-filepath.h \
	28	- $(googletest)/include/gtest/internal/gtest-internal.h \
	29	- $(googletest)/include/gtest/internal/gtest-port.h \
	30	- $(googletest)/include/gtest/internal/gtest-string.h \
	31	- $(googletest)/include/gtest/internal/gtest-type-util.h \
	32	+ googletest-r108.win32/debug/gtest.lib \
	33	+ googletest-r108.win32/release/gtest.lib \
	34	+ googletest-r108/include/gtest/gtest.h \
	35	+ googletest-r108/include/gtest/gtest-death-test.h \
	36	+ googletest-r108/include/gtest/gtest-message.h \
	37	+ googletest-r108/include/gtest/gtest-spi.h \
	38	+ googletest-r108/include/gtest/gtest_pred_impl.h \
	39	+ googletest-r108/include/gtest/gtest_prod.h \
	40	+ googletest-r108/include/gtest/gtest-test-part.h \
	41	+ googletest-r108/include/gtest/gtest-typed-test.h \
	42	+ googletest-r108/include/gtest/internal/gtest-death-test-internal.h \
	43	+ googletest-r108/include/gtest/internal/gtest-filepath.h \
	44	+ googletest-r108/include/gtest/internal/gtest-internal.h \
	45	+ googletest-r108/include/gtest/internal/gtest-port.h \
	46	+ googletest-r108/include/gtest/internal/gtest-string.h \
	47	+ googletest-r108/include/gtest/internal/gtest-type-util.h \
	48	zlib-1.2.3/zconf.h \
	49	zlib-1.2.3/zlib.h \
	50	zlib-1.2.3/contrib/minizip/crypt.h \

Line 0 Link Here

(-)./graphics/gdal/files/patch-configure (+14 lines)
	1	--- ./configure.ORIG 2016-04-02 15:00:11.111477000 +0200
	2	+++ ./configure 2016-04-02 15:11:27.922239000 +0200
	3	@@ -24808,9 +24808,9 @@
	4	libkml_include_dir2="$libkml_prefix/include/kml"
	5	libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
	6	if test "$libkml_prefix" = "/usr"; then
	7	- libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
	8	+ libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
	9	else
	10	- libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
	11	+ libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
	12	fi
	13	run_libkml_test="yes"
	14	elif test "$libkml_requested" = "yes"; then

Line 0 Link Here

(-)./graphics/gdal/files/patch-m4-ax_lib_libkml.m4 (+14 lines)
	1	--- ./m4/ax_lib_libkml.m4.ORIG 2016-04-02 14:59:57.338342000 +0200
	2	+++ ./m4/ax_lib_libkml.m4 2016-04-02 15:11:21.031713000 +0200
	3	@@ -137,9 +137,9 @@
	4	libkml_include_dir2="$libkml_prefix/include/kml"
	5	libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
	6	if test "$libkml_prefix" = "/usr"; then
	7	- libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
	8	+ libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
	9	else
	10	- libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
	11	+ libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
	12	fi
	13	run_libkml_test="yes"
	14	elif test "$libkml_requested" = "yes"; then