1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Update to 0.17.0

- Add more options

PR:		ports/153492
Submitted by:	Oliver Heesakkers <dev2@heesakkers.info>
Approved by:	maintainer(timeout, >20 days)
Feature safe:	yes
This commit is contained in:
Wen Heping 2011-01-19 08:41:03 +00:00
parent 390c764f17
commit fec6ece5f2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=267982
4 changed files with 49 additions and 6 deletions

View File

@ -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 @@ INSTALLS_ICONS= yes
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 @@ QMAKEFLAGS+= GEOIMAGE=1
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

View File

@ -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

View File

@ -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

View File

@ -2,6 +2,10 @@ bin/merkaartor
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 @@ share/icons/hicolor/48x48/apps/merkaartor.png
%%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%%