From owner-svn-ports-all@freebsd.org Sun Apr 24 19:14:18 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B331B1B79B; Sun, 24 Apr 2016 19:14:18 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B9211DB9; Sun, 24 Apr 2016 19:14:18 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OJEHLQ026869; Sun, 24 Apr 2016 19:14:17 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OJEHAS026867; Sun, 24 Apr 2016 19:14:17 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241914.u3OJEHAS026867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 19:14:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413954 - head/astro/merkaartor X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 19:14:18 -0000 Author: lme Date: Sun Apr 24 19:14:17 2016 New Revision: 413954 URL: https://svnweb.freebsd.org/changeset/ports/413954 Log: - Use qt5-linguisttools to produce *.qm translation files. - Add option to enable support for Protobuf Binary Format (export/import). - Move sqlite dependency to USES. - Fix pkg-descr ('based on Qt4' -> 'based on Qt5'). - Bump PORTREVISION. - While here, pet portlint by adding INSTALLS_ICONS PR: 208684 Submitted by: Andriy Voskoboinyk Approved by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/astro/merkaartor/Makefile head/astro/merkaartor/pkg-descr Modified: head/astro/merkaartor/Makefile ============================================================================== --- head/astro/merkaartor/Makefile Sun Apr 24 17:44:54 2016 (r413953) +++ head/astro/merkaartor/Makefile Sun Apr 24 19:14:17 2016 (r413954) @@ -3,6 +3,7 @@ PORTNAME= merkaartor PORTVERSION= 0.18.2 +PORTREVISION= 1 CATEGORIES= astro MAINTAINER= dev2@heesakkers.info @@ -13,13 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgdal.so:graphics/gdal \ libproj.so:graphics/proj \ - libquazip5.so:archivers/quazip-qt5 \ - libsqlite3.so:databases/sqlite3 + libquazip5.so:archivers/quazip-qt5 USE_GITHUB= yes GH_ACCOUNT= openstreetmap GH_PROJECT= ${PORTNAME} -USES= pkgconfig qmake +USES= pkgconfig sqlite:3 qmake USE_LDCONFIG= yes QMAKE_ARGS= SYSTEM_QUAZIP=1 @@ -27,13 +27,17 @@ USE_QT5= buildtools_build \ concurrent core gui imageformats network printsupport svg \ webkit widgets xml -OPTIONS_DEFINE= DEBUG GEOIMAGE NLS ZBAR +OPTIONS_DEFINE= DEBUG GEOIMAGE NLS PROTOBUF ZBAR OPTIONS_DEFAULT= GEOIMAGE GEOIMAGE_DESC= Enable geotagged images (needs exiv2) GEOIMAGE_QMAKE_ON= GEOIMAGE=1 GEOIMAGE_LIB_DEPENDS= libexiv2.so:graphics/exiv2 +PROTOBUF_DESC= Protobuf Binary Format support +PROTOBUF_QMAKE_ON= PROTOBUF=1 +PROTOBUF_LIB_DEPENDS= libprotobuf.so:devel/protobuf + ZBAR_DESC= Read barcodes from walking papers (BROKEN) ZBAR_QMAKE_ON= ZBAR=1 ZBAR_LIB_DEPENDS= libzbar.so:graphics/zbar @@ -42,13 +46,19 @@ ZBAR_BROKEN= Does not build with option DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1 -NLS_USE= QT5=linguist_build +NLS_USE= QT5=linguisttools_build + +INSTALLS_ICONS= yes OPTIONS_SUB= yes pre-build-NLS-on: @cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro +pre-build-PROTOBUF-on: + @cd ${WRKSRC}/src/ImportExport && ${LOCALBASE}/bin/protoc --cpp_out=. \ + fileformat.proto osmformat.proto + post-install-NLS-on: @${MKDIR} ${STAGEDIR}${DATADIR}/translations @(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \ Modified: head/astro/merkaartor/pkg-descr ============================================================================== --- head/astro/merkaartor/pkg-descr Sun Apr 24 17:44:54 2016 (r413953) +++ head/astro/merkaartor/pkg-descr Sun Apr 24 19:14:17 2016 (r413954) @@ -2,6 +2,6 @@ Merkaartor is an openstreetmap mapping p providing a visually pleasing but performant editing environment for free geographical data. -It is based on Qt4. +It is based on Qt5. WWW: http://merkaartor.be/