summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2015-06-25 06:22:11 +0000
committerdholland <dholland>2015-06-25 06:22:11 +0000
commit4f6b878439bdd3eedb974833f57b98616f38ba5b (patch)
tree7df7eb73b287c217c9911a720ed4cdfdde02e0b7
parent3da90bc059633b7307a54a34b373221e0b96e111 (diff)
downloadpkgsrc-4f6b878439bdd3eedb974833f57b98616f38ba5b.tar.gz
Cast argument of sqrt to double to placate Solaris compiler.
Also while here remove one article of pkglint.
-rw-r--r--games/craft/Makefile4
-rw-r--r--games/craft/distinfo4
-rw-r--r--games/craft/patches/patch-craft.hc15
-rw-r--r--games/craft/patches/patch-object__handler.hc15
4 files changed, 35 insertions, 3 deletions
diff --git a/games/craft/Makefile b/games/craft/Makefile
index baf0eb43e20..3127c215822 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/09/13 07:30:15 dholland Exp $
+# $NetBSD: Makefile,v 1.33 2015/06/25 06:22:11 dholland Exp $
DISTNAME= craftcc35
PKGNAME= craft-3.5
@@ -7,8 +7,8 @@ CATEGORIES= games x11
MASTER_SITES= http://ibiblio.org/pub/linux/games/strategy/
EXTRACT_SUFX= .tar.Z
-PATCHFILES= craft-jumbo-patch-20140913.gz
PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/craft/
+PATCHFILES= craft-jumbo-patch-20140913.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/games/craft/distinfo b/games/craft/distinfo
index 5ae491f5f0b..cde5d0f781e 100644
--- a/games/craft/distinfo
+++ b/games/craft/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/09/13 07:30:15 dholland Exp $
+$NetBSD: distinfo,v 1.12 2015/06/25 06:22:11 dholland Exp $
SHA1 (craft-jumbo-patch-20140913.gz) = 8bb0f2e67bda9e8e7cb093db3625958f0fd6ed39
RMD160 (craft-jumbo-patch-20140913.gz) = 95d696f9ccd227f23f28cb898b9af54c7fbc18ad
@@ -6,3 +6,5 @@ Size (craft-jumbo-patch-20140913.gz) = 18684 bytes
SHA1 (craftcc35.tar.Z) = 8862b9001aa7d752a597033ef45d38ebfcee533f
RMD160 (craftcc35.tar.Z) = 402a2c2ca37df4d86381b434437395424199859e
Size (craftcc35.tar.Z) = 3123677 bytes
+SHA1 (patch-craft.hc) = 21bfc32566d3f0ccee65fe52871704457ffaa1cc
+SHA1 (patch-object__handler.hc) = c5143b605d37aef793ffa07b9191d777a5b9c8f3
diff --git a/games/craft/patches/patch-craft.hc b/games/craft/patches/patch-craft.hc
new file mode 100644
index 00000000000..208777963c7
--- /dev/null
+++ b/games/craft/patches/patch-craft.hc
@@ -0,0 +1,15 @@
+$NetBSD: patch-craft.hc,v 1.1 2015/06/25 06:22:11 dholland Exp $
+
+Cast sqrt argument to double to placate the Solaris compiler.
+
+--- craft.hc~ 2015-06-25 06:13:03.000000000 +0000
++++ craft.hc
+@@ -221,7 +221,7 @@ double pdist (int x1, int y1, int x2, in
+ {int xx = x1 - x2;
+ int yy = y1 - y2;
+
+- return sqrt (xx * xx + yy * yy);
++ return sqrt ((double)(xx * xx + yy * yy));
+ }
+
+ void init_speed (double factor)
diff --git a/games/craft/patches/patch-object__handler.hc b/games/craft/patches/patch-object__handler.hc
new file mode 100644
index 00000000000..01884431e7f
--- /dev/null
+++ b/games/craft/patches/patch-object__handler.hc
@@ -0,0 +1,15 @@
+$NetBSD: patch-object__handler.hc,v 1.1 2015/06/25 06:22:11 dholland Exp $
+
+Cast sqrt argument to double to placate the Solaris compiler.
+
+--- object_handler.hc~ 2015-06-25 06:13:03.000000000 +0000
++++ object_handler.hc
+@@ -36,7 +36,7 @@ double dist (int x1, int y1, int x2, int
+ {int xx = x1 - x2;
+ int yy = y1 - y2;
+
+- return sqrt (xx * xx + yy * yy);
++ return sqrt ((double)(xx * xx + yy * yy));
+ }
+
+ int stepdist (int x1, int y1, int x2, int y2)