- Update to 0.17.0

- Add more options

PR:		ports/153492
Submitted by:	Oliver Heesakkers <dev2@heesakkers.info>
Approved by:	maintainer(timeout, >20 days)
Feature safe:	yes

4 files changed, 49 insertions, 6 deletions

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 48b2f3e4b3fb..42a87de8e9dd 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	merkaartor
-PORTVERSION=	0.16.3
+PORTVERSION=	0.17.0
 CATEGORIES=	astro
-MASTER_SITES=	http://www.merkaartor.be/attachments/download/29/
+MASTER_SITES=	http://www.merkaartor.be/attachments/download/192/
 
 MAINTAINER=	slaven@rezic.de
 COMMENT=	An openstreetmap mapping program
@@ -27,7 +27,11 @@ INSTALLS_ICONS=	yes
 
 QMAKEFLAGS=	PREFIX=${PREFIX}
 
-OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on
+OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on\
+		GDAL     "Use the Geospatial Data Abstraction Library" on\
+		PROJ     "Use the Cartographic Projections Library" on\
+		ZBAR     "Read barcodes from walking papers" off\
+		DEBUG    "Enable debugging and verbose logging" off
 
 .include <bsd.port.options.mk>
 
@@ -36,6 +40,28 @@ QMAKEFLAGS+=	GEOIMAGE=1
 LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
 .endif
 
+.if defined(WITH_GDAL)
+QMAKEFLAGS+=	GDAL=1
+LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
+PLIST_SUB+=	GDAL=""
+.else
+PLIST_SUB+=	GDAL="@comment "
+.endif
+
+.if defined(WITH_PROJ)
+QMAKEFLAGS+=	PROJ=1
+LIB_DEPENDS+=	proj:${PORTSDIR}/graphics/proj
+.endif
+
+.if defined(WITH_ZBAR)
+QMAKEFLAGS+=	ZBAR=1
+LIB_DEPENDS+=	zbar:${PORTSDIR}/graphics/zbar
+.endif
+
+.if !defined(WITH_DEBUG)
+QMAKEFLAGS+=	RELEASE=1 NODEBUG=1
+.endif
+
 .if defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS="@comment "
 .else
diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo
index 4ef04b11f575..e1437e6e053f 100644
--- a/astro/merkaartor/distinfo
+++ b/astro/merkaartor/distinfo
@@ -1,3 +1,2 @@
-MD5 (merkaartor-0.16.3.tar.bz2) = 4ff2bc53c2f37704a55463372fa7d376
-SHA256 (merkaartor-0.16.3.tar.bz2) = 1f42c2565c0642caee51b9b19624bea9eed7a4b997dd3ade4b99c61f48b6df22
-SIZE (merkaartor-0.16.3.tar.bz2) = 5793565
+SHA256 (merkaartor-0.17.0.tar.bz2) = 5287b72af50bbf88bdf24c09a3ea3b686e29603eb82f1446ada404c293df3642
+SIZE (merkaartor-0.17.0.tar.bz2) = 7138228
diff --git a/astro/merkaartor/files/patch-log2 b/astro/merkaartor/files/patch-log2
new file mode 100644
index 000000000000..70f4f68f1d64
--- /dev/null
+++ b/astro/merkaartor/files/patch-log2
@@ -0,0 +1,11 @@
+--- plugins/background/MMsBingMapBackground/msbingmapadapter.h.orig	2010-12-20 18:05:31.000000000 +0100
++++ plugins/background/MMsBingMapBackground/msbingmapadapter.h	2010-12-20 18:06:29.000000000 +0100
+@@ -13,6 +13,8 @@
+     QRectF bbox;
+ };
+ 
++#define log2(x) (log(x) / M_LN2)
++
+ //! MapAdapter for Ms Bing Maps
+ /*!
+  * This is a conveniece class, which extends and configures a TileMapAdapter
diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
index 07ea7967507c..aaefb1c82e0a 100644
--- a/astro/merkaartor/pkg-plist
+++ b/astro/merkaartor/pkg-plist
@@ -2,6 +2,10 @@ bin/merkaartor
 lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
 lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
 lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
+lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
+lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
+%%GDAL%%lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
+%%GDAL%%lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
 lib/merkaartor/plugins/styles/libskulpture.so
 share/applications/merkaartor.desktop
 share/icons/hicolor/48x48/apps/merkaartor.png
@@ -24,6 +28,9 @@ share/icons/hicolor/48x48/apps/merkaartor.png
 %%NLS%%%%DATADIR%%/translations/merkaartor_sk.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_uk.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
 %%DATADIR%%/world_background.osb
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%