- Update to 1.5.1, announce message is here:

    http://sourceforge.net/apps/mediawiki/viking/index.php?title=Version-1.5.1

- USES tar:bzip2 instead of USE_BZIP2=yes
- Remove TODO from DOCS
- Add GEOCACHES Option and conditional pkg-message
- Add OPTIONS_MULTI=OpenStreetMap-Editor with JOSM and MERKAATOR
- Add MERKAATOR to default Options
- Break lines around 80 characters

3 files changed, 38 insertions, 10 deletions

diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 06bf1946e762..08a04b2e0a58 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.5
-PORTREVISION=	1
+PORTVERSION=	1.5.1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -22,8 +21,7 @@ LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
-USE_BZIP2=	yes
-USES=		gmake iconv desktop-file-utils perl5 pkgconfig
+USES=		gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	cairo gnomedocutils gtk20
@@ -35,15 +33,24 @@ INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+PORTDOCS=	AUTHORS ChangeLog NEWS README
 
-OPTIONS_DEFINE=		DOCS NLS GEOTAG GPSD
-OPTIONS_DEFAULT=	GEOTAG GPSD
+OPTIONS_DEFINE=		DOCS GEOCACHES NLS GEOTAG GPSD
+OPTIONS_DEFAULT=	GEOTAG GPSD MERKAATOR
+
+OPTIONS_MULTI=		OpenStreetMap-Editor
+OPTIONS_MULTI_OpenStreetMap-Editor=	JOSM MERKAATOR
+
+GEOCACHES_DESC=	GeoCaches Acquire support
 GEOTAG_DESC=	Geotag support
 GPSD_DESC=	Realtime GPS tracking
+JOSM_DESC=	Edit OpenStreetMap via JOSM
+MERKAATOR_DESC=	Edit OpenStreetMap via Merkaartor
 
 OPTIONS_SUB=	yes
 
+GEOCACHES_CONFIGURE_ENABLE=	geocaches
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
@@ -53,9 +60,19 @@ GEOTAG_CONFIGURE_ENABLE=geotag
 GPSD_LIB_DEPENDS=	libgpsd.so:${PORTSDIR}/astro/gpsd
 GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
+JOSM_RUN_DEPENDS=	josm:${PORTSDIR}/astro/josm
+MERKAATOR_RUN_DEPENDS=	merkaartor:${PORTSDIR}/astro/merkaartor
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGEOCACHES}
+SUB_FILES+=	pkg-message
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' ${WRKSRC}/src/viking.desktop.in
+	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' \
+		${WRKSRC}/src/viking.desktop.in
 
 post-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
diff --git a/astro/viking/distinfo b/astro/viking/distinfo
index 4f5e45463d8e..f446ce804bc1 100644
--- a/astro/viking/distinfo
+++ b/astro/viking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (viking-1.5.tar.bz2) = 2f00549e236dedec811c6b018f5ae76a1f4a1b68b1e33ef1eb2de14533579dc4
-SIZE (viking-1.5.tar.bz2) = 1609467
+SHA256 (viking-1.5.1.tar.bz2) = 6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec
+SIZE (viking-1.5.1.tar.bz2) = 1616172
diff --git a/astro/viking/files/pkg-message.in b/astro/viking/files/pkg-message.in
new file mode 100644
index 000000000000..fa1a7f5a8ba8
--- /dev/null
+++ b/astro/viking/files/pkg-message.in
@@ -0,0 +1,11 @@
+===============================================================================
+
+Viking has been installed.
+
+When you wish to use GeoCaches Acquire Option, please make an account at
+
+    http://www.geocaching.com/
+
+Have fun!
+
+===============================================================================