- Update to last git snapshot version (no official release for a long time)

- Remove boost dependency
- Remove GDAL and PROJ options as they are now required

PR:		ports/165767
Submitted by:	Oliver Heesakkers <dev2@heesakkers.info> (maintainer)
Approved by:	glarkin@ (mentor, implicit)
Feature safe:	yes

5 files changed, 19 insertions, 36 deletions

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index eb5343ba6536..51eaecb16cff 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	merkaartor
-PORTVERSION=	0.17.2
-PORTREVISION=	2
+PORTVERSION=	0.18.a
 CATEGORIES=	astro
-MASTER_SITES=	http://www.merkaartor.be/attachments/download/253/
+MASTER_SITES=	https://secure.ohos.nl/downloads/
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	An openstreetmap mapping program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
+		proj:${PORTSDIR}/graphics/proj
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -33,8 +33,6 @@ INSTALLS_ICONS=	yes
 QMAKEFLAGS=	PREFIX=${PREFIX}
 
 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
 
@@ -45,26 +43,13 @@ QMAKEFLAGS+=	GEOIMAGE=1
 LIB_DEPENDS+=	exiv2.10:${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
+QMAKEFLAGS+=	NODEBUG=1
 .endif
 
 .if defined(WITHOUT_NLS)
diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo
index 5b0131afd030..f57f9c7c1aa0 100644
--- a/astro/merkaartor/distinfo
+++ b/astro/merkaartor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (merkaartor-0.17.2.tar.bz2) = 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
-SIZE (merkaartor-0.17.2.tar.bz2) = 7138991
+SHA256 (merkaartor-0.18.a.tar.bz2) = 10c7d132e243f7ce789b33dfcb163d169ef102b925ea97e6e1cc982a27bcff0d
+SIZE (merkaartor-0.18.a.tar.bz2) = 5537190
diff --git a/astro/merkaartor/files/patch-src__Config.pri b/astro/merkaartor/files/patch-src__Config.pri
new file mode 100644
index 000000000000..d217585d1e7c
--- /dev/null
+++ b/astro/merkaartor/files/patch-src__Config.pri
@@ -0,0 +1,10 @@
+--- ./src/Config.pri.orig	2012-03-05 23:22:23.000000000 +0100
++++ ./src/Config.pri	2012-03-05 23:22:47.000000000 +0100
+@@ -13,6 +13,7 @@
+         REVISION="-git"
+     }
+ }
++REVISION="-dev"
+ 
+ win32|macx {
+     system(echo $${LITERAL_HASH}define SVNREV $${SVNREV} > revision.h )
diff --git a/astro/merkaartor/files/patch-src__Sync__DownloadOSM.cpp b/astro/merkaartor/files/patch-src__Sync__DownloadOSM.cpp
deleted file mode 100644
index c92b9ef1cddc..000000000000
--- a/astro/merkaartor/files/patch-src__Sync__DownloadOSM.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Sync/DownloadOSM.cpp.orig	2011-06-28 02:32:00.000000000 +0200
-+++ ./src/Sync/DownloadOSM.cpp	2011-06-28 02:33:10.000000000 +0200
-@@ -252,7 +252,7 @@
- 
-     QString sReq = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority);
-     QHttpRequestHeader Header(Method,sReq);
--    Header.setValue("Host",url.host()+':'+url.port(80));
-+    Header.setValue("Host",url.host()+':'+QString::number(url.port(80)));
-     Header.setValue("User-Agent", USER_AGENT);
- 
-     QString auth = QString("%1:%2").arg(User).arg(Password);
diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
index 962a8dc10811..15506adec422 100644
--- a/astro/merkaartor/pkg-plist
+++ b/astro/merkaartor/pkg-plist
@@ -4,8 +4,8 @@ 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/background/libMGdalBackgroundPlugin.so
+lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
 lib/merkaartor/plugins/styles/libskulpture.so
 share/applications/merkaartor.desktop
 share/icons/hicolor/48x48/apps/merkaartor.png
@@ -31,7 +31,6 @@ share/icons/hicolor/48x48/apps/merkaartor.png
 %%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
-%%DATADIR%%/world_background.osb
 %%NLS%%@dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/48x48/apps