Attachment #122555 for bug #165767




#

PORTNAME=	merkaartor
PORTVERSION=	0.18
PORTREVISION=	2
CATEGORIES=	astro
MASTER_SITES=	https://secure.ohos.nl/downloads/

MAINTAINER=	dev2@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


.endif

.if !defined(WITH_DEBUG)
QMAKEFLAGS+=	NODEBUG=1
.endif

.if defined(WITHOUT_NLS)

Lines 1-2 Link Here

(-)merkaartor/distinfo (-2 / +2 lines)
1	SHA256 (merkaartor-0.17.2.tar.bz2) = 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a	1	SHA256 (merkaartor-0.18.tar.bz2) = fc2c2d55da20b0311361b6ddb41277f01785d4e14e43d40ad074b821c2b382ca
2	SIZE (merkaartor-0.17.2.tar.bz2) = 7138991	2	SIZE (merkaartor-0.18.tar.bz2) = 5255248

Line 0 Link Here

(-)merkaartor/files/patch-src__Config.pri (+10 lines)
	1	--- ./src/Config.pri.orig 2012-03-05 23:22:23.000000000 +0100
	2	+++ ./src/Config.pri 2012-03-05 23:22:47.000000000 +0100
	3	@@ -13,6 +13,7 @@
	4	REVISION="-git"
	5	}
	6	}
	7	+REVISION="-dev"
	8
	9	win32\|macx {
	10	system(echo $${LITERAL_HASH}define SVNREV $${SVNREV} > revision.h )

Lines 1-11 Link Here

(-)merkaartor/files/patch-src__Sync__DownloadOSM.cpp (-11 lines)
1	--- ./src/Sync/DownloadOSM.cpp.orig 2011-06-28 02:32:00.000000000 +0200
2	+++ ./src/Sync/DownloadOSM.cpp 2011-06-28 02:33:10.000000000 +0200
3	@@ -252,7 +252,7 @@
4
5	QString sReq = url.toString(QUrl::RemoveScheme \| QUrl::RemoveAuthority);
6	QHttpRequestHeader Header(Method,sReq);
7	- Header.setValue("Host",url.host()+':'+url.port(80));
8	+ Header.setValue("Host",url.host()+':'+QString::number(url.port(80)));
9	Header.setValue("User-Agent", USER_AGENT);
10
11	QString auth = QString("%1:%2").arg(User).arg(Password);

Lines 31-37 Link Here

(-)merkaartor/pkg-plist (-1 lines)
31	%%NLS%%%%DATADIR%%/translations/merkaartor_et.qm	31	%%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
32	%%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm	32	%%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
33	%%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm	33	%%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
34	%%DATADIR%%/world_background.osb
35	%%NLS%%@dirrm %%DATADIR%%/translations	34	%%NLS%%@dirrm %%DATADIR%%/translations
36	@dirrm %%DATADIR%%	35	@dirrm %%DATADIR%%
37	@dirrmtry share/icons/hicolor/48x48/apps	36	@dirrmtry share/icons/hicolor/48x48/apps

Return to bug 165767

Lines 6-23 Link Here

(-)merkaartor/Makefile (-6 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= merkaartor	8	PORTNAME= merkaartor
9	PORTVERSION= 0.17.2	9	PORTVERSION= 0.18
10	PORTREVISION= 2
11	CATEGORIES= astro	10	CATEGORIES= astro
12	MASTER_SITES= http://www.merkaartor.be/attachments/download/253/	11	MASTER_SITES= https://secure.ohos.nl/downloads/
13		12
14	MAINTAINER= dev2@heesakkers.info	13	MAINTAINER= dev2@heesakkers.info
15	COMMENT= An openstreetmap mapping program	14	COMMENT= An openstreetmap mapping program
16		15
17	LICENSE= GPLv2	16	LICENSE= GPLv2
18		17
19	BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
20
21	USE_BZIP2= yes	18	USE_BZIP2= yes
22	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
23		20
Lines 64-70 Link Here
64	.endif	61	.endif
65		62
66	.if !defined(WITH_DEBUG)	63	.if !defined(WITH_DEBUG)
67	QMAKEFLAGS+= RELEASE=1 NODEBUG=1	64	QMAKEFLAGS+= NODEBUG=1
68	.endif	65	.endif
69		66
70	.if defined(WITHOUT_NLS)	67	.if defined(WITHOUT_NLS)