Attachment #122556 for bug #165767




#

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

MAINTAINER=	dev2@heesakkers.info
COMMENT=	An openstreetmap mapping program

LICENSE=	GPLv2

LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
		proj:${PORTSDIR}/graphics/proj

USE_BZIP2=	yes
USE_LDCONFIG=	yes

QMAKEFLAGS=	PREFIX=${PREFIX}

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


LIB_DEPENDS+=	exiv2.10:${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+=	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.a.tar.bz2) = 10c7d132e243f7ce789b33dfcb163d169ef102b925ea97e6e1cc982a27bcff0d
2	SIZE (merkaartor-0.17.2.tar.bz2) = 7138991	2	SIZE (merkaartor-0.18.a.tar.bz2) = 5537190

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);

Return to bug 165767

Lines 6-22 Link Here

(-)merkaartor/Makefile (-20 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= merkaartor	8	PORTNAME= merkaartor
9	PORTVERSION= 0.17.2	9	PORTVERSION= 0.18.a
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	18	LIB_DEPENDS= gdal:${PORTSDIR}/graphics/gdal \
		19	proj:${PORTSDIR}/graphics/proj
20		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
Lines 33-40 Link Here
33	QMAKEFLAGS= PREFIX=${PREFIX}	33	QMAKEFLAGS= PREFIX=${PREFIX}
34		34
35	OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on\	35	OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on\
36	GDAL "Use the Geospatial Data Abstraction Library" on\
37	PROJ "Use the Cartographic Projections Library" on\
38	ZBAR "Read barcodes from walking papers" off\	36	ZBAR "Read barcodes from walking papers" off\
39	DEBUG "Enable debugging and verbose logging" off	37	DEBUG "Enable debugging and verbose logging" off
40		38
Lines 45-70 Link Here
45	LIB_DEPENDS+= exiv2.10:${PORTSDIR}/graphics/exiv2	43	LIB_DEPENDS+= exiv2.10:${PORTSDIR}/graphics/exiv2
46	.endif	44	.endif
47		45
48	.if defined(WITH_GDAL)
49	QMAKEFLAGS+= GDAL=1
50	LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal
51	PLIST_SUB+= GDAL=""
52	.else
53	PLIST_SUB+= GDAL="@comment "
54	.endif
55
56	.if defined(WITH_PROJ)
57	QMAKEFLAGS+= PROJ=1
58	LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj
59	.endif
60
61	.if defined(WITH_ZBAR)	46	.if defined(WITH_ZBAR)
62	QMAKEFLAGS+= ZBAR=1	47	QMAKEFLAGS+= ZBAR=1
63	LIB_DEPENDS+= zbar:${PORTSDIR}/graphics/zbar	48	LIB_DEPENDS+= zbar:${PORTSDIR}/graphics/zbar
64	.endif	49	.endif
65		50
66	.if !defined(WITH_DEBUG)	51	.if !defined(WITH_DEBUG)
67	QMAKEFLAGS+= RELEASE=1 NODEBUG=1	52	QMAKEFLAGS+= NODEBUG=1
68	.endif	53	.endif
69		54
70	.if defined(WITHOUT_NLS)	55	.if defined(WITHOUT_NLS)

Lines 4-11 Link Here

(-)merkaartor/pkg-plist (-3 / +2 lines)
4	lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so	4	lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
5	lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so	5	lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
6	lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so	6	lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
7	%%GDAL%%lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so	7	lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
8	%%GDAL%%lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so	8	lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
9	lib/merkaartor/plugins/styles/libskulpture.so	9	lib/merkaartor/plugins/styles/libskulpture.so
10	share/applications/merkaartor.desktop	10	share/applications/merkaartor.desktop
11	share/icons/hicolor/48x48/apps/merkaartor.png	11	share/icons/hicolor/48x48/apps/merkaartor.png
Lines 31-37 Link Here
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