ports/165767: [maintainer patch] astro/merkaartor update to 0.18-dev in order to fix build with boost-1.49

[Oliver Heesakkers]

>Number:         165767
>Category:       ports
>Synopsis:       [maintainer patch] astro/merkaartor update to 0.18-dev in order to fix build with boost-1.49
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 06 02:40:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Heesakkers
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
>Description:
>From this pr: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/156253 (an update for boost) an e-mail found its way to me warning me of breakage and requesting action.

This update updates to the latest Merkaartor snapshot from git. This means that Merkaartor no longer depends on boost. Sadly, as upstream development is not very active at this point in time, there is no real release for 0.18 now or in the foreseeable future. Despite being a snapshot, the program is stable.
The snapshot tarball is hosted by me.

The alternative to build 0.17.2 with built-in boost (1.38) does not work reliably with a newer boost installed on the system.
>How-To-Repeat:

>Fix:
diff -ruN merkaartor.orig/Makefile merkaartor/Makefile
--- merkaartor.orig/Makefile	2012-01-21 01:47:16.000000000 +0100
+++ merkaartor/Makefile	2012-03-06 00:16:22.000000000 +0100
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	merkaartor
-PORTVERSION=	0.17.2
-PORTREVISION=	2
+PORTVERSION=	0.18
 CATEGORIES=	astro
-MASTER_SITES=	http://www.merkaartor.be/attachments/download/253/
+MASTER_SITES=	https://secure.ohos.nl/downloads/
 
 MAINTAINER=	dev2 at heesakkers.info
 COMMENT=	An openstreetmap mapping program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
-
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 
@@ -64,7 +61,7 @@
 .endif
 
 .if !defined(WITH_DEBUG)
-QMAKEFLAGS+=	RELEASE=1 NODEBUG=1
+QMAKEFLAGS+=	NODEBUG=1
 .endif
 
 .if defined(WITHOUT_NLS)
diff -ruN merkaartor.orig/distinfo merkaartor/distinfo
--- merkaartor.orig/distinfo	2011-02-12 13:50:56.000000000 +0100
+++ merkaartor/distinfo	2012-03-05 22:47:01.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (merkaartor-0.17.2.tar.bz2) = 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
-SIZE (merkaartor-0.17.2.tar.bz2) = 7138991
+SHA256 (merkaartor-0.18.tar.bz2) = fc2c2d55da20b0311361b6ddb41277f01785d4e14e43d40ad074b821c2b382ca
+SIZE (merkaartor-0.18.tar.bz2) = 5255248
diff -ruN merkaartor.orig/files/patch-src__Config.pri merkaartor/files/patch-src__Config.pri
--- merkaartor.orig/files/patch-src__Config.pri	1970-01-01 01:00:00.000000000 +0100
+++ merkaartor/files/patch-src__Config.pri	2012-03-05 23:22:54.000000000 +0100
@@ -0,0 +1,10 @@
+--- ./src/Config.pri.orig	2012-03-05 23:22:23.000000000 +0100
++++ ./src/Config.pri	2012-03-05 23:22:47.000000000 +0100
+@@ -13,6 +13,7 @@
+         REVISION="-git"
+     }
+ }
++REVISION="-dev"
+ 
+ win32|macx {
+     system(echo $${LITERAL_HASH}define SVNREV $${SVNREV} > revision.h )
diff -ruN merkaartor.orig/files/patch-src__Sync__DownloadOSM.cpp merkaartor/files/patch-src__Sync__DownloadOSM.cpp
--- merkaartor.orig/files/patch-src__Sync__DownloadOSM.cpp	2011-07-03 17:49:55.000000000 +0200
+++ merkaartor/files/patch-src__Sync__DownloadOSM.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- ./src/Sync/DownloadOSM.cpp.orig	2011-06-28 02:32:00.000000000 +0200
-+++ ./src/Sync/DownloadOSM.cpp	2011-06-28 02:33:10.000000000 +0200
-@@ -252,7 +252,7 @@
- 
-     QString sReq = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority);
-     QHttpRequestHeader Header(Method,sReq);
--    Header.setValue("Host",url.host()+':'+url.port(80));
-+    Header.setValue("Host",url.host()+':'+QString::number(url.port(80)));
-     Header.setValue("User-Agent", USER_AGENT);
- 
-     QString auth = QString("%1:%2").arg(User).arg(Password);
diff -ruN merkaartor.orig/pkg-plist merkaartor/pkg-plist
--- merkaartor.orig/pkg-plist	2011-04-12 10:24:31.000000000 +0200
+++ merkaartor/pkg-plist	2012-03-05 23:16:06.000000000 +0100
@@ -31,7 +31,6 @@
 %%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
-%%DATADIR%%/world_background.osb
 %%NLS%%@dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/48x48/apps


>Release-Note:
>Audit-Trail:
>Unformatted: