svn commit: r348495 - head/astro/merkaartor

[Rusmir Dusko]

Author: nemysis
Date: Mon Mar 17 17:44:51 2014
New Revision: 348495
URL: http://svnweb.freebsd.org/changeset/ports/348495
QAT: https://qat.redports.org/buildarchive/r348495/

Log:
  - Remove BROKEN, readd USES=qmake
  - USES tar:bzip2 instead of USE_BZIP2=yes
  - Reordering Options
  - Add BROKEN, for Option ZBAR [1]
  - Add OPTIONS_SUB
  - Fix install translations
  
  Approved by:	maintainer (private email) [1]

Modified:
  head/astro/merkaartor/Makefile

Modified: head/astro/merkaartor/Makefile
==============================================================================
--- head/astro/merkaartor/Makefile	Mon Mar 17 17:39:30 2014	(r348494)
+++ head/astro/merkaartor/Makefile	Mon Mar 17 17:44:51 2014	(r348495)
@@ -11,42 +11,48 @@ MASTER_SITES=	http://merkaartor.be/attac
 MAINTAINER=	dev2 at heesakkers.info
 COMMENT=	Openstreetmap mapping program
 
-BROKEN=		Does not build
-
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
 		libproj.so:${PORTSDIR}/graphics/proj
 
-USE_BZIP2=	yes
+USES=		qmake tar:bzip2
 USE_LDCONFIG=	yes
 
 USE_QT4=	uic_build moc_build rcc_build \
 		gui network svg webkit xml imageformats script scripttools
 
-OPTIONS_DEFINE=	GEOIMAGE ZBAR DEBUG NLS
+OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS ZBAR
 OPTIONS_DEFAULT=	GEOIMAGE
 
 GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
 GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
 GEOIMAGE_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 
-ZBAR_DESC=	Read barcodes from walking papers
+ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
+OPTIONS_SUB=	yes
+
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MNLS)
-PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
+.if ${PORT_OPTIONS:MZBAR}
+BROKEN=	Does not build with option ZBAR selected
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist_build
 
 pre-build:
 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
+	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
+		${STAGEDIR}${DATADIR}/translations)
 .endif
 
 .include <bsd.port.mk>