Sat Feb 21 14:53:43 2009 UTC ()
patch-aa is broken on NetBSD 5; apparently OPSYS is not defined.
Check for it being defined before use.


(gdt)
diff -r1.9 -r1.10 pkgsrc/geography/garmin-utils/Makefile
diff -r1.8 -r1.9 pkgsrc/geography/garmin-utils/distinfo
diff -r1.4 -r1.5 pkgsrc/geography/garmin-utils/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/geography/garmin-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/garmin-utils/Makefile 2009/02/21 14:51:53 1.9
+++ pkgsrc/geography/garmin-utils/Makefile 2009/02/21 14:53:43 1.10
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2009/02/21 14:51:53 gdt Exp $ 1# $NetBSD: Makefile,v 1.10 2009/02/21 14:53:43 gdt Exp $
2# 2#
3 3
4DISTNAME= garmin-utils-2.4 4DISTNAME= garmin-utils-2.4
 5PKGREVISION= 1
5CATEGORIES= geography 6CATEGORIES= geography
6MASTER_SITES= ftp://ftp.snafu.org/pub/ 7MASTER_SITES= ftp://ftp.snafu.org/pub/
7 8
8MAINTAINER= gson@NetBSD.org 9MAINTAINER= gson@NetBSD.org
9HOMEPAGE= http://www.snafu.org/ 10HOMEPAGE= http://www.snafu.org/
10COMMENT= Utilities for Garmin GPS receivers 11COMMENT= Utilities for Garmin GPS receivers
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* 15ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-*
15 16
16INSTALLATION_DIRS= bin lib ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 17INSTALLATION_DIRS= bin lib ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
17 18
cvs diff -r1.8 -r1.9 pkgsrc/geography/garmin-utils/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/garmin-utils/distinfo 2009/01/13 21:25:28 1.8
+++ pkgsrc/geography/garmin-utils/distinfo 2009/02/21 14:53:43 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2009/01/13 21:25:28 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2009/02/21 14:53:43 gdt Exp $
2 2
3SHA1 (garmin-utils-2.4.tar.gz) = be2a95930745d84d5f1bffd91a2c01851c498bce 3SHA1 (garmin-utils-2.4.tar.gz) = be2a95930745d84d5f1bffd91a2c01851c498bce
4RMD160 (garmin-utils-2.4.tar.gz) = cc3363d429c81a7e65d0287972bdaaac4b115812 4RMD160 (garmin-utils-2.4.tar.gz) = cc3363d429c81a7e65d0287972bdaaac4b115812
5Size (garmin-utils-2.4.tar.gz) = 172650 bytes 5Size (garmin-utils-2.4.tar.gz) = 172650 bytes
6SHA1 (patch-aa) = c78988c80993ecd92c00f380dbd1222fa33fd846 6SHA1 (patch-aa) = 650305540171cea6b77b52acbffe89fd76901d20
cvs diff -r1.4 -r1.5 pkgsrc/geography/garmin-utils/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/geography/garmin-utils/patches/patch-aa 2009/01/13 21:24:58 1.4
+++ pkgsrc/geography/garmin-utils/patches/patch-aa 2009/02/21 14:53:43 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2009/01/13 21:24:58 joerg Exp $ 1$NetBSD: patch-aa,v 1.5 2009/02/21 14:53:43 gdt Exp $
2 2
3--- lib/Makefile.orig 2009-01-13 20:50:30.000000000 +0100 3--- lib/Makefile.orig 2009-01-13 20:50:30.000000000 +0100
4+++ lib/Makefile 4+++ lib/Makefile
5@@ -11,6 +11,8 @@ NOLINT= yes 5@@ -11,6 +11,8 @@ NOLINT= yes
6 SRCS= gps1.c gps2.c gpsdisplay.c gpsprod.c gpscap.c gpsdump.c \ 6 SRCS= gps1.c gps2.c gpsdisplay.c gpsprod.c gpscap.c gpsdump.c \
7 gpsprint.c gpsversion.c gpsformat.c gpsload.c gpsfloat.c 7 gpsprint.c gpsversion.c gpsformat.c gpsload.c gpsfloat.c
8  8
9-install: 9-install:
10+.if ${OPSYS} == "Linux" 10+.if defined(OPSYS) && ${OPSYS} == "Linux"
11+SRCS+= strlcpy.c 11+SRCS+= strlcpy.c
12+.endif 12+.endif
13  13
14 .include <bsd.lib.mk> 14 .include <bsd.lib.mk>