Sun Aug 14 11:59:35 2011 UTC ()
Pullup ticket #3498 - requested by dholland
geography/viking: build fix

Revisions pulled up:
- geography/viking/Makefile                                     1.27
- geography/viking/distinfo                                     1.14
- geography/viking/patches/patch-src_osm-traces.c               1.2

---
   Module Name:	pkgsrc
   Committed By:	gdt
   Date:		Sat Jul 30 19:25:56 UTC 2011

   Modified Files:
   	pkgsrc/geography/viking: Makefile distinfo
   Added Files:
   	pkgsrc/geography/viking/patches: patch-src_osm-traces.c

   Log Message:
   Adapt to modern curl.

   Add patch to remove include of withdrawn header (already changed upstream).
   Set LICENSE (GPL2).
   PKGREVISION++.


(tron)
diff -r1.26.2.2 -r1.26.2.3 pkgsrc/geography/viking/Makefile
diff -r1.13.2.2 -r1.13.2.3 pkgsrc/geography/viking/distinfo
diff -r0 -r1.1.2.3 pkgsrc/geography/viking/patches/patch-src_osm-traces.c
cvs diff -r1.26.2.2 -r1.26.2.3 pkgsrc/geography/viking/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/viking/Makefile 2011/07/30 19:23:55 1.26.2.2
+++ pkgsrc/geography/viking/Makefile 2011/08/14 11:59:35 1.26.2.3
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1# $NetBSD: Makefile,v 1.26.2.2 2011/07/30 19:23:55 gdt Exp $ 1# $NetBSD: Makefile,v 1.26.2.3 2011/08/14 11:59:35 tron Exp $
2# 2#
3 3
4DISTNAME= viking-1.2.1 4DISTNAME= viking-1.2.1
 5PKGREVISION= 1
5CATEGORIES= geography 6CATEGORIES= geography
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}
7 8
8MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= http://viking.sourceforge.net/ 10HOMEPAGE= http://viking.sourceforge.net/
10COMMENT= Viking manages GPS data, supports Open Street Map and geocaching 11COMMENT= Viking manages GPS data, supports Open Street Map and geocaching
11 12
 13LICENSE= gnu-gpl-v2
 14
12PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
13 16
14GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
15 18
16# Perhaps optionize use of gpsd (remove bl3, add this). 19# Perhaps optionize use of gpsd (remove bl3, add this).
17CONFIGURE_ARGS+= --disable-realtime-gps-tracking 20CONFIGURE_ARGS+= --disable-realtime-gps-tracking
18 21
19DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel 22DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel
20DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 23DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
21REPLACE_PERL= viking-remote 24REPLACE_PERL= viking-remote
22 25
23USE_TOOLS+= gmake intltool msgfmt pkg-config 26USE_TOOLS+= gmake intltool msgfmt pkg-config
24 27
cvs diff -r1.13.2.2 -r1.13.2.3 pkgsrc/geography/viking/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/viking/distinfo 2011/07/30 19:23:55 1.13.2.2
+++ pkgsrc/geography/viking/distinfo 2011/08/14 11:59:35 1.13.2.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.13.2.2 2011/07/30 19:23:55 gdt Exp $ 1$NetBSD: distinfo,v 1.13.2.3 2011/08/14 11:59:35 tron Exp $
2 2
3SHA1 (viking-1.2.1.tar.gz) = 594e9ee50dfb93a213399ced9dce72b296b9335a 3SHA1 (viking-1.2.1.tar.gz) = 594e9ee50dfb93a213399ced9dce72b296b9335a
4RMD160 (viking-1.2.1.tar.gz) = 609b464db5c4035123199cd3a4c8985e381710db 4RMD160 (viking-1.2.1.tar.gz) = 609b464db5c4035123199cd3a4c8985e381710db
5Size (viking-1.2.1.tar.gz) = 1054364 bytes 5Size (viking-1.2.1.tar.gz) = 1054364 bytes
6SHA1 (patch-aa) = 24dba675c4aeacef6541f474edd90b7457d98d02 6SHA1 (patch-aa) = 24dba675c4aeacef6541f474edd90b7457d98d02
 7SHA1 (patch-src_osm-traces.c) = 550421ed7bc879b0286de31dc15dd6b5dd583416
File Added: pkgsrc/geography/viking/patches/Attic/patch-src_osm-traces.c
$NetBSD: patch-src_osm-traces.c,v 1.1.2.3 2011/08/14 11:59:35 tron Exp $

curl has apparently withdraw a header file.

--- src/osm-traces.c.orig	2011-06-15 19:30:06.000000000 +0000
+++ src/osm-traces.c
@@ -27,7 +27,6 @@
 #include <errno.h>
 
 #include <curl/curl.h>
-#include <curl/types.h>
 #include <curl/easy.h>
 
 #include <glib.h>