Import of pkgsrc-2014Q1

games/amaze/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/06 11:54:30 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/12 11:15:12 jperkin Exp $
 #
 
 DISTNAME=	amaze
@@ -14,6 +14,7 @@ LICENSE=	public-domain
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat6 ${PKGMANDIR}/man6
 USE_BSD_MAKEFILE=	yes
+USE_TOOLS=		nroff
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

games/amaze/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/02/17 17:22:13 jakllsch Exp $
+$NetBSD: distinfo,v 1.2 2013/09/10 14:18:44 joerg Exp $
 
 SHA1 (amaze-0pre0/amaze.tar.gz) = 98e9bebdade4b2491baa39e371517fd66865cd4a
 RMD160 (amaze-0pre0/amaze.tar.gz) = 6c727ec49296e4987c87d4c0d3c69927cfeacc7c
 Size (amaze-0pre0/amaze.tar.gz) = 6941 bytes
-SHA1 (patch-amaze.c) = 6c128b209804b6b141e9b5b42dcb7db1cc4b27b7
+SHA1 (patch-amaze.c) = cc483ad83c44151b03f2d04c89b898f00054664a

games/amaze/patches/patch-amaze.c

@@ -1,30 +1,82 @@
-$NetBSD: patch-amaze.c,v 1.1.1.1 2012/02/17 17:22:13 jakllsch Exp $
-
-Fix function prototypes.
+$NetBSD: patch-amaze.c,v 1.2 2013/09/10 14:18:44 joerg Exp $
 
 --- amaze.c.orig	2000-05-30 04:59:48.000000000 +0000
 +++ amaze.c
-@@ -336,6 +336,7 @@ static int bary[MAXDIST + 2] = { 0, 2, 5
+@@ -290,7 +290,7 @@ showmap()
+  * possible branches; put limits on the segment lengths etc.
+  */
+ void
+-makemaze()
++makemaze(void)
+ {
+ 	int maxy, maxx;
+ 	int i;
+@@ -335,7 +335,7 @@ static int bary[MAXDIST + 2] = { 0, 2, 5
+ 
  /* Draw the close vertical edge of a block */
  void
- draw_vert_edge(dist, right)
-+	int dist, right;
+-draw_vert_edge(dist, right)
++draw_vert_edge(int dist, int right)
  {
  	int y;
  	for (y = bary[dist]; y <= 22 - bary[dist]; y++)
-@@ -348,6 +349,7 @@ draw_vert_edge(dist, right)
+@@ -347,7 +347,7 @@ draw_vert_edge(dist, right)
+ 
  /* Draw the horizontal edge of a block */
  void
- draw_horiz_front(dist, right)
-+	int dist, right;
+-draw_horiz_front(dist, right)
++draw_horiz_front(int dist, int right)
  {
  	int x;
  
-@@ -364,6 +366,7 @@ draw_horiz_front(dist, right)
+@@ -363,7 +363,7 @@ draw_horiz_front(dist, right)
+ 
  /* Draw the horiz edge of a wall in the way */
  void
- draw_horiz_wall(dist)
-+	int dist;
+-draw_horiz_wall(dist)
++draw_horiz_wall(int dist)
  {
  	int x;
  	for (x = barx[dist] + 1; x <= 43 - (barx[dist] + 1); x++) {
+@@ -374,8 +374,7 @@ draw_horiz_wall(dist)
+ 
+ /* Draw the (visually) diagonal edge of a block */
+ void 
+-draw_horiz_side(dist, right)
+-	int dist, right;
++draw_horiz_side(int dist, int right)
+ {
+ 	int y, x;
+ 
+@@ -391,9 +390,7 @@ draw_horiz_side(dist, right)
+ 
+ /* Draw the floor in the centre of view */
+ void
+-draw_floor_centre(dist, ch)
+-	int dist;
+-	chtype ch;
++draw_floor_centre(int dist, chtype ch)
+ {
+ 	int y, x, xx;
+ 
+@@ -406,10 +403,7 @@ draw_floor_centre(dist, ch)
+ 
+ /* Draw the floor to the side */
+ void
+-draw_floor_side(dist, right, ch)
+-	int dist;
+-	int right;
+-	chtype ch;
++draw_floor_side(int dist, int right, chtype ch)
+ {
+ 	int y, x, xx;
+ 
+@@ -698,7 +692,7 @@ amaze()
+ 	leaveok(msg, 1);
+ 	scrollok(msg, 0);
+ 
+-	makemaze(map);
++	makemaze();
+ 
+ 	/* Show where the goal is */
+ 	copyumap(gy, gx, 1);