- 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)
This commit is contained in:
Alex Kozlov 2012-06-17 19:45:53 +00:00
parent a56d79134c
commit fb6a220136
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=299480
4 changed files with 15 additions and 26 deletions

View file

@ -6,10 +6,10 @@
# #
PORTNAME= merkaartor PORTNAME= merkaartor
PORTVERSION= 0.18.a PORTVERSION= 0.18.1
PORTREVISION= 3
CATEGORIES= astro 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 MAINTAINER= dev2@heesakkers.info
COMMENT= An openstreetmap mapping program COMMENT= An openstreetmap mapping program
@ -32,27 +32,28 @@ INSTALLS_ICONS= yes
QMAKEFLAGS= PREFIX=${PREFIX} QMAKEFLAGS= PREFIX=${PREFIX}
OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on\ OPTIONS_DEFINE= GEOIMAGE ZBAR DEBUG
ZBAR "Read barcodes from walking papers" off\ GEOIMAGE_DESC= Enable geotagged images (needs exiv2)
DEBUG "Enable debugging and verbose logging" off ZBAR_DESC= Read barcodes from walking papers
OPTIONS_DEFAULT= GEOIMAGE
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if !defined(WITHOUT_GEOIMAGE) .if ${PORT_OPTIONS:MGEOIMAGE}
QMAKEFLAGS+= GEOIMAGE=1 QMAKEFLAGS+= GEOIMAGE=1
LIB_DEPENDS+= exiv2.10:${PORTSDIR}/graphics/exiv2 LIB_DEPENDS+= exiv2:${PORTSDIR}/graphics/exiv2
.endif .endif
.if defined(WITH_ZBAR) .if ${PORT_OPTIONS:MZBAR}
QMAKEFLAGS+= ZBAR=1 QMAKEFLAGS+= ZBAR=1
LIB_DEPENDS+= zbar:${PORTSDIR}/graphics/zbar LIB_DEPENDS+= zbar:${PORTSDIR}/graphics/zbar
.endif .endif
.if !defined(WITH_DEBUG) .if empty(PORT_OPTIONS:MDEBUG)
QMAKEFLAGS+= NODEBUG=1 QMAKEFLAGS+= NODEBUG=1 RELEASE=1
.endif .endif
.if defined(WITHOUT_NLS) .if empty(PORT_OPTIONS:MNLS)
PLIST_SUB+= NLS="@comment " PLIST_SUB+= NLS="@comment "
.else .else
PLIST_SUB+= NLS="" PLIST_SUB+= NLS=""

View file

@ -1,2 +1,2 @@
SHA256 (merkaartor-0.18.a.tar.bz2) = 10c7d132e243f7ce789b33dfcb163d169ef102b925ea97e6e1cc982a27bcff0d SHA256 (merkaartor-0.18.1.tar.bz2) = 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f
SIZE (merkaartor-0.18.a.tar.bz2) = 5537190 SIZE (merkaartor-0.18.1.tar.bz2) = 5579080

View file

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

View file

@ -1,7 +1,5 @@
bin/merkaartor bin/merkaartor
lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so 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/libMCadastreFranceBackgroundPlugin.so
lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so