diff options
| author | ak <ak@FreeBSD.org> | 2012-06-18 03:45:53 +0800 |
|---|---|---|
| committer | ak <ak@FreeBSD.org> | 2012-06-18 03:45:53 +0800 |
| commit | cdc40aa61c34357eff8c7b54963f0aa078bedb61 (patch) | |
| tree | 63a94340f49a4e2f81d9e780ce33c2d12922a142 /astro | |
| parent | f7812e0d175299a1f1c95d3184abb4645608882a (diff) | |
| download | freebsd-ports-gnome-cdc40aa61c34357eff8c7b54963f0aa078bedb61.tar.gz freebsd-ports-gnome-cdc40aa61c34357eff8c7b54963f0aa078bedb61.tar.zst freebsd-ports-gnome-cdc40aa61c34357eff8c7b54963f0aa078bedb61.zip | |
- Update to 0.18.1
- Convert to new options framework
- Add MASTER_SITE
- Pet portlint by removing ABI version number for exiv2
PR: ports/168976
Submitted by: Oliver Heesakkers <dev2@heesakkers.info> (maintainer)
Approved by: eadler, itetcu (mentors, implicit)
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/merkaartor/Makefile | 25 | ||||
| -rw-r--r-- | astro/merkaartor/distinfo | 4 | ||||
| -rw-r--r-- | astro/merkaartor/files/patch-src__Config.pri | 10 | ||||
| -rw-r--r-- | astro/merkaartor/pkg-plist | 2 |
4 files changed, 15 insertions, 26 deletions
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index 95fc3dad5ed8..4f1653a9d2b5 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -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 @@ INSTALLS_ICONS= yes 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 --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo index f57f9c7c1aa0..63354c2cb7fa 100644 --- a/astro/merkaartor/distinfo +++ b/astro/merkaartor/distinfo @@ -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 --git a/astro/merkaartor/files/patch-src__Config.pri b/astro/merkaartor/files/patch-src__Config.pri deleted file mode 100644 index d217585d1e7c..000000000000 --- a/astro/merkaartor/files/patch-src__Config.pri +++ /dev/null @@ -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 --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist index 15506adec422..40d75461620d 100644 --- a/astro/merkaartor/pkg-plist +++ b/astro/merkaartor/pkg-plist @@ -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 |