aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--astro/merkaartor/Makefile8
-rw-r--r--astro/merkaartor/distinfo4
-rw-r--r--astro/merkaartor/files/patch-log211
3 files changed, 6 insertions, 17 deletions
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 403b2fb04fea..4176ea849b44 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= merkaartor
-PORTVERSION= 0.17.0
-PORTREVISION= 1
+PORTVERSION= 0.17.2
CATEGORIES= astro
-MASTER_SITES= http://www.merkaartor.be/attachments/download/192/
+MASTER_SITES= http://www.merkaartor.be/attachments/download/253/
-MAINTAINER= slaven@rezic.de
+MAINTAINER= dev2@heesakkers.info
COMMENT= An openstreetmap mapping program
BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
@@ -19,6 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/bo
LICENSE= GPLv2
USE_BZIP2= yes
+USE_LDCONFIG= yes
USE_QT_VER= 4
QT_COMPONENTS= qmake_build uic_build moc_build rcc_build \
diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo
index e1437e6e053f..5b0131afd030 100644
--- a/astro/merkaartor/distinfo
+++ b/astro/merkaartor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (merkaartor-0.17.0.tar.bz2) = 5287b72af50bbf88bdf24c09a3ea3b686e29603eb82f1446ada404c293df3642
-SIZE (merkaartor-0.17.0.tar.bz2) = 7138228
+SHA256 (merkaartor-0.17.2.tar.bz2) = 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
+SIZE (merkaartor-0.17.2.tar.bz2) = 7138991
diff --git a/astro/merkaartor/files/patch-log2 b/astro/merkaartor/files/patch-log2
deleted file mode 100644
index 70f4f68f1d64..000000000000
--- a/astro/merkaartor/files/patch-log2
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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