ports/158404: [maintainer patch] astro/merkaartor fix bug when uploading to fosm.org

[Oliver Heesakkers]

>Number:         158404
>Category:       ports
>Synopsis:       [maintainer patch] astro/merkaartor fix bug when uploading to fosm.org
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 28 19:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Heesakkers
>Release:        8.2-STABLE amd64
>Organization:
>Environment:
>Description:
A bug was identified in uploading changed data to the new fosm.org server. It will fail with a 405 "Method not allowed" error.

The attached patch takes care of it.
>How-To-Repeat:
use api.fosm.org as your API server url and upload a new changeset. The bug occurs on opening a changeset, so any edit would do the trick.
>Fix:
diff -ruN merkaartor.orig/Makefile merkaartor/Makefile
--- merkaartor.orig/Makefile	2011-04-12 10:24:31.000000000 +0200
+++ merkaartor/Makefile	2011-06-28 21:10:43.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.17.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	http://www.merkaartor.be/attachments/download/253/
 
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	1970-01-01 01:00:00.000000000 +0100
+++ merkaartor/files/patch-src__Sync__DownloadOSM.cpp	2011-06-28 02:33:18.000000000 +0200
@@ -0,0 +1,11 @@
+--- ./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);


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