- Update to 0.14

- Mark MAKE_JOBS_SAFE
- Add option for GEOIMAGE
- Use QMAKEFLAGS
- Support WITHOUT_NLS

PR:		141691
Submitted by:	myself
Approved by:	maintainer timeout

4 files changed, 55 insertions, 38 deletions

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 16d27bcd7637..9690b236ebde 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -6,39 +6,46 @@
 #
 
 PORTNAME=	merkaartor
-PORTVERSION=	0.13.2
-PORTREVISION=	2
+PORTVERSION=	0.14
 CATEGORIES=	astro
 MASTER_SITES=	http://www.merkaartor.org/downloads/source/
 
 MAINTAINER=	slaven@rezic.de
 COMMENT=	An openstreetmap mapping program
 
-LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2
-
 USE_BZIP2=	yes
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build linguist_build \
+QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
 		gui network svg webkit xml imageformats script scripttools
+MAKE_JOBS_SAFE=	yes
+
+QMAKEFLAGS=	PREFIX=${PREFIX}
 
 MAN1=		merkaartor.1
 
-HAS_CONFIGURE=	yes
+OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on
+
+.include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/lrelease|&-qt4|' \
-		${WRKSRC}/Merkaartor.pro
+.if !defined(WITHOUT_GEOIMAGE)
+QMAKEFLAGS+=	GEOIMAGE=1
+LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
+.endif
+
+.if defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
+.else
+PLIST_SUB+=	NLS=""
+QT_COMPONENTS+=	linguist_build
+
+pre-build:
+	@cd ${WRKSRC}/translations && lrelease-qt4 ../src/src.pro
+.endif
 
-# Don't ask. If the compiler_TSQM_make_all target is not called before
-# calling qmake-qt4, then the install_translations target won't show
-# up in the Makefile.
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX}
-	cd ${WRKSRC} && ${MAKE} compiler_TSQM_make_all
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX}
+		${QMAKE} ${QMAKEFLAGS}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/debian/merkaartor.1 ${PREFIX}/man/man1
diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo
index 975d8d24bd58..58e6eb8aca56 100644
--- a/astro/merkaartor/distinfo
+++ b/astro/merkaartor/distinfo
@@ -1,3 +1,3 @@
-MD5 (merkaartor-0.13.2.tar.bz2) = 0e6a65d723a7fa29f1e8c921a74d1893
-SHA256 (merkaartor-0.13.2.tar.bz2) = bc216c1785f84f1e554e0f457203f6ccb4f675c5871221f8b906b2cf79a0fd54
-SIZE (merkaartor-0.13.2.tar.bz2) = 3010664
+MD5 (merkaartor-0.14.tar.bz2) = eaba052e083c796fcc9ad8edebc19dec
+SHA256 (merkaartor-0.14.tar.bz2) = efc9da3da199ba7899d1c8ebba8092b7d5d23288e108791037f3db487a1819b8
+SIZE (merkaartor-0.14.tar.bz2) = 5121445
diff --git a/astro/merkaartor/files/patch-Merkaartor.pro b/astro/merkaartor/files/patch-Merkaartor.pro
deleted file mode 100644
index ac00341bccb6..000000000000
--- a/astro/merkaartor/files/patch-Merkaartor.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- Merkaartor.pro.orig	2009-03-27 16:41:05.000000000 +0100
-+++ Merkaartor.pro	2009-04-21 23:41:43.231724554 +0200
-@@ -85,7 +85,7 @@
- 	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 \
diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
index b31d74071289..26e10ca897e8 100644
--- a/astro/merkaartor/pkg-plist
+++ b/astro/merkaartor/pkg-plist
@@ -1,11 +1,32 @@
 bin/merkaartor
-%%DATADIR%%/translations/merkaartor_ar.qm
-%%DATADIR%%/translations/merkaartor_cs.qm
-%%DATADIR%%/translations/merkaartor_de.qm
-%%DATADIR%%/translations/merkaartor_es.qm
-%%DATADIR%%/translations/merkaartor_fr.qm
-%%DATADIR%%/translations/merkaartor_it.qm
-%%DATADIR%%/translations/merkaartor_pl.qm
-%%DATADIR%%/translations/merkaartor_ru.qm
+lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
+lib/merkaartor/plugins/styles/libskulpture.so
+share/applications/merkaartor.desktop
+share/icons/hicolor/48x48/apps/merkaartor.png
+%%DATADIR%%/BookmarksList.xml
+%%DATADIR%%/Projections.xml
+%%DATADIR%%/TmsServersList.xml
+%%DATADIR%%/WmsServersList.xml
+%%NLS%%%%DATADIR%%/translations/merkaartor_ar.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_cs.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_de.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_es.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_fr.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_it.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_ja.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_nl.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_pl.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_ru.qm
+%%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm
+%%DATADIR%%/world_background.osb
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
+@dirrm lib/merkaartor/plugins/styles
+@dirrm lib/merkaartor/plugins/background
+@dirrm lib/merkaartor/plugins
+@dirrm lib/merkaartor