ports/54873: [bento fix] games/freebsd-games: Trivial fix to unbreak it on -CURRENT.

[Clement Laforet]

>Number:         54873
>Category:       ports
>Synopsis:       [bento fix] games/freebsd-games: Trivial fix to unbreak it on -CURRENT.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 25 15:40:11 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds
>Environment:
System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Jul 14 03:00:24 CEST 2003 clement at chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/CHUCK i386


	
>Description:
	Unbreak the famous BSD games !
	New files :
		files/patch-larn::Makefile
		files/misc.h
		files/patch-sail::misc.c
		files/patch-sail::pl_1.c
		files/patch-sail::dr_1.c
		files/patch-trek::utility.c

>How-To-Repeat:
	Try to compile freebsd-games with gcc 3.3
>Fix:

	

--- freebsd-games.diff begins here ---
diff -Nru freebsd-games.orig/Makefile freebsd-games/Makefile
--- freebsd-games.orig/Makefile	Sat Jul 26 00:26:25 2003
+++ freebsd-games/Makefile	Sat Jul 26 00:20:19 2003
@@ -53,6 +53,7 @@
 		${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 -Nru freebsd-games.orig/files/misc.h freebsd-games/files/misc.h
--- freebsd-games.orig/files/misc.h	Thu Jan  1 01:00:00 1970
+++ freebsd-games/files/misc.h	Sat Jul 26 00:11:58 2003
@@ -0,0 +1,2 @@
+log(struct ship *s);
+
diff -Nru freebsd-games.orig/files/patch-larn::Makefile freebsd-games/files/patch-larn::Makefile
--- freebsd-games.orig/files/patch-larn::Makefile	Thu Jan  1 01:00:00 1970
+++ freebsd-games/files/patch-larn::Makefile	Sat Jul 26 00:06:59 2003
@@ -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 -Nru freebsd-games.orig/files/patch-sail::dr_1.c freebsd-games/files/patch-sail::dr_1.c
--- freebsd-games.orig/files/patch-sail::dr_1.c	Thu Jan  1 01:00:00 1970
+++ freebsd-games/files/patch-sail::dr_1.c	Sat Jul 26 00:13:02 2003
@@ -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 -Nru freebsd-games.orig/files/patch-sail::misc.c freebsd-games/files/patch-sail::misc.c
--- freebsd-games.orig/files/patch-sail::misc.c	Thu Jan  1 01:00:00 1970
+++ freebsd-games/files/patch-sail::misc.c	Sat Jul 26 00:12:32 2003
@@ -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 -Nru freebsd-games.orig/files/patch-sail::pl_1.c freebsd-games/files/patch-sail::pl_1.c
--- freebsd-games.orig/files/patch-sail::pl_1.c	Thu Jan  1 01:00:00 1970
+++ freebsd-games/files/patch-sail::pl_1.c	Sat Jul 26 00:12:52 2003
@@ -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 -Nru freebsd-games.orig/files/patch-trek::utility.c freebsd-games/files/patch-trek::utility.c
--- freebsd-games.orig/files/patch-trek::utility.c	Thu Jan  1 01:00:00 1970
+++ freebsd-games/files/patch-trek::utility.c	Sat Jul 26 00:14:44 2003
@@ -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");
--- freebsd-games.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: