6 files changed, 90 insertions, 18 deletions

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index ef0c327eb088..73e34d74e0a3 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -2,27 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	merkaartor
-PORTVERSION=	0.18.1
-PORTREVISION=	8
+PORTVERSION=	0.18.2
 CATEGORIES=	astro
-MASTER_SITES=	http://merkaartor.be/attachments/download/301/ \
-		https://secure.ohos.nl/downloads/
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	Openstreetmap mapping program
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libproj.so:${PORTSDIR}/graphics/proj
-
-BROKEN=		does not build with GDAL 2.0
-
-USES=		qmake tar:bzip2
+		libproj.so:${PORTSDIR}/graphics/proj \
+		libquazip5.so:${PORTSDIR}/archivers/quazip-qt5 \
+		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	openstreetmap
+GH_PROJECT=	${PORTNAME}
+USES=		pkgconfig qmake
 USE_LDCONFIG=	yes
 
-USE_QT4=	uic_build moc_build rcc_build \
-		gui network svg webkit xml imageformats script scripttools
+QMAKE_ARGS=	SYSTEM_QUAZIP=1
+USE_QT5=	buildtools_build \
+		concurrent core gui imageformats network printsupport svg \
+		webkit widgets xml
 
 OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS ZBAR
 OPTIONS_DEFAULT=	GEOIMAGE
@@ -34,11 +37,12 @@ GEOIMAGE_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+# graphics/zbar needs to be built with Qt support (and needs a Qt5 version)
 ZBAR_BROKEN=	Does not build with option ZBAR selected
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
-NLS_USE=	QT4=linguist_build
+NLS_USE=	QT5=linguist_build
 
 OPTIONS_SUB=	yes
 
diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo
index 63354c2cb7fa..80e2761acd68 100644
--- a/astro/merkaartor/distinfo
+++ b/astro/merkaartor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (merkaartor-0.18.1.tar.bz2) = 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f
-SIZE (merkaartor-0.18.1.tar.bz2) = 5579080
+SHA256 (openstreetmap-merkaartor-0.18.2_GH0.tar.gz) = 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508
+SIZE (openstreetmap-merkaartor-0.18.2_GH0.tar.gz) = 6267866
diff --git a/astro/merkaartor/files/patch-git_a6f3d9f2 b/astro/merkaartor/files/patch-git_a6f3d9f2
new file mode 100644
index 000000000000..77e396699414
--- /dev/null
+++ b/astro/merkaartor/files/patch-git_a6f3d9f2
@@ -0,0 +1,22 @@
+From a6f3d9f2133e3656b9c63441c600a7219b54450c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Mon, 27 Jul 2015 11:01:52 +0200
+Subject: [PATCH] Fixed version info in tarballs.
+
+--- src/Config.pri.orig	2015-07-19 14:50:09 UTC
++++ src/Config.pri
+@@ -1,7 +1,12 @@
+ # see http://merkaartor.be/wiki/merkaartor/Compiling
+ 
+-REVISION = $$system(git describe --tags)
+-VERSION = $$system(git describe --tags | sed "'s/-g.*//;s/-/./g'")
++REVISION = $$system(git describe --tags 2> /dev/null)
++VERSION = $$system(git describe --tags 2> /dev/null | sed "'s/-g.*//;s/-/./g'")
++isEmpty( REVISION ) {
++	REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
++	VERSION = $$REVISION
++}
++
+ ARCH=""
+ BITS=""
+ win32 {
diff --git a/astro/merkaartor/files/patch-git_e6d015a9 b/astro/merkaartor/files/patch-git_e6d015a9
new file mode 100644
index 000000000000..36f389ea6c86
--- /dev/null
+++ b/astro/merkaartor/files/patch-git_e6d015a9
@@ -0,0 +1,36 @@
+commit e6d015a953a163f174e09a9b50c9bb8bc19593e4
+Author: Ladislav Láska <krakonos@krakonos.org>
+Date:   Mon Jul 27 14:22:37 2015 +0200
+
+    Fixed compilation issues with GEOIMAGE=1 and Qt5.
+
+--- src/Docks/GeoImageDock.cpp.orig	2015-07-19 14:50:09 UTC
++++ src/Docks/GeoImageDock.cpp
+@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis
+ 
+     Exiv2::Image::AutoPtr image;
+     Exiv2::ExifData exifData;
+-    bool positionValid = FALSE;
++    bool positionValid = false;
+ 
+     Layer *theLayer;
+     if (photoLayer == NULL) {
+@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(
+     double lat = 0.0, lon = 0.0;
+     Exiv2::Image::AutoPtr image;
+     Exiv2::ExifData exifData;
+-    bool positionValid = FALSE;
++    bool positionValid = false;
+ 
+     if (!QFile::exists(file)) {
+         return pos;
+--- src/Docks/GeoImageDock.h.orig	2015-07-19 14:50:09 UTC
++++ src/Docks/GeoImageDock.h
+@@ -9,6 +9,7 @@
+ #include <QtWidgets/QShortcut>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <QDrag>
+ 
+ class ImageView;
+ 
diff --git a/astro/merkaartor/files/patch-src_src.pro b/astro/merkaartor/files/patch-src_src.pro
new file mode 100644
index 000000000000..28afade9d899
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_src.pro
@@ -0,0 +1,12 @@
+Link against the right library name for archivers/quazip-qt5.
+--- src/src.pro.orig	2015-12-28 22:27:47 UTC
++++ src/src.pro
+@@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) {
+   DEFINES += QUAZIP_STATIC
+   include(../3rdparty/quazip-0.7/quazip.pri)
+ } else {
+-  LIBS += -lquazip
++  LIBS += -lquazip5
+ }
+ 
+ #Qt Version
diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
index 5308b80682cb..79651a7d727a 100644
--- a/astro/merkaartor/pkg-plist
+++ b/astro/merkaartor/pkg-plist
@@ -1,10 +1,8 @@
 bin/merkaartor
-lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
-lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
-lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
 lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
 lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
-lib/merkaartor/plugins/styles/libskulpture.so
+lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
+lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
 share/applications/merkaartor.desktop
 share/icons/hicolor/48x48/apps/merkaartor.png
 %%DATADIR%%/BookmarksList.xml