Hi ports --
edd@ gave me the go-ahead to submit this:
As far as I can tell, the uhexen2 software rendering client was not
being built in the port because there were concerns that this would add
nasm as a BDEP (on i386). Now that it's clear that nasm is needed on
i386 no matter what, we might as well add the software rendering client.
This is cribbed from rfreeman's diff posted to ports@ back during port
discussion, with tweaks.
Also fix a typo in the README since I'm here.
As an added benefit, the software client will allow the game to be
played at an acceptable speed on loongson (for sufficiently small
windows - 320x240 preferable but 640x480 wasn't terrible).
Run tested on amd64, i386, and loongson.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 7 Jun 2014 13:36:42 -0000 1.2
+++ Makefile 9 Jun 2014 18:58:17 -0000
@@ -6,7 +6,7 @@ V = 1.5.6
DISTNAME = hexen2source-${V}
PKGNAME = uhexen2-${V}
EXTRACT_SUFX = .tgz
-REVISION = 0
+REVISION = 1
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
hexen2-${V}-linux-i586.tgz
@@ -40,9 +40,13 @@ MAKE_FLAGS += CC=${CC}
DOMAKE = ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
do-build:
+ cd ${WRKBUILD}/engine/hexen2 && ${DOMAKE} h2
+ cd ${WRKBUILD}/engine/hexen2 && ${DOMAKE} clean
cd ${WRKBUILD}/engine/hexen2 && ${DOMAKE} glh2
cd ${WRKBUILD}/engine/hexen2/server && ${DOMAKE}
cd ${WRKBUILD}/engine/hexenworld/server && ${DOMAKE}
+ cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} hw
+ cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} clean
cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} glhw
cd ${WRKBUILD}/launcher && ${DOMAKE}
cd ${WRKBUILD}/h2patch && ${DOMAKE}
@@ -50,8 +54,10 @@ do-build:
cd ${WRKBUILD}/hw_utils/hwmquery && ${DOMAKE}
cd ${WRKBUILD}/hw_utils/hwrcon && ${DOMAKE}
-BINS = engine/hexen2/glhexen2 \
+BINS = engine/hexen2/hexen2 \
+ engine/hexen2/glhexen2 \
engine/hexen2/server/h2ded \
+ engine/hexenworld/client/hwcl \
engine/hexenworld/client/glhwcl \
engine/hexenworld/server/hwsv \
launcher/h2launcher \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/uhexen2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 30 May 2014 15:25:48 -0000 1.1.1.1
+++ pkg/PLIST 9 Jun 2014 18:58:17 -0000
@@ -4,6 +4,8 @@ bin/glhwcl
bin/h2ded
bin/h2launcher
bin/h2patch
+bin/hexen2
+bin/hwcl
bin/hwmaster
bin/hwmquery
bin/hwrcon
@@ -63,9 +65,10 @@ share/uhexen2/data1/strings.txt
@bin share/uhexen2/h2ded
@bin share/uhexen2/h2launcher
@bin share/uhexen2/h2patch
-share/uhexen2/hexen2
+@bin share/uhexen2/hexen2
share/uhexen2/hexen2.png
share/uhexen2/hexen2.svga
+@bin share/uhexen2/hwcl
@bin share/uhexen2/hwmaster
@bin share/uhexen2/hwmquery
@bin share/uhexen2/hwrcon
Index: pkg/README
===================================================================
RCS file: /cvs/ports/games/uhexen2/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- pkg/README 30 May 2014 15:25:48 -0000 1.1.1.1
+++ pkg/README 9 Jun 2014 18:58:17 -0000
@@ -10,9 +10,9 @@ Installing the Game Data
To play Hexen2 you need the pak files (pak*.pak) from the original game.
After obtaining them, copy them into ${TRUEPREFIX}/share/uhexen2/data1.
-If you pak files need to be patched, then run the `h2patch` tool.
+If your pak files need to be patched, then run the `h2patch` tool.
Starting the Game
=================
-Type `glhexen2` or `h2launcher`.
+Type `glhexen2` or `hexen2` or `h2launcher`.
