From 683379b19f6679d9bc867bb1a96a8f39025c64f4 Mon Sep 17 00:00:00 2001
From: Daichi GOTO <daichi@FreeBSD.org>
Date: Mon, 28 Jul 2003 05:32:09 +0000
Subject: fix games/freebsd-games: Trivial fix to unbreak it on -CURRENT

PR:		54873
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>
---
 games/bsdgames/Makefile                    |  1 +
 games/bsdgames/files/misc.h                |  2 ++
 games/bsdgames/files/patch-larn::Makefile  | 11 +++++++++++
 games/bsdgames/files/patch-sail::dr_1.c    | 10 ++++++++++
 games/bsdgames/files/patch-sail::misc.c    | 10 ++++++++++
 games/bsdgames/files/patch-sail::pl_1.c    | 10 ++++++++++
 games/bsdgames/files/patch-trek::utility.c | 28 ++++++++++++++++++++++++++++
 7 files changed, 72 insertions(+)
 create mode 100644 games/bsdgames/files/misc.h
 create mode 100644 games/bsdgames/files/patch-larn::Makefile
 create mode 100644 games/bsdgames/files/patch-sail::dr_1.c
 create mode 100644 games/bsdgames/files/patch-sail::misc.c
 create mode 100644 games/bsdgames/files/patch-sail::pl_1.c
 create mode 100644 games/bsdgames/files/patch-trek::utility.c

(limited to 'games/bsdgames')

diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index e798e9616a34..66362f3100f7 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -53,6 +53,7 @@ post-extract:
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} extract)
 
 post-patch:
+	@${CP} ${FILESDIR}/misc.h ${WRKSRC}/sail
 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' -or -name '*.6' -or \
 		-name 'index' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|share/games|local/share/games|g' \
diff --git a/games/bsdgames/files/misc.h b/games/bsdgames/files/misc.h
new file mode 100644
index 000000000000..9c46f5f429f4
--- /dev/null
+++ b/games/bsdgames/files/misc.h
@@ -0,0 +1,2 @@
+log(struct ship *s);
+
diff --git a/games/bsdgames/files/patch-larn::Makefile b/games/bsdgames/files/patch-larn::Makefile
new file mode 100644
index 000000000000..3c32855f4720
--- /dev/null
+++ b/games/bsdgames/files/patch-larn::Makefile
@@ -0,0 +1,11 @@
+--- larn/Makefile.orig	Sat Jul 26 00:06:00 2003
++++ larn/Makefile	Sat Jul 26 00:06:22 2003
+@@ -54,7 +54,7 @@
+ 
+ PROG=	larn
+ MAN=	larn.6
+-CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -fwritable-strings
++CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -fwritable-strings -DNOVARARGS
+ SRCS=	main.c object.c create.c tok.c display.c global.c data.c io.c \
+ 	monster.c store.c diag.c help.c config.c nap.c bill.c scores.c \
+ 	signal.c moreobj.c movem.c regen.c fortune.c savelev.c
diff --git a/games/bsdgames/files/patch-sail::dr_1.c b/games/bsdgames/files/patch-sail::dr_1.c
new file mode 100644
index 000000000000..074117585c8e
--- /dev/null
+++ b/games/bsdgames/files/patch-sail::dr_1.c
@@ -0,0 +1,10 @@
+--- sail/dr_1.c.orig	Sat Jul 26 00:11:20 2003
++++ sail/dr_1.c	Sat Jul 26 00:11:33 2003
+@@ -40,6 +40,7 @@
+ #endif /* not lint */
+ 
+ #include "driver.h"
++#include "misc.h"
+ 
+ unfoul()
+ {
diff --git a/games/bsdgames/files/patch-sail::misc.c b/games/bsdgames/files/patch-sail::misc.c
new file mode 100644
index 000000000000..89cf5ca2db3f
--- /dev/null
+++ b/games/bsdgames/files/patch-sail::misc.c
@@ -0,0 +1,10 @@
+--- sail/misc.c.orig	Sat Jul 26 00:09:23 2003
++++ sail/misc.c	Sat Jul 26 00:09:38 2003
+@@ -41,6 +41,7 @@
+ 
+ #include "externs.h"
+ #include "pathnames.h"
++#include "misc.h"
+ 
+ #define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
+ 
diff --git a/games/bsdgames/files/patch-sail::pl_1.c b/games/bsdgames/files/patch-sail::pl_1.c
new file mode 100644
index 000000000000..b3a0ec2794d8
--- /dev/null
+++ b/games/bsdgames/files/patch-sail::pl_1.c
@@ -0,0 +1,10 @@
+--- sail/pl_1.c.orig	Sat Jul 26 00:10:30 2003
++++ sail/pl_1.c	Sat Jul 26 00:10:42 2003
+@@ -40,6 +40,7 @@
+ #endif /* not lint */
+ 
+ #include "player.h"
++#include "misc.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
diff --git a/games/bsdgames/files/patch-trek::utility.c b/games/bsdgames/files/patch-trek::utility.c
new file mode 100644
index 000000000000..0586c40f13a8
--- /dev/null
+++ b/games/bsdgames/files/patch-trek::utility.c
@@ -0,0 +1,28 @@
+--- trek/utility.c.orig	Sat Jul 26 00:02:02 2003
++++ trek/utility.c	Sat Jul 26 00:14:18 2003
+@@ -43,7 +43,7 @@
+ **  ASSORTED UTILITY ROUTINES
+ */
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ /*
+ **  BLOCK MOVE
+@@ -143,14 +143,12 @@
+ **  SYSTEM ERROR
+ */
+ 
+-syserr(fmt, va_alist)
+-const char *fmt;
+-va_dcl
++syserr(char *fmt,...)
+ {
+ 	va_list		ap;
+ 	extern int	errno;
+ 
+-	va_start(ap);
++	va_start(ap,fmt);
+ 	printf("\n\07TREK SYSERR: ");
+ 	vfprintf(stdout, fmt, ap);
+ 	printf("\n");
-- 
cgit v1.2.3