Date: Tue, 28 Dec 2010 14:52:11 GMT From: Oliver Heesakkers <dev2@heesakkers.info> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/153492: [patch] update astro/merkaartor to 0.17.0 Message-ID: <201012281452.oBSEqBHS082844@red.freebsd.org> Resent-Message-ID: <201012281500.oBSF0K1t036834@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153492 >Category: ports >Synopsis: [patch] update astro/merkaartor to 0.17.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Dec 28 15:00:20 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Oliver Heesakkers >Release: 8.1 amd64 >Organization: >Environment: >Description: Update to 0.17.0 I've added a number of knobs. First is to not automatically build with debugging (which up to now was standard). Also I've include options for GDAL and PROJ, which are switched on by default, because these requirements will be non-optional for the 0.18 release. Last is an option for zbar (reading barcodes from walking papers). I introduced zbar into the port-system with PR 152708. Please note that the current maintainer has timed out on the last three occasions in the twelve months. If appropriate, I would be happy to assume the role of maintainer for this port (also note the AUTHORS-file). >How-To-Repeat: >Fix: diff -ruN merkaartor_old/Makefile merkaartor/Makefile --- merkaartor_old/Makefile 2010-10-16 14:57:40.000000000 +0200 +++ merkaartor/Makefile 2010-12-28 15:09:42.000000000 +0100 @@ -6,9 +6,9 @@ # PORTNAME= merkaartor -PORTVERSION= 0.16.3 +PORTVERSION= 0.17.0 CATEGORIES= astro -MASTER_SITES= http://www.merkaartor.be/attachments/download/29/ +MASTER_SITES= http://www.merkaartor.be/attachments/download/192/ MAINTAINER= slaven@rezic.de COMMENT= An openstreetmap mapping program @@ -27,7 +27,11 @@ QMAKEFLAGS= PREFIX=${PREFIX} -OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on +OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on\ + GDAL "Use the Geospatial Data Abstraction Library" on\ + PROJ "Use the Cartographic Projections Library" on\ + ZBAR "Read barcodes from walking papers" off\ + DEBUG "Enable debugging and verbose logging" off .include <bsd.port.options.mk> @@ -36,6 +40,28 @@ LIB_DEPENDS+= exiv2:${PORTSDIR}/graphics/exiv2 .endif +.if defined(WITH_GDAL) +QMAKEFLAGS+= GDAL=1 +LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal +PLIST_SUB+= GDAL="" +.else +PLIST_SUB+= GDAL="@comment " +.endif + +.if defined(WITH_PROJ) +QMAKEFLAGS+= PROJ=1 +LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj +.endif + +.if defined(WITH_ZBAR) +QMAKEFLAGS+= ZBAR=1 +LIB_DEPENDS+= zbar:${PORTSDIR}/graphics/zbar +.endif + +.if !defined(WITH_DEBUG) +QMAKEFLAGS+= RELEASE=1 NODEBUG=1 +.endif + .if defined(WITHOUT_NLS) PLIST_SUB+= NLS="@comment " .else diff -ruN merkaartor_old/distinfo merkaartor/distinfo --- merkaartor_old/distinfo 2010-10-16 14:57:40.000000000 +0200 +++ merkaartor/distinfo 2010-12-27 17:30:31.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (merkaartor-0.16.3.tar.bz2) = 4ff2bc53c2f37704a55463372fa7d376 -SHA256 (merkaartor-0.16.3.tar.bz2) = 1f42c2565c0642caee51b9b19624bea9eed7a4b997dd3ade4b99c61f48b6df22 -SIZE (merkaartor-0.16.3.tar.bz2) = 5793565 +SHA256 (merkaartor-0.17.0.tar.bz2) = 5287b72af50bbf88bdf24c09a3ea3b686e29603eb82f1446ada404c293df3642 +SIZE (merkaartor-0.17.0.tar.bz2) = 7138228 diff -ruN merkaartor_old/files/patch-log2 merkaartor/files/patch-log2 --- merkaartor_old/files/patch-log2 1970-01-01 01:00:00.000000000 +0100 +++ merkaartor/files/patch-log2 2010-12-20 18:07:20.000000000 +0100 @@ -0,0 +1,11 @@ +--- plugins/background/MMsBingMapBackground/msbingmapadapter.h.orig 2010-12-20 18:05:31.000000000 +0100 ++++ plugins/background/MMsBingMapBackground/msbingmapadapter.h 2010-12-20 18:06:29.000000000 +0100 +@@ -13,6 +13,8 @@ + QRectF bbox; + }; + ++#define log2(x) (log(x) / M_LN2) ++ + //! MapAdapter for Ms Bing Maps + /*! + * This is a conveniece class, which extends and configures a TileMapAdapter diff -ruN merkaartor_old/pkg-plist merkaartor/pkg-plist --- merkaartor_old/pkg-plist 2010-08-19 03:28:22.000000000 +0200 +++ merkaartor/pkg-plist 2010-12-28 13:53:31.000000000 +0100 @@ -2,6 +2,10 @@ lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so +lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so +lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so +%%GDAL%%lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so +%%GDAL%%lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so lib/merkaartor/plugins/styles/libskulpture.so share/applications/merkaartor.desktop share/icons/hicolor/48x48/apps/merkaartor.png @@ -24,6 +28,9 @@ %%NLS%%%%DATADIR%%/translations/merkaartor_sk.qm %%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm %%NLS%%%%DATADIR%%/translations/merkaartor_uk.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_et.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm %%DATADIR%%/world_background.osb @dirrm %%DATADIR%%/translations @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012281452.oBSEqBHS082844>