mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

- Resolve conflict with archivers/minizip: rename libminizip to libkmlminizip

Browse Source 
- Bump PORTREVISION for science/libkml shlib change

PR:		206560 (based on)
Submitted by:	Martin Birgmeier <la5lbtyi@aon.at>
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2016-04-07 13:28:46 +00:00
parent 14ac2d9514
commit fd98b2c5aa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=412662
6 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/gdal/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gdal
PORTVERSION= 2.0.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \
ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@ -113,6 +113,7 @@ XERCES_LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3
post-patch:
@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
@${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure
# Cleanup bundled libraries
@${RM} -fr ${WRKSRC}/frmts/gif/giflib/
@${RM} -fr ${WRKSRC}/frmts/gtiff/libgeotiff/

2
science/libkml/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= libkml
PORTVERSION= 1.2
DISTVERSIONPREFIX= release-
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= science
MAINTAINER= sunpoet@FreeBSD.org

11
science/libkml/files/patch-examples-helloworld-Makefile.am Normal file
View File

@ -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 \

15
science/libkml/files/patch-src-kml-base-Makefile.am
View File

@ -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

19
science/libkml/files/patch-third_party-Makefile.am
View File

@ -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

8
science/libkml/pkg-plist
View File

@ -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