- Fix build on -current, unbreak this port

- Use DOCSDIR

PR:		58114
Submitted by:	maintainer

5 files changed, 32 insertions, 8 deletions

diff --git a/games/jfk/Makefile b/games/jfk/Makefile
index 0be98a05e09b..929e8f591c5b 100644
--- a/games/jfk/Makefile
+++ b/games/jfk/Makefile
@@ -21,10 +21,6 @@ USE_SDL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/client/jfkclient ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/server/jfkserver ${PREFIX}/bin
diff --git a/games/jfk/files/patch-src-client-level.cc b/games/jfk/files/patch-src-client-level.cc
new file mode 100644
index 000000000000..971848b80cc3
--- /dev/null
+++ b/games/jfk/files/patch-src-client-level.cc
@@ -0,0 +1,10 @@
+--- src/client/level.cc.orig	Tue Oct 21 16:48:11 2003
++++ src/client/level.cc	Tue Oct 21 16:48:25 2003
+@@ -26,6 +26,7 @@
+ #include <vector>
+ #include <math.h>
+ #include <algorithm>
++#include <cassert>
+ #include "game.h"
+ #include "level.h"
+ #include "output.h"
diff --git a/games/jfk/files/patch-src-server-objhandle.cc b/games/jfk/files/patch-src-server-objhandle.cc
new file mode 100644
index 000000000000..f079b8c5e1aa
--- /dev/null
+++ b/games/jfk/files/patch-src-server-objhandle.cc
@@ -0,0 +1,10 @@
+--- src/server/objhandle.cc.orig	Tue Oct 21 16:49:11 2003
++++ src/server/objhandle.cc	Tue Oct 21 16:49:32 2003
+@@ -2,6 +2,7 @@
+  * Copyright (c) 2002, Stefan Farfeleder <e0026813@stud3.tuwien.ac.at>
+  * $Id: objhandle.cc,v 1.2 2002/09/19 10:42:02 stefan Exp $
+  */
++#include <cassert>
+ #include "object_s.h"
+ #include "objhandle.h"
+ 
diff --git a/games/jfk/files/patch-src-server-person_s.cc b/games/jfk/files/patch-src-server-person_s.cc
new file mode 100644
index 000000000000..aab45e9d2642
--- /dev/null
+++ b/games/jfk/files/patch-src-server-person_s.cc
@@ -0,0 +1,8 @@
+--- src/server/person_s.cc.orig	Tue Oct 21 16:50:02 2003
++++ src/server/person_s.cc	Tue Oct 21 16:50:15 2003
+@@ -1,4 +1,5 @@
+ #include <algorithm>
++#include <cassert>
+ #include <cstdlib>
+ #include <sstream>
+ #include <string>
diff --git a/games/jfk/pkg-plist b/games/jfk/pkg-plist
index a3fc4a52de6d..e88420b3cc54 100644
--- a/games/jfk/pkg-plist
+++ b/games/jfk/pkg-plist
@@ -1,8 +1,8 @@
 bin/jfkserver
 bin/jfkclient
-%%PORTDOCS%%share/doc/jfk/controls.txt
-%%PORTDOCS%%share/doc/jfk/jfkclient.sample
-%%PORTDOCS%%share/doc/jfk/jfkserver.sample
+%%PORTDOCS%%%%DOCSDIR%%/controls.txt
+%%PORTDOCS%%%%DOCSDIR%%/jfkclient.sample
+%%PORTDOCS%%%%DOCSDIR%%/jfkserver.sample
 share/jfk/art/bar/weapon_5.png
 share/jfk/art/bar/arrow.png
 share/jfk/art/bar/bar.png
@@ -137,7 +137,7 @@ share/jfk/art/object/obstacle/stone_0.png
 share/jfk/art/object/obstacle/tree_0.png
 share/jfk/levels/demolevel
 share/jfk/levels/level1
-%%PORTDOCS%%@dirrm share/doc/jfk
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/jfk/art/bar
 @dirrm share/jfk/art/font
 @dirrm share/jfk/art/ground