Fix LP64 issues. PKGREVISION -> 2.

While here also fix pkglint in the PLIST.

10 files changed, 167 insertions, 5 deletions

diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index a1228e0b517..85d9f6a55b6 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2008/07/14 12:56:20 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2012/07/30 03:33:12 dholland Exp $
 #
 
 DISTNAME=	xmountains_2.7
 PKGNAME=	${DISTNAME:C/_/-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www2.epcc.ed.ac.uk/~spb/xmountains/
 
diff --git a/x11/xmountains/PLIST b/x11/xmountains/PLIST
index 769c15df9a1..6563a2c352e 100644
--- a/x11/xmountains/PLIST
+++ b/x11/xmountains/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:32 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/07/30 03:33:12 dholland Exp $
 bin/xmountains
-${IMAKE_MAN_DIR}/xmountains.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xmountains.${IMAKE_MAN_SUFFIX}
diff --git a/x11/xmountains/distinfo b/x11/xmountains/distinfo
index 14b9791dffb..804bd418d18 100644
--- a/x11/xmountains/distinfo
+++ b/x11/xmountains/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:24 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/07/30 03:33:12 dholland Exp $
 
 SHA1 (xmountains_2.7.tar.gz) = 707f5d5eb566b8163b1a175fc0aa42ce9ddeb98b
 RMD160 (xmountains_2.7.tar.gz) = b11828bff1074b45c69162eb120dc9cc3e00dad8
 Size (xmountains_2.7.tar.gz) = 27616 bytes
+SHA1 (patch-X__graphics_c) = 1c6d93f9920d74aaeb04590c6a3908948859865e
+SHA1 (patch-artist_c) = e09674e7cfb876d8974a1eff2e56cc34477be73d
+SHA1 (patch-calcalt_c) = c17bd233c77d412ac78883239eeafa2bba6ecc40
+SHA1 (patch-paint_h) = 5a8c189ddc07b5fa3c3afd5026ca522d5d31702b
+SHA1 (patch-random_c) = 645eb0e591e36004e1892f4524c38a3efabf6075
+SHA1 (patch-vroot_h) = d2c2bed7a1bbe8b08e140ec875344b5bfd6144b1
+SHA1 (patch-xmountains_c) = 1beff395ab078b98752a6585284730acfd93ffcd
diff --git a/x11/xmountains/patches/patch-X__graphics_c b/x11/xmountains/patches/patch-X__graphics_c
new file mode 100644
index 00000000000..d6b7a8b88b6
--- /dev/null
+++ b/x11/xmountains/patches/patch-X__graphics_c
@@ -0,0 +1,20 @@
+$NetBSD: patch-X__graphics_c,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- use standard headers
+- fix adjoining unsightly spacing
+
+--- X_graphics.c~	2004-05-05 08:30:24.000000000 +0000
++++ X_graphics.c
+@@ -1,7 +1,9 @@
+ #include <stdio.h>
+-#include<X11/Xlib.h>
+-#include<X11/Xutil.h>
+-#include<X11/Xatom.h>
++#include <stdlib.h>
++#include <string.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <X11/Xatom.h>
+ # define VROOT /* always do this */
+ #ifdef VROOT
+ #include"vroot.h"
diff --git a/x11/xmountains/patches/patch-artist_c b/x11/xmountains/patches/patch-artist_c
new file mode 100644
index 00000000000..490fe0da6a0
--- /dev/null
+++ b/x11/xmountains/patches/patch-artist_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-artist_c,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- use standard headers
+
+--- artist.c~	2004-05-05 08:30:35.000000000 +0000
++++ artist.c
+@@ -3,6 +3,7 @@
+  */
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "paint.h"
+ #include "crinkle.h"
+ 
diff --git a/x11/xmountains/patches/patch-calcalt_c b/x11/xmountains/patches/patch-calcalt_c
new file mode 100644
index 00000000000..bb6823898be
--- /dev/null
+++ b/x11/xmountains/patches/patch-calcalt_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-calcalt_c,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- use standard headers
+
+--- calcalt.c~	2004-05-05 08:30:35.000000000 +0000
++++ calcalt.c
+@@ -17,6 +17,7 @@
+  * be notices by the bottom (long length scale) level.
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include "crinkle.h"
+ 
diff --git a/x11/xmountains/patches/patch-paint_h b/x11/xmountains/patches/patch-paint_h
new file mode 100644
index 00000000000..38a4e426f2e
--- /dev/null
+++ b/x11/xmountains/patches/patch-paint_h
@@ -0,0 +1,24 @@
+$NetBSD: patch-paint_h,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- declare a couple of external functions properly
+
+--- paint.h~	2004-05-05 08:30:35.000000000 +0000
++++ paint.h
+@@ -66,6 +66,8 @@ Col *makemap(Height *a, Height *b, Heigh
+ Col *camera(Height *a, Height *b, Height *shadow);
+ Col *mirror(Height *a, Height *b, Height *shadow);
+ int project( int x , Height y );
++void init_parameters(void);
++void finish_artist(void);
+ #else
+ void set_clut();
+ Height *extract();
+@@ -75,6 +77,8 @@ Col *makemap();
+ Col *camera();
+ Col *mirror();
+ int project();
++void init_parameters();
++void finish_artist();
+ #endif
+ 
+ 
diff --git a/x11/xmountains/patches/patch-random_c b/x11/xmountains/patches/patch-random_c
new file mode 100644
index 00000000000..ca61fbe270a
--- /dev/null
+++ b/x11/xmountains/patches/patch-random_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-random_c,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- use standard headers
+
+--- random.c~	2004-05-05 08:30:39.000000000 +0000
++++ random.c
+@@ -22,6 +22,7 @@ char uni_id[] = "$Id: random.c,v 1.6 199
+  * #include <sys/time.h>
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <math.h>
+ typedef struct
+ {
diff --git a/x11/xmountains/patches/patch-vroot_h b/x11/xmountains/patches/patch-vroot_h
new file mode 100644
index 00000000000..2351e28945f
--- /dev/null
+++ b/x11/xmountains/patches/patch-vroot_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-vroot_h,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- use standard headers
+
+--- vroot.h~	2004-05-05 08:21:06.000000000 +0000
++++ vroot.h
+@@ -76,6 +76,8 @@ static const char vroot_rcsid[] =
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
+ 
++#include <stdlib.h>
++
+ static Window
+ #ifdef __STDC__ /* ANSIfication added by jwz, to avoid superfluous warnings. */
+ VirtualRootWindowOfScreen(Screen *screen)
diff --git a/x11/xmountains/patches/patch-xmountains_c b/x11/xmountains/patches/patch-xmountains_c
new file mode 100644
index 00000000000..36b49a6917e
--- /dev/null
+++ b/x11/xmountains/patches/patch-xmountains_c
@@ -0,0 +1,54 @@
+$NetBSD: patch-xmountains_c,v 1.1 2012/07/30 03:33:12 dholland Exp $
+
+- use standard headers
+- initialize an uninitialized variable
+- use intptr_t where appropriate
+
+--- xmountains.c~	2004-05-05 08:30:43.000000000 +0000
++++ xmountains.c
+@@ -1,5 +1,9 @@
+ 
++#include <stdint.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include <signal.h>
+ #include "crinkle.h"
+ #include "paint.h"
+@@ -137,7 +141,7 @@ char **argv;
+   int i,p;
+   int e_events=FALSE;
+   int request_clear=FALSE;
+-  int smooth;
++  int smooth = 0;
+   int snooze=10;
+   int root= 0;
+   unsigned long window_id = 0;
+@@ -415,22 +419,22 @@ char **argv;
+   seed_uni(seed);
+ 
+   init_artist_variables();
+-  if( -1 == (int) signal(SIGINT, finish_prog ))
++  if( -1 == (intptr_t) signal(SIGINT, finish_prog ))
+   {
+     perror(argv[0]);
+     exit(1);
+   }
+-  if( -1 == (int) signal(SIGTERM, finish_prog ))
++  if( -1 == (intptr_t) signal(SIGTERM, finish_prog ))
+   {
+     perror(argv[0]);
+     exit(1);
+   }
+-  if( -1 == (int) signal(SIGHUP, finish_prog ))
++  if( -1 == (intptr_t) signal(SIGHUP, finish_prog ))
+   {
+     perror(argv[0]);
+     exit(1);
+   }
+-  if( -1 == (int) signal(SIGQUIT, finish_prog ))
++  if( -1 == (intptr_t) signal(SIGQUIT, finish_prog ))
+   {
+     perror(argv[0]);
+     exit(1);