Attachment #155968 for bug #199682

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

Lines 14-19 Link Here

(-)Makefile (+1 lines)
14		14
15	BUILD_DEPENDS= ${LOCALBASE}/bin/curl-config:${PORTSDIR}/ftp/curl \	15	BUILD_DEPENDS= ${LOCALBASE}/bin/curl-config:${PORTSDIR}/ftp/curl \
16	${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2	16	${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2
		17	LIB_DEPENDS= liburiparser.so:${PORTSDIR}/net/uriparser
17		18
18	OPTIONS_DEFINE= SWIG	19	OPTIONS_DEFINE= SWIG
19		20




--- src/kml/base/Makefile.in.orig	2015-04-25 08:51:41 UTC
+++ src/kml/base/Makefile.in
@@ -69,8 +69,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libkmlbase_la_DEPENDENCIES =  \
-	$(top_builddir)/third_party/libminizip.la \
-	$(top_builddir)/third_party/liburiparser.la
+	$(top_builddir)/third_party/libminizip.la
 am_libkmlbase_la_OBJECTS = attributes.lo csv_splitter.lo date_time.lo \
 	expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \
 	math_util.lo mimetypes.lo referent.lo string_util.lo \
@@ -160,7 +159,6 @@ math_util_test_LINK = $(LIBTOOL) --tag=C
 am_net_cache_test_OBJECTS = net_cache_test-net_cache_test.$(OBJEXT)
 net_cache_test_OBJECTS = $(am_net_cache_test_OBJECTS)
 net_cache_test_DEPENDENCIES = libkmlbase.la \
-	$(top_builddir)/third_party/liburiparser.la \
 	$(top_builddir)/third_party/libgtest.la
 net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -201,7 +199,6 @@ am_uri_parser_test_OBJECTS =  \
 	uri_parser_test-uri_parser_test.$(OBJEXT)
 uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS)
 uri_parser_test_DEPENDENCIES = libkmlbase.la \
-	$(top_builddir)/third_party/liburiparser.la \
 	$(top_builddir)/third_party/libgtest.la
 uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -443,7 +440,6 @@ top_srcdir = @top_srcdir@
 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
 
 @GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter  -fno-rtti
@@ -470,7 +466,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
@@ -551,7 +547,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
@@ -577,7 +573,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

Lines 1-4 Link Here

(-)files/patch-src_kml_base_file__posix.cc (-1 / +1 lines)
1	--- src/kml/base/file_posix.cc.orig 2010-01-14 00:16:30.000000000 +0000	1	--- src/kml/base/file_posix.cc.orig 2010-01-14 00:16:30 UTC
2	+++ src/kml/base/file_posix.cc	2	+++ src/kml/base/file_posix.cc
3	@@ -29,6 +29,7 @@	3	@@ -29,6 +29,7 @@
4	#include "kml/base/file.h"	4	#include "kml/base/file.h"




--- src/swig/Makefile.in.orig	2015-04-25 08:51:41 UTC
+++ src/swig/Makefile.in
@@ -289,8 +289,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 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 \




--- third_party/Makefile.in.orig	2015-04-25 08:59:24 UTC
+++ third_party/Makefile.in
@@ -108,10 +108,8 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
-	$(liburiparser_la_SOURCES)
-DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
-	$(liburiparser_la_SOURCES)
+SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) 
+DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) 
 libboostconfigcompilerincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 libboostconfigincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 libboostconfigno_tr1includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -261,11 +259,10 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 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 = \
 	zlib-1.2.3/contrib/minizip/unzip.c \
@@ -418,15 +415,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 \

Lines 178-185 Link Here

(-)pkg-plist (-4 lines)
178	lib/libminizip.so	178	lib/libminizip.so
179	lib/libminizip.so.0	179	lib/libminizip.so.0
180	lib/libminizip.so.0.0.0	180	lib/libminizip.so.0.0.0
181	lib/liburiparser.a
182	lib/liburiparser.so
183	lib/liburiparser.so.1
184	lib/liburiparser.so.1.0.5
185	@dir lib/libkml	181	@dir lib/libkml

Return to bug 199682

Line 0 Link Here

(-)files/patch-src_kml_base_Makefile.in (+63 lines)
	1	--- src/kml/base/Makefile.in.orig 2015-04-25 08:51:41 UTC
	2	+++ src/kml/base/Makefile.in
	3	@@ -69,8 +69,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
	4	libLTLIBRARIES_INSTALL = $(INSTALL)
	5	LTLIBRARIES = $(lib_LTLIBRARIES)
	6	libkmlbase_la_DEPENDENCIES = \
	7	- $(top_builddir)/third_party/libminizip.la \
	8	- $(top_builddir)/third_party/liburiparser.la
	9	+ $(top_builddir)/third_party/libminizip.la
	10	am_libkmlbase_la_OBJECTS = attributes.lo csv_splitter.lo date_time.lo \
	11	expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \
	12	math_util.lo mimetypes.lo referent.lo string_util.lo \
	13	@@ -160,7 +159,6 @@ math_util_test_LINK = $(LIBTOOL) --tag=C
	14	am_net_cache_test_OBJECTS = net_cache_test-net_cache_test.$(OBJEXT)
	15	net_cache_test_OBJECTS = $(am_net_cache_test_OBJECTS)
	16	net_cache_test_DEPENDENCIES = libkmlbase.la \
	17	- $(top_builddir)/third_party/liburiparser.la \
	18	$(top_builddir)/third_party/libgtest.la
	19	net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
	20	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
	21	@@ -201,7 +199,6 @@ am_uri_parser_test_OBJECTS = \
	22	uri_parser_test-uri_parser_test.$(OBJEXT)
	23	uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS)
	24	uri_parser_test_DEPENDENCIES = libkmlbase.la \
	25	- $(top_builddir)/third_party/liburiparser.la \
	26	$(top_builddir)/third_party/libgtest.la
	27	uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
	28	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
	29	@@ -443,7 +440,6 @@ top_srcdir = @top_srcdir@
	30	AM_CPPFLAGS = -I$(top_srcdir)/src \
	31	-I$(top_srcdir)/third_party/boost_1_34_1 \
	32	-I$(top_srcdir)/third_party/googletest-r108/include \
	33	- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
	34	-I$(top_srcdir)/third_party/zlib-1.2.3/contrib
	35
	36	@GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti
	37	@@ -470,7 +466,7 @@ libkmlbase_la_SOURCES = \
	38
	39	libkmlbase_la_LIBADD = \
	40	$(top_builddir)/third_party/libminizip.la \
	41	- $(top_builddir)/third_party/liburiparser.la
	42	+ -luriparser
	43
	44
	45	# These header files will be installed in $(includedir)/kml/base
	46	@@ -551,7 +547,7 @@ math_util_test_LDADD = libkmlbase.la \
	47	net_cache_test_SOURCES = net_cache_test.cc
	48	net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
	49	net_cache_test_LDADD = libkmlbase.la \
	50	- $(top_builddir)/third_party/liburiparser.la \
	51	+ -luriparser \
	52	$(top_builddir)/third_party/libgtest.la
	53
	54	referent_test_SOURCES = referent_test.cc
	55	@@ -577,7 +573,7 @@ time_util_test_LDADD = libkmlbase.la \
	56	uri_parser_test_SOURCES = uri_parser_test.cc
	57	uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
	58	uri_parser_test_LDADD = libkmlbase.la \
	59	- $(top_builddir)/third_party/liburiparser.la \
	60	+ -luriparser \
	61	$(top_builddir)/third_party/libgtest.la
	62
	63	util_test_SOURCES = util_test.cc

Line 0 Link Here

(-)files/patch-src_swig_Makefile.in (+12 lines)
	1	--- src/swig/Makefile.in.orig 2015-04-25 08:51:41 UTC
	2	+++ src/swig/Makefile.in
	3	@@ -289,8 +289,7 @@ top_builddir = @top_builddir@
	4	top_srcdir = @top_srcdir@
	5	SUBDIRS = java python
	6	AM_CPPFLAGS = -I$(top_srcdir)/src \
	7	- -I$(top_srcdir)/third_party/boost_1_34_1 \
	8	- -I$(top_srcdir)/third_party/uriparser-0.7.5/include
	9	+ -I$(top_srcdir)/third_party/boost_1_34_1
	10
	11	COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
	12	$(top_builddir)/src/kml/dom/libkmldom.la \

Line 0 Link Here

(-)files/patch-third__party_Makefile.in (+44 lines)
	1	--- third_party/Makefile.in.orig 2015-04-25 08:59:24 UTC
	2	+++ third_party/Makefile.in
	3	@@ -108,10 +108,8 @@ CXXLD = $(CXX)
	4	CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
	5	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
	6	$(LDFLAGS) -o $@
	7	-SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
	8	- $(liburiparser_la_SOURCES)
	9	-DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
	10	- $(liburiparser_la_SOURCES)
	11	+SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
	12	+DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
	13	libboostconfigcompilerincludeHEADERS_INSTALL = $(INSTALL_HEADER)
	14	libboostconfigincludeHEADERS_INSTALL = $(INSTALL_HEADER)
	15	libboostconfigno_tr1includeHEADERS_INSTALL = $(INSTALL_HEADER)
	16	@@ -261,11 +259,10 @@ top_builddir = @top_builddir@
	17	top_srcdir = @top_srcdir@
	18	uriparser = uriparser-0.7.5
	19	AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
	20	- -I$(top_srcdir)/third_party/$(uriparser)/include \
	21	-I$(top_srcdir)/third_party/googletest-r108 \
	22	-I$(top_srcdir)/third_party/googletest-r108/include
	23
	24	-lib_LTLIBRARIES = libminizip.la liburiparser.la
	25	+lib_LTLIBRARIES = libminizip.la
	26	noinst_LTLIBRARIES = libgtest.la
	27	libminizip_la_SOURCES = \
	28	zlib-1.2.3/contrib/minizip/unzip.c \
	29	@@ -418,15 +415,6 @@ EXTRA_DIST = \
	30	$(googletest)/include/gtest/internal/gtest-port.h \
	31	$(googletest)/include/gtest/internal/gtest-string.h \
	32	$(googletest)/include/gtest/internal/gtest-type-util.h \
	33	- $(uriparser)/COPYING \
	34	- $(uriparser).win32/debug/uriparser.lib \
	35	- $(uriparser).win32/release/uriparser.lib \
	36	- $(uriparser)/include/uriparser/Uri.h \
	37	- $(uriparser)/include/uriparser/UriBase.h \
	38	- $(uriparser)/include/uriparser/UriDefsAnsi.h \
	39	- $(uriparser)/include/uriparser/UriDefsConfig.h \
	40	- $(uriparser)/include/uriparser/UriDefsUnicode.h \
	41	- $(uriparser)/include/uriparser/UriIp4.h \
	42	zlib-1.2.3/zconf.h \
	43	zlib-1.2.3/zlib.h \
	44	zlib-1.2.3/contrib/minizip/crypt.h \