update to 0.14

changes:
Switch to API 0.6, remove support for 0.5
Add a Features dock displaying the features in the current viewport
Alternative way of drawing GPX tracks
Support for proxy authentification
Ability to create a junction between to crossing roads
Ability to create polygons of any number of sides
Ability to rotate roads/areas
Ability to create house numbers "Karlsruhe" style
Spatial indexing of features for faster display with large downloaded areas
Support for multiple image layers
Support for multi-selection of layers; allow to show/hide or readonly
 several layers at once
Drag&drop re-ordering of layers
plugin-bassed background layers
Ability to choose Qt style
Discardable dialog/messageboxes
and other tweaks and little things...

tested by Jochen Kunz (and me)

4 files changed, 24 insertions, 34 deletions

diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index 8b3145e26bf..688f56e3daa 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:35 sno Exp $
+# $NetBSD: Makefile,v 1.4 2009/09/08 10:19:33 drochner Exp $
 #
 
-DISTNAME=	merkaartor-0.13.2
-PKGREVISION=	1
+DISTNAME=	merkaartor-0.14
 CATEGORIES=	geography
 MASTER_SITES=	http://www.merkaartor.org/downloads/source/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,25 +17,20 @@ QMAKE=			${QTDIR}/bin/qmake
 CONFIGURE_ARGS=		PREFIX=${PREFIX} NODEBUG=1 OSMARENDER=1 PROJ=1 GDAL=1 \
 			GEOIMAGE=1 GPSD=1
 
-SUBST_CLASSES+=		libxml2
-SUBST_MESSAGE.libxml2=	Fixing hardcoded path: libxml2
-SUBST_STAGE.libxml2=	post-configure
-SUBST_FILES.libxml2=	${WRKSRC}/Makefile
-SUBST_SED.libxml2=	-e "s:/usr/include/libxml2:${BUILDLINK_PREFIX.libxml2}/include/libxml2:g"
-
 SUBST_CLASSES+=			installtarget
 SUBST_MESSAGE.installtarget=	Fixing wrong install target
 SUBST_STAGE.installtarget=	post-configure
-SUBST_FILES.installtarget=	${WRKSRC}/Makefile
+SUBST_FILES.installtarget=	${WRKSRC}/src/Makefile
 SUBST_SED.installtarget=	-e 's:--mode=install cp "$$(QMAKE_TARGET)":--mode=install cp "$$(TARGET)":'
 
 INSTALL_ENV+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
 	cd ${WRKSRC} && \
-		${QTDIR}/bin/lrelease Merkaartor.pro
+		${QTDIR}/bin/lrelease src/src.pro
 	cd ${WRKSRC} && \
-		${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro
+		${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \
+		${MAKE} qmake
 
 .include "../../misc/proj/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
@@ -47,4 +41,5 @@ do-configure:
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/merkaartor/PLIST b/geography/merkaartor/PLIST
index bd04f6a058d..46d8e2b639a 100644
--- a/geography/merkaartor/PLIST
+++ b/geography/merkaartor/PLIST
@@ -1,13 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:57:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/08 10:19:33 drochner Exp $
 bin/merkaartor
+lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.la
+lib/merkaartor/plugins/styles/libskulpture.la
+share/applications/merkaartor.desktop
+share/icons/hicolor/48x48/apps/merkaartor.png
+share/merkaartor/BookmarksList.xml
+share/merkaartor/Projections.xml
+share/merkaartor/TmsServersList.xml
+share/merkaartor/WmsServersList.xml
 share/merkaartor/translations/merkaartor_ar.qm
 share/merkaartor/translations/merkaartor_cs.qm
 share/merkaartor/translations/merkaartor_de.qm
 share/merkaartor/translations/merkaartor_es.qm
 share/merkaartor/translations/merkaartor_fr.qm
 share/merkaartor/translations/merkaartor_it.qm
+share/merkaartor/translations/merkaartor_ja.qm
+share/merkaartor/translations/merkaartor_nl.qm
 share/merkaartor/translations/merkaartor_pl.qm
 share/merkaartor/translations/merkaartor_ru.qm
-share/merkaartor/world_shp/world_adm0.dbf
-share/merkaartor/world_shp/world_adm0.shp
-share/merkaartor/world_shp/world_adm0.shx
+share/merkaartor/translations/merkaartor_sv.qm
+share/merkaartor/world_background.osb
diff --git a/geography/merkaartor/distinfo b/geography/merkaartor/distinfo
index 6f98605fc71..56035b41cdb 100644
--- a/geography/merkaartor/distinfo
+++ b/geography/merkaartor/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/06/04 10:57:59 drochner Exp $
+$NetBSD: distinfo,v 1.2 2009/09/08 10:19:33 drochner Exp $
 
-SHA1 (merkaartor-0.13.2.tar.bz2) = e8e0d006ba6a4859425cccefacbf2bfc4352d883
-RMD160 (merkaartor-0.13.2.tar.bz2) = 809139ef9a9361882802a813b0a90ba1988e2eac
-Size (merkaartor-0.13.2.tar.bz2) = 3010664 bytes
-SHA1 (patch-aa) = 971072299821af8388923d66c90ba445d804319e
+SHA1 (merkaartor-0.14.tar.bz2) = 122cf565785274dacabdae9abd9d24ac37af003c
+RMD160 (merkaartor-0.14.tar.bz2) = d4b7b5039d85e585ce42be2ed7876e656b8254c9
+Size (merkaartor-0.14.tar.bz2) = 5121445 bytes
diff --git a/geography/merkaartor/patches/patch-aa b/geography/merkaartor/patches/patch-aa
deleted file mode 100644
index e75ea55e610..00000000000
--- a/geography/merkaartor/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/06/04 10:57:59 drochner Exp $
-
---- Merkaartor.pro.orig	2009-06-03 19:58:54.000000000 +0200
-+++ Merkaartor.pro
-@@ -85,7 +85,7 @@ BINTRANSLATIONS += \
- 	translations/merkaartor_ar.qm \
- 	translations/merkaartor_cs.qm \
- 	translations/merkaartor_de.qm \
--	translations/merkaartor_es.ts \
-+	translations/merkaartor_es.qm \
- 	translations/merkaartor_fr.qm \
- 	translations/merkaartor_it.qm \
- 	translations/merkaartor_pl.qm \