Attachment 125358 Details for Bug 168976 – file.diff

[patch] file.diff

file.diff (text/plain), 3.12 KB, created by Oliver Heesakkers on 2012-06-12 13:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Heesakkers

Created: 2012-06-12 13:20:06 UTC

Size: 3.12 KB

patch

obsolete

>diff -ruN merkaartor.orig/Makefile merkaartor/Makefile
>--- merkaartor.orig/Makefile	2012-06-06 08:43:13.000000000 +0200
>+++ merkaartor/Makefile	2012-06-12 13:52:53.000000000 +0200
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	merkaartor
>-PORTVERSION=	0.18.a
>-PORTREVISION=	3
>+PORTVERSION=	0.18.1
> CATEGORIES=	astro
>-MASTER_SITES=	https://secure.ohos.nl/downloads/
>+MASTER_SITES=	http://merkaartor.be/attachments/download/301/ \
>+		https://secure.ohos.nl/downloads/
> 
> MAINTAINER=	dev2@heesakkers.info
> COMMENT=	An openstreetmap mapping program
>@@ -32,27 +32,28 @@
> 
> QMAKEFLAGS=	PREFIX=${PREFIX}
> 
>-OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on\
>-		ZBAR     "Read barcodes from walking papers" off\
>-		DEBUG    "Enable debugging and verbose logging" off
>+OPTIONS_DEFINE=	GEOIMAGE ZBAR DEBUG
>+GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
>+ZBAR_DESC=	Read barcodes from walking papers
>+OPTIONS_DEFAULT=	GEOIMAGE
> 
> .include <bsd.port.options.mk>
> 
>-.if !defined(WITHOUT_GEOIMAGE)
>+.if ${PORT_OPTIONS:MGEOIMAGE}
> QMAKEFLAGS+=	GEOIMAGE=1
>-LIB_DEPENDS+=	exiv2.10:${PORTSDIR}/graphics/exiv2
>+LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
> .endif
> 
>-.if defined(WITH_ZBAR)
>+.if ${PORT_OPTIONS:MZBAR}
> QMAKEFLAGS+=	ZBAR=1
> LIB_DEPENDS+=	zbar:${PORTSDIR}/graphics/zbar
> .endif
> 
>-.if !defined(WITH_DEBUG)
>-QMAKEFLAGS+=	NODEBUG=1
>+.if empty(PORT_OPTIONS:MDEBUG)
>+QMAKEFLAGS+=	NODEBUG=1 RELEASE=1
> .endif
> 
>-.if defined(WITHOUT_NLS)
>+.if empty(PORT_OPTIONS:MNLS)
> PLIST_SUB+=	NLS="@comment "
> .else
> PLIST_SUB+=	NLS=""
>diff -ruN merkaartor.orig/distinfo merkaartor/distinfo
>--- merkaartor.orig/distinfo	2012-03-16 22:12:17.000000000 +0100
>+++ merkaartor/distinfo	2012-06-12 11:59:07.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (merkaartor-0.18.a.tar.bz2) = 10c7d132e243f7ce789b33dfcb163d169ef102b925ea97e6e1cc982a27bcff0d
>-SIZE (merkaartor-0.18.a.tar.bz2) = 5537190
>+SHA256 (merkaartor-0.18.1.tar.bz2) = 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f
>+SIZE (merkaartor-0.18.1.tar.bz2) = 5579080
>diff -ruN merkaartor.orig/files/patch-src__Config.pri merkaartor/files/patch-src__Config.pri
>--- merkaartor.orig/files/patch-src__Config.pri	2012-03-16 22:12:17.000000000 +0100
>+++ merkaartor/files/patch-src__Config.pri	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./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/pkg-plist merkaartor/pkg-plist
>--- merkaartor.orig/pkg-plist	2012-03-16 22:12:17.000000000 +0100
>+++ merkaartor/pkg-plist	2012-06-07 15:07:51.000000000 +0200
>@@ -1,7 +1,5 @@
> bin/merkaartor
> lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
>-lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
>-lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so

Actions: View | Diff

Attachments on bug 168976: 125358