Attachment 168897 Details for Bug 206560 – patches to science/libkml and graphics/gdal to rename libkml's libminizip to libkmlminizip

[patch] patches to science/libkml and graphics/gdal to rename libkml's libminizip to libkmlminizip

patch.txt (text/plain), 12.39 KB, created by Martin Birgmeier on 2016-04-02 15:48:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Birgmeier

Created: 2016-04-02 15:48:39 UTC

Size: 12.39 KB

patch

obsolete

>--- ./science/libkml/Makefile.ORIG	2016-04-01 18:41:20.199343663 +0200
>+++ ./science/libkml/Makefile	2016-04-01 18:02:03.067501376 +0200
>@@ -1,10 +1,13 @@
> # Created by: Wen Heping <wen@FreeBSD.org>
> # $FreeBSD: head/science/libkml/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
>+SVN_REPO=	http://libkml.googlecode.com
>+SVN_PATH=	svn/trunk
>+SVN_CMD=	svn co ${SVN_REPO}/${SVN_PATH}
>+
> PORTNAME=	libkml
>-PORTVERSION=	1.2
>+PORTVERSION=	1.3
> DISTVERSIONPREFIX=	release-
>-PORTREVISION=	4
> CATEGORIES=	science
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -24,12 +27,27 @@
> USE_LDCONFIG=	yes
> USES=		autoreconf gmake libtool localbase
> 
>+.if defined(SVN_REPO) && defined(SVN_PATH) && defined(SVN_CMD)
>+NO_CHECKSUM=	yes
>+EXTRACT_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
>+.else
> GH_ACCOUNT=	google
> USE_GITHUB=	yes
>+.endif
> 
> SWIG_BUILD_DEPENDS=	swig:devel/swig13
> SWIG_CONFIGURE_OFF=	--disable-swig
> 
>+.if defined(SVN_REPO) && defined(SVN_PATH) && defined(SVN_CMD)
>+do-fetch:
>+	@${ECHO_MSG} "using SVN, fetching is done during extraction"
>+
>+do-extract:
>+	${MKDIR} ${WRKDIR}
>+	cd ${WRKDIR} && ${SVN_CMD}
>+	cd ${WRKDIR} && mv ${SVN_PATH:T} ${DISTNAME}
>+.endif
>+
> post-patch:
> 	@${FIND} ${WRKSRC} -name Makefile.am -exec ${REINPLACE_CMD} 's|-Werror||; s| -ansi -pedantic||' '{}' \;
> 
>--- ./science/libkml/files/XXXpatch-examples-helloworld-Makefile.am.2.ORIG	2015-06-27 12:31:10.675988214 +0200
>+++ ./science/libkml/files/patch-examples-helloworld-Makefile.am.2	2015-06-27 12:29:21.093995862 +0200
>@@ -0,0 +1,11 @@
>+--- ./examples/helloworld/Makefile.am.ORIG	2015-06-27 12:18:17.000000000 +0200
>++++ ./examples/helloworld/Makefile.am	2015-06-27 12:26:22.000000000 +0200
>+@@ -10,7 +10,7 @@
>+ 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 \
>--- ./science/libkml/files/XXXpatch-src-kml-base-Makefile.am.ORIG	2015-04-29 19:14:06.098390804 +0200
>+++ ./science/libkml/files/patch-src-kml-base-Makefile.am	2015-06-27 14:17:02.895613643 +0200
>@@ -1,5 +1,5 @@
>---- src/kml/base/Makefile.am.orig	2010-02-19 15:52:05 UTC
>-+++ src/kml/base/Makefile.am
>+--- 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 \
>@@ -8,7 +8,7 @@
>                -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
>  
>  if GCC
>-@@ -32,7 +31,7 @@ libkmlbase_la_SOURCES = \
>+@@ -32,7 +31,7 @@
>  
>  libkmlbase_la_LIBADD = \
>  	$(top_builddir)/third_party/libminizip.la \
>@@ -17,21 +17,21 @@
>  
>  # These header files will be installed in $(includedir)/kml/base
>  libkmlbaseincludedir = $(includedir)/kml/base
>-@@ -138,7 +137,7 @@ math_util_test_LDADD = libkmlbase.la \
>+@@ -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.la
>++	-luriparser \
>+ 	$(top_builddir)/third_party/libgtest_main.la
>  
>  referent_test_SOURCES = referent_test.cc
>-@@ -164,7 +163,7 @@ time_util_test_LDADD= libkmlbase.la \
>+@@ -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.la
>++	-luriparser \
>+ 	$(top_builddir)/third_party/libgtest_main.la
>  
>  util_test_SOURCES = util_test.cc
>--- ./science/libkml/files/XXXpatch-src-kml-base-Makefile.am.2.ORIG	2015-06-27 12:31:10.676980157 +0200
>+++ ./science/libkml/files/patch-src-kml-base-Makefile.am.2	2015-06-27 14:20:13.709602209 +0200
>@@ -0,0 +1,20 @@
>+--- 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
>--- ./science/libkml/files/XXXpatch-third_party-Makefile.am.ORIG	2015-04-29 19:14:06.096394208 +0200
>+++ ./science/libkml/files/patch-third_party-Makefile.am	2015-06-27 14:22:35.530655052 +0200
>@@ -1,5 +1,5 @@
>---- third_party/Makefile.am.orig	2010-02-19 15:52:05 UTC
>-+++ third_party/Makefile.am
>+--- 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
> -
>@@ -10,10 +10,10 @@
>  
> -lib_LTLIBRARIES = libminizip.la liburiparser.la
> +lib_LTLIBRARIES = libminizip.la
>- noinst_LTLIBRARIES = libgtest.la
>+ noinst_LTLIBRARIES = libgtest.la libgtest_main.la
>  
>  libminizip_la_SOURCES = \
>-@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \
>+@@ -15,27 +12,6 @@
>  	zlib-1.2.3/contrib/minizip/zip.c
>  libminizip_la_LDFLAGS = -lz
>  
>@@ -41,7 +41,7 @@
>  boost_root = boost_1_34_1
>  boost = $(boost_root)/boost
>  boostinc = $(includedir)/kml/third_party/$(boost)
>-@@ -79,13 +55,13 @@ libboostconfigplatforminclude_HEADERS = 
>+@@ -79,13 +55,13 @@
>  
>  googletest = googletest-r108
>  libgtest_la_SOURCES = \
>@@ -60,9 +60,9 @@
> +	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 = \
>+ 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 \
>--- ./science/libkml/files/XXXpatch-third_party-Makefile.am.2.ORIG	2015-06-27 12:31:10.677980411 +0200
>+++ ./science/libkml/files/patch-third_party-Makefile.am.2	2015-06-27 14:24:50.498593586 +0200
>@@ -0,0 +1,21 @@
>+--- 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
>--- ./science/libkml/files/XXXpatch-third_party-Makefile.am.3.ORIG	2015-06-27 14:43:22.973439053 +0200
>+++ ./science/libkml/files/patch-third_party-Makefile.am.3	2015-06-27 14:43:00.000000000 +0200
>@@ -0,0 +1,50 @@
>+--- 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 \
>--- ./science/libkml/pkg-plist.ORIG	2015-04-29 19:14:06.151397394 +0200
>+++ ./science/libkml/pkg-plist	2015-06-27 12:23:29.395074355 +0200
>@@ -174,7 +174,7 @@
> 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/libkmlminizip.a
>+lib/libkmlminizip.so
>+lib/libkmlminizip.so.0
>+lib/libkmlminizip.so.0.0.0
>--- ./graphics/gdal/files/XXXpatch-configure.ORIG	2016-04-02 15:14:06.768095541 +0200
>+++ ./graphics/gdal/files/patch-configure	2016-04-02 15:12:26.000000000 +0200
>@@ -0,0 +1,14 @@
>+--- ./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
>--- ./graphics/gdal/files/XXXpatch-m4-ax_lib_libkml.m4.ORIG	2016-04-02 15:14:13.175088172 +0200
>+++ ./graphics/gdal/files/patch-m4-ax_lib_libkml.m4	2016-04-02 15:12:19.000000000 +0200
>@@ -0,0 +1,14 @@
>+--- ./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

Actions: View | Diff

Attachments on bug 206560: 168897