diff options
| author | gdt <gdt@pkgsrc.org> | 2012-01-26 01:00:13 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2012-01-26 01:00:13 +0000 |
| commit | 4e6dd0707cc11eddea6b1ef3d526b4e026d16ad9 (patch) | |
| tree | 188948a12312112d6ac42ceebd6648ebf8a8e2e4 /geography | |
| parent | 9d7d6e67b14f03fee95c20aae888d6270b706a4d (diff) | |
| download | pkgsrc-4e6dd0707cc11eddea6b1ef3d526b4e026d16ad9.tar.gz | |
Split ifdef with && into two, to avoid parse errors on the second
clause when the first is not satisfied. (Apparently &&, while not
evaluating, still has to parse.) Fixes build on OS X.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/viking/Makefile | 4 | ||||
| -rw-r--r-- | geography/viking/distinfo | 4 | ||||
| -rw-r--r-- | geography/viking/patches/patch-aa | 21 |
3 files changed, 20 insertions, 9 deletions
diff --git a/geography/viking/Makefile b/geography/viking/Makefile index aec81d32f0a..228bdf04905 100644 --- a/geography/viking/Makefile +++ b/geography/viking/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2011/11/09 01:28:03 gdt Exp $ +# $NetBSD: Makefile,v 1.32 2012/01/26 01:00:13 gdt Exp $ # DISTNAME= viking-1.2.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/} diff --git a/geography/viking/distinfo b/geography/viking/distinfo index bcf7bb6611f..3c3b860f07c 100644 --- a/geography/viking/distinfo +++ b/geography/viking/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2011/11/09 01:23:13 gdt Exp $ +$NetBSD: distinfo,v 1.16 2012/01/26 01:00:13 gdt Exp $ SHA1 (viking-1.2.2.tar.gz) = 91d53bbf3de6f286e3a0be062974f5b3bef863a7 RMD160 (viking-1.2.2.tar.gz) = 7dcc257525ff9fa78d86f792fa70d3ab50243753 Size (viking-1.2.2.tar.gz) = 1050517 bytes -SHA1 (patch-aa) = 24dba675c4aeacef6541f474edd90b7457d98d02 +SHA1 (patch-aa) = 106567e97011292250e211a7389572ee5a828627 diff --git a/geography/viking/patches/patch-aa b/geography/viking/patches/patch-aa index 8772c38e0ed..a1da0f4786a 100644 --- a/geography/viking/patches/patch-aa +++ b/geography/viking/patches/patch-aa @@ -1,15 +1,26 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/03/11 14:18:30 gdt Exp $ +$NetBSD: patch-aa,v 1.2 2012/01/26 01:00:14 gdt Exp $ ---- src/gpspoint.c.orig 2009-02-08 14:47:01.000000000 +0100 +--- src/gpspoint.c.orig 2010-12-13 01:55:55.000000000 +0000 +++ src/gpspoint.c -@@ -81,8 +81,14 @@ static gdouble line_altitude = VIK_DEFAU +@@ -81,8 +81,25 @@ static gdouble line_altitude = VIK_DEFAU static gboolean line_visible = TRUE; static gboolean line_extended = FALSE; -+/* Work around a bug in NetBSD. See PR standards/40695 */ -+#if defined(__NetBSD__) && __GNUC_PREREQ__(3,3) ++#if defined(__NetBSD__) ++#if __GNUC_PREREQ__(3,3) ++/* ++ * Work around a bug in NetBSD. See PR standards/40695. Bug is fixed ++ * in -current but not -5; revisit if the workaround causes problems. ++ */ +static gdouble line_speed = __builtin_nanf(""); +static gdouble line_course = __builtin_nanf(""); ++#else /* _GNUC_PREREQ__(3,3) */ ++/* ++ * gcc too old for workaround; defer fix to someone else. ++ */ ++static gdouble line_speed = NAN; ++static gdouble line_course = NAN; ++#endif +#else /* NetBSD */ static gdouble line_speed = NAN; static gdouble line_course = NAN; |