Bug 203025 - [PATCH] Unbreak astro/viking
Summary: [PATCH] Unbreak astro/viking
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2015-09-10 20:42 UTC by Ulrich Spörlein
Modified: 2015-09-18 18:35 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (koalative)

Attachments
viking.diff (697 bytes, patch)
2015-09-10 20:42 UTC, Ulrich Spörlein 		no flags Details | Diff
patch-Makefile_1_6 update (1.23 KB, patch)
2015-09-11 08:48 UTC, Walter Schwarzenfeld 		no flags Details | Diff
distinfo.diff (369 bytes, patch)
2015-09-11 08:48 UTC, Walter Schwarzenfeld 		no flags Details | Diff
viking.diff (4.00 KB, patch)
2015-09-11 21:37 UTC, Ulrich Spörlein 		no flags Details | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ulrich Spörlein freebsd_committer freebsd_triage 2015-09-10 20:42:12 UTC 
Created attachment 160906 [details]
viking.diff

The port currently doesn't build with GPSD option, also astro/meerkartor is broken, so depend on JOSM instead.
Comment 1 Walter Schwarzenfeld 2015-09-11 08:46:50 UTC 
There is a verion 1.6. Attach a Makefile to update and distinfo.diff
Comment 2 Walter Schwarzenfeld 2015-09-11 08:48:03 UTC 
Created attachment 160922 [details]
patch-Makefile_1_6 update
Comment 3 Walter Schwarzenfeld 2015-09-11 08:48:39 UTC 
Created attachment 160923 [details]
distinfo.diff
Comment 4 Walter Schwarzenfeld 2015-09-11 14:41:51 UTC 
Comment on attachment 160922 [details]
patch-Makefile_1_6 update

>--- Makefile.orig	2015-09-11 08:43:17 UTC
>+++ Makefile
>@@ -1,9 +1,9 @@
> # Created by: David Le Brun <david@trucs.org>
>-# $FreeBSD$
>+# $FreeBSD: head/astro/viking/Makefile 394778 2015-08-19 13:29:59Z mat $
> 
> PORTNAME=	viking
>-PORTVERSION=	1.5.1
>-PORTREVISION=	3
>+PORTVERSION=	1.6
>+#PORTREVISION=	3
> CATEGORIES=	astro
> MASTER_SITES=	SF/${PORTNAME}/
> 
>@@ -12,13 +12,13 @@ COMMENT=	Program to manage GPS data (tra
> 
> LICENSE=	GPLv2
> 
>-BROKEN=		Fails to build
>-
> BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
> LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
> 		libpcre.so:${PORTSDIR}/devel/pcre \
> 		libcurl.so:${PORTSDIR}/ftp/curl \
> 		libpng.so:${PORTSDIR}/graphics/png \
>+		libmapnik.so:${PORTSDIR}/graphics/mapnik \
>+		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
> 		libfreetype.so:${PORTSDIR}/print/freetype2 \
> 		libexpat.so:${PORTSDIR}/textproc/expat2 \
> 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
>@@ -39,7 +39,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -pthread
> PORTDOCS=	AUTHORS ChangeLog NEWS README
> 
> OPTIONS_DEFINE=		DOCS GEOCACHES NLS GEOTAG GPSD
>-OPTIONS_DEFAULT=	GEOTAG GPSD MERKAATOR
>+OPTIONS_DEFAULT=	GEOTAG JOSM
> 
> OPTIONS_MULTI=		OpenStreetMap-Editor
> OPTIONS_MULTI_OpenStreetMap-Editor=	JOSM MERKAATOR
Comment 5 Walter Schwarzenfeld 2015-09-11 14:42:40 UTC 
Comment on attachment 160923 [details]
distinfo.diff

>--- distinfo.orig	2015-09-11 08:36:56 UTC
>+++ distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (viking-1.5.1.tar.bz2) = 6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec
>-SIZE (viking-1.5.1.tar.bz2) = 1616172
>\ No newline at end of file
>+SHA256 (viking-1.6.tar.bz2) = 21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a
>+SIZE (viking-1.6.tar.bz2) = 3060389
Comment 6 Ulrich Spörlein freebsd_committer freebsd_triage 2015-09-11 21:37:58 UTC 
Created attachment 160941 [details]
viking.diff
Comment 7 Ulrich Spörlein freebsd_committer freebsd_triage 2015-09-11 21:38:36 UTC 
I've attached a proper update to 1.6, but I'll have to wait for maintainer timeout (or maybe not, seeing as the port is broken currently anyway)
Comment 8 Walter Schwarzenfeld 2015-09-11 21:42:37 UTC 
Sorry, seems I have read only the half.
Comment 9 commit-hook freebsd_committer freebsd_triage 2015-09-18 16:16:33 UTC 
A commit references this bug:

Author: uqs
Date: Fri Sep 18 16:16:06 UTC 2015
New revision: 397258
URL: https://svnweb.freebsd.org/changeset/ports/397258

Log:
  Update astro/viking to v1.6

  Also switch to working dependency astro/josm to unbreak the dep-tree

  PR:		203025
  Submitted by:	uqs

Changes:
  head/astro/viking/Makefile
  head/astro/viking/distinfo
  head/astro/viking/pkg-plist