mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
fix games/freebsd-games: Trivial fix to unbreak it on -CURRENT
PR: 54873 Submitted by: Clement Laforet <sheepkiller@cultdeadsheep.org>
This commit is contained in:
parent
a492c096d8
commit
683379b19f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=85712
@ -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' \
|
||||
|
2
games/bsdgames/files/misc.h
Normal file
2
games/bsdgames/files/misc.h
Normal file
@ -0,0 +1,2 @@
|
||||
log(struct ship *s);
|
||||
|
11
games/bsdgames/files/patch-larn::Makefile
Normal file
11
games/bsdgames/files/patch-larn::Makefile
Normal file
@ -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
|
10
games/bsdgames/files/patch-sail::dr_1.c
Normal file
10
games/bsdgames/files/patch-sail::dr_1.c
Normal file
@ -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()
|
||||
{
|
10
games/bsdgames/files/patch-sail::misc.c
Normal file
10
games/bsdgames/files/patch-sail::misc.c
Normal file
@ -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)
|
||||
|
10
games/bsdgames/files/patch-sail::pl_1.c
Normal file
10
games/bsdgames/files/patch-sail::pl_1.c
Normal file
@ -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>
|
||||
|
28
games/bsdgames/files/patch-trek::utility.c
Normal file
28
games/bsdgames/files/patch-trek::utility.c
Normal file
@ -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");
|
@ -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' \
|
||||
|
2
games/freebsd-games/files/misc.h
Normal file
2
games/freebsd-games/files/misc.h
Normal file
@ -0,0 +1,2 @@
|
||||
log(struct ship *s);
|
||||
|
11
games/freebsd-games/files/patch-larn::Makefile
Normal file
11
games/freebsd-games/files/patch-larn::Makefile
Normal file
@ -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
|
10
games/freebsd-games/files/patch-sail::dr_1.c
Normal file
10
games/freebsd-games/files/patch-sail::dr_1.c
Normal file
@ -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()
|
||||
{
|
10
games/freebsd-games/files/patch-sail::misc.c
Normal file
10
games/freebsd-games/files/patch-sail::misc.c
Normal file
@ -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)
|
||||
|
10
games/freebsd-games/files/patch-sail::pl_1.c
Normal file
10
games/freebsd-games/files/patch-sail::pl_1.c
Normal file
@ -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>
|
||||
|
28
games/freebsd-games/files/patch-trek::utility.c
Normal file
28
games/freebsd-games/files/patch-trek::utility.c
Normal file
@ -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");
|
Loading…
Reference in New Issue
Block a user