From owner-svn-ports-head@FreeBSD.ORG Wed Oct 16 02:36:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E3B0D4FE; Wed, 16 Oct 2013 02:36:09 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D06CB284B; Wed, 16 Oct 2013 02:36:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G2a9p0087580; Wed, 16 Oct 2013 02:36:09 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G2a8JG087565; Wed, 16 Oct 2013 02:36:08 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310160236.r9G2a8JG087565@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 16 Oct 2013 02:36:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330470 - in head/astro/qlandkartegt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 02:36:10 -0000 Author: amdmi3 Date: Wed Oct 16 02:36:08 2013 New Revision: 330470 URL: http://svnweb.freebsd.org/changeset/ports/330470 Log: - Update to 1.7.4 - Support staging - Fix build with clang PR: 182191 Submitted by: Christoph Moench-Tegeder Approved by: maintainer timeout Added: head/astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp (contents, props changed) head/astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp (contents, props changed) head/astro/qlandkartegt/files/patch-src-CMapTDB.h (contents, props changed) Modified: head/astro/qlandkartegt/Makefile head/astro/qlandkartegt/distinfo Modified: head/astro/qlandkartegt/Makefile ============================================================================== --- head/astro/qlandkartegt/Makefile Wed Oct 16 02:26:40 2013 (r330469) +++ head/astro/qlandkartegt/Makefile Wed Oct 16 02:36:08 2013 (r330470) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qlandkartegt -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION} @@ -11,11 +11,10 @@ COMMENT= The ultimate outdoor aficionado LICENSE= GPLv3 -LIB_DEPENDS= gdal:${PORTSDIR}/graphics/gdal \ - proj:${PORTSDIR}/graphics/proj \ - gps:${PORTSDIR}/astro/gpsd +LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ + libproj.so:${PORTSDIR}/graphics/proj \ + libgps.so:${PORTSDIR}/astro/gpsd -NO_STAGE= yes USES= cmake USE_QT4= dbus gui opengl network sql xml linguist_build \ moc_build uic_build rcc_build qmake_build Modified: head/astro/qlandkartegt/distinfo ============================================================================== --- head/astro/qlandkartegt/distinfo Wed Oct 16 02:26:40 2013 (r330469) +++ head/astro/qlandkartegt/distinfo Wed Oct 16 02:36:08 2013 (r330470) @@ -1,2 +1,2 @@ -SHA256 (qlandkartegt-1.7.3.tar.gz) = dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c -SIZE (qlandkartegt-1.7.3.tar.gz) = 8334026 +SHA256 (qlandkartegt-1.7.4.tar.gz) = d6412ae6b34c2ec8a5f929f7aa8b4d1a660f913f16ea52096f93b42d4f271daf +SIZE (qlandkartegt-1.7.4.tar.gz) = 8332394 Added: head/astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp Wed Oct 16 02:36:08 2013 (r330470) @@ -0,0 +1,11 @@ +--- 3rdparty/map2gcm/main.cpp.orig 2013-06-17 16:27:54.000000000 +0400 ++++ 3rdparty/map2gcm/main.cpp 2013-09-25 08:33:07.841519182 +0400 +@@ -83,7 +83,7 @@ + if(pj) pj_free(pj); + } + +- bool operator<(const file_t& other) ++ bool operator<(const file_t& other) const + { + return (xscale < other.xscale); + } Added: head/astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp Wed Oct 16 02:36:08 2013 (r330470) @@ -0,0 +1,11 @@ +--- 3rdparty/map2jnx/main.cpp.orig 2013-09-16 20:29:13.000000000 +0400 ++++ 3rdparty/map2jnx/main.cpp 2013-09-25 08:16:33.022519128 +0400 +@@ -121,7 +121,7 @@ + if(pj) pj_free(pj); + } + +- bool operator<(const file_t& other) ++ bool operator<(const file_t& other) const + { + return (xscale > other.xscale); + } Added: head/astro/qlandkartegt/files/patch-src-CMapTDB.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/qlandkartegt/files/patch-src-CMapTDB.h Wed Oct 16 02:36:08 2013 (r330470) @@ -0,0 +1,11 @@ +--- src/CMapTDB.h.orig 2013-08-15 19:13:38.000000000 +0400 ++++ src/CMapTDB.h 2013-09-25 08:45:54.954519968 +0400 +@@ -209,7 +209,7 @@ + quint8 level; + bool useBaseMap; + +- bool operator==(const map_level_t &ml) ++ bool operator==(const map_level_t &ml) const + { + if (ml.bits != bits || ml.level != level || ml.useBaseMap != useBaseMap) + return false;