From fc9ab6c4ed0d1484f4f648aa9e26eb6c3a19bf34 Mon Sep 17 00:00:00 2001
From: Lars Engels <lme@FreeBSD.org>
Date: Sun, 24 Apr 2016 19:14:17 +0000
Subject: - Use qt5-linguisttools to produce *.qm translation files. - Add
 option to enable support for Protobuf Binary Format (export/import). - Move
 sqlite dependency to USES. - Fix pkg-descr ('based on Qt4' -> 'based on
 Qt5'). - Bump PORTREVISION. - While here, pet portlint by adding
 INSTALLS_ICONS

PR:		208684
Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>
Approved by:	maintainer
Sponsored by:	Essen Linuxhotel Hackathon 2016
---
 astro/merkaartor/Makefile  | 20 +++++++++++++++-----
 astro/merkaartor/pkg-descr |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'astro')

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 5bd922536d7b..86226f4fc755 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.18.2
+PORTREVISION=	1
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
@@ -13,13 +14,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
-		libquazip5.so:archivers/quazip-qt5 \
-		libsqlite3.so:databases/sqlite3
+		libquazip5.so:archivers/quazip-qt5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 GH_PROJECT=	${PORTNAME}
-USES=		pkgconfig qmake
+USES=		pkgconfig sqlite:3 qmake
 USE_LDCONFIG=	yes
 
 QMAKE_ARGS=	SYSTEM_QUAZIP=1
@@ -27,13 +27,17 @@ USE_QT5=	buildtools_build \
 		concurrent core gui imageformats network printsupport svg \
 		webkit widgets xml
 
-OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS ZBAR
+OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS PROTOBUF ZBAR
 OPTIONS_DEFAULT=	GEOIMAGE
 
 GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
 GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
 GEOIMAGE_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
+PROTOBUF_DESC=	Protobuf Binary Format support
+PROTOBUF_QMAKE_ON=	PROTOBUF=1
+PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
+
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
@@ -42,13 +46,19 @@ ZBAR_BROKEN=	Does not build with option ZBAR selected
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
-NLS_USE=	QT5=linguist_build
+NLS_USE=	QT5=linguisttools_build
+
+INSTALLS_ICONS= yes
 
 OPTIONS_SUB=	yes
 
 pre-build-NLS-on:
 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
 
+pre-build-PROTOBUF-on:
+	@cd ${WRKSRC}/src/ImportExport && ${LOCALBASE}/bin/protoc --cpp_out=. \
+		fileformat.proto osmformat.proto
+
 post-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
diff --git a/astro/merkaartor/pkg-descr b/astro/merkaartor/pkg-descr
index bbe8a9ff7e78..44f7b7a29d32 100644
--- a/astro/merkaartor/pkg-descr
+++ b/astro/merkaartor/pkg-descr
@@ -2,6 +2,6 @@ Merkaartor is an openstreetmap mapping program. Merkaartor focuses on
 providing a visually pleasing but performant editing environment for
 free geographical data.
 
-It is based on Qt4.
+It is based on Qt5.
 
 WWW: http://merkaartor.be/
-- 
cgit v1.2.3