Add a patch to fix build against gdal 2.0.0 API.

While here switch to github for MASTER_SITES, merkaartor.be doesnt
provide downloads anymore.

geo/merkaartor/Makefile

@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.18 2015/03/27 08:11:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2015/06/27 06:59:01 landry Exp $
 
 COMMENT =	OpenStreetMap editor
 
-DISTNAME =	merkaartor-0.18.1
-EXTRACT_SUFX =	.tar.bz2
+GH_ACCOUNT =	openstreetmap
+GH_PROJECT =	merkaartor
+GH_TAGNAME =	0.18.1
+DISTNAME =	${GH_PROJECT}-${GH_TAGNAME}
 SHARED_ONLY =	Yes
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	geo x11
 
@@ -15,8 +17,6 @@ MAINTAINER =	Landry Breuil <landry@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
-MASTER_SITES =	http://merkaartor.be/attachments/download/301/
-
 NO_TEST =	Yes
 MODULES =	devel/gettext x11/qt4
 RUN_DEPENDS =	devel/desktop-file-utils \

geo/merkaartor/distinfo

@@ -1,2 +1,2 @@
-SHA256 (merkaartor-0.18.1.tar.bz2) = PWqWWZgV1fHIVYrNJVpBPqR7k92thBQUfRF3Wm8hE58=
-SIZE (merkaartor-0.18.1.tar.bz2) = 5579080
+SHA256 (merkaartor-0.18.1.tar.gz) = 6fpeMOY5LJIk9z6bt9F7ZsTrbAI2M+sq8M9YuorPaE8=
+SIZE (merkaartor-0.18.1.tar.gz) = 6459640

geo/merkaartor/patches/patch-src_ImportExport_ImportExportGdal_cpp

@@ -0,0 +1,52 @@
+$OpenBSD: patch-src_ImportExport_ImportExportGdal_cpp,v 1.1 2015/06/27 06:59:01 landry Exp $
+
+Adapt for GDAL 2.0 API.
+
+--- src/ImportExport/ImportExportGdal.cpp.orig	Sat Jun 27 08:15:15 2015
++++ src/ImportExport/ImportExportGdal.cpp	Sat Jun 27 08:22:01 2015
+@@ -58,7 +58,7 @@ bool ImportExportGdal::export_(const QList<Feature *>&
+ 
+     OGRRegisterAll();
+ 
+-    poDriver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(pszDriverName);
++    poDriver = GetGDALDriverManager()->GetDriverByName(pszDriverName);
+     if( poDriver == NULL )
+     {
+         qDebug( "%s driver not available.", pszDriverName );
+@@ -424,7 +424,7 @@ bool ImportExportGdal::import(Layer* aLayer)
+ 
+     OGRDataSource       *poDS;
+ 
+-    poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
++    poDS = reinterpret_cast<OGRDataSource*>(GDALOpenEx( FileName.toUtf8().constData(), GDAL_OF_VECTOR, NULL, NULL,NULL));
+     if( poDS == NULL )
+     {
+         qDebug( "GDAL Open failed.\n" );
+@@ -433,7 +433,7 @@ bool ImportExportGdal::import(Layer* aLayer)
+ 
+     importGDALDataset(poDS, aLayer, M_PREFS->getGdalConfirmProjection());
+ 
+-    OGRDataSource::DestroyDataSource( poDS );
++    GDALClose(( GDALDatasetH) poDS);
+ 
+     return true;
+ }
+@@ -448,7 +448,8 @@ bool ImportExportGdal::import(Layer* aLayer, const QBy
+     GByte* content = (GByte*)(ba.constData());
+     /*FILE* f = */VSIFileFromMemBuffer("/vsimem/temp", content, ba.size(), FALSE);
+ 
+-    poDS = OGRSFDriverRegistrar::Open( "/vsimem/temp", FALSE );
++    poDS = reinterpret_cast<OGRDataSource*>(GDALOpenEx("/vsimem/temp", GDAL_OF_VECTOR, NULL, NULL,NULL));
++
+     if( poDS == NULL )
+     {
+         qDebug( "GDAL Open failed.\n" );
+@@ -456,7 +457,7 @@ bool ImportExportGdal::import(Layer* aLayer, const QBy
+     }
+     importGDALDataset(poDS, aLayer, confirmProjection);
+ 
+-    OGRDataSource::DestroyDataSource( poDS );
++    GDALClose(( GDALDatasetH) poDS);
+ 
+     return true;
+ }