On Fri, Jan 15, 2016 at 11:31:01PM +1100, Jonathan Gray wrote:
> On Fri, Jan 15, 2016 at 07:18:51AM -0500, Brandon Mercer wrote:
> > On Thu, Jan 14, 2016 at 12:25:24PM -0500, Ted Unangst wrote:
> > > Brandon Mercer wrote:
> > > > Inspired by the recent dhewm3 work, I decided to try quake2 again only
> > > > to find that it does not work. There was some dialogue by folks earlier
> > > > to get the existing port, that has been broken for the better part of
> > > > two years, replaced with yquake2. Because yquake2 is different than
> > > > quake2, I propose we import this new, working version and then delete
> > > > the existing port. This diff was sent out by jsg@ some time ago before a
> > > > fun bikeshedding session. Looking for OK's to import this:
> > >
> > > I'm not sure who to blame, but trying to run full screen in dwm results
> > > in a
> > > 640x480 window *and* dwm scrunching all of its windows into that space
> > > too.
> > > Everything was jammed into a tiny corner. Like a clown car of xterms.
> >
> > Ok, based on the feedback recieved, here is an updated version of jsg's
> > original diff.
> >
> > This changes:
> > - SHARED_ONLY
> > - Adds audio/openal dep
> > - Includes a README
> > - Includes a small script to launch game
> >
> > Does this look ready?
>
> The script is missing from the diff you sent.
Sorry, I was battling cvs a bit. Here's the complete diff.
> I wonder how the ctf (offical mod) and xatrix/rogue (mission pack)
> distfiles should be handled. They should all be creating additional
> game.so files, should they be integrated in the yquake2 port later
> or be additional ports such as yquake2-ctf, yquake2-xatrix etc?
I'd like to see the official mods integrated. My initial goal was to
have this yquake2 port integrated without a bikeshedding session, and
then quickly remove the broken quake2 port. Is having them as a FLAVOR
practical? Then the pkgs would get created, and people can add them as
desired? Again, hopefully this doesn't turn into a bikeshed session.
Also, Thanks to abieber@ for the README and startup script.
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 14 Jan 2016 20:33:03 -0000
@@ -0,0 +1,38 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2016/01/14 20:33:03 bmercer Exp $
+
+SHARED_ONLY= Yes
+
+COMMENT= Yamagi Quake II
+N= yquake2
+V= 5.32
+PKGNAME= ${N}-${V}
+DISTNAME= quake2-${V}
+CATEGORIES= games
+
+HOMEPAGE= http://www.yamagi.org/quake2/
+MASTER_SITES= http://deponie.yamagi.org/quake2/
+EXTRACT_SUFX= .tar.xz
+
+# GPLv2
+PERMIT_PACKAGE_CDROM= Yes
+
+WANTLIB += GL SDL2 c jpeg m ogg openal pthread vorbis vorbisfile z
+
+LIB_DEPENDS= audio/libvorbis \
+ audio/openal \
+ graphics/jpeg \
+ devel/sdl2
+
+MAKE_ENV+= VERBOSE=1
+USE_GMAKE= Yes
+
+do-install:
+ ${INSTALL_PROGRAM} ${FILESDIR}/yquake2 ${PREFIX}/bin/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/release/{quake2,q2ded} \
+ ${PREFIX}/share/${N}/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}/baseq2
+ ${INSTALL_PROGRAM} ${WRKBUILD}/release/baseq2/game.so \
+ ${PREFIX}/share/${N}/baseq2/
+
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: distinfo
diff -N distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ distinfo 14 Jan 2016 20:33:03 -0000
@@ -0,0 +1,2 @@
+SHA256 (quake2-5.32.tar.xz) = v8eAMlSp0iiIVU1a8lL//iEts9qwYxY3u5BFhhuOUIw=
+SIZE (quake2-5.32.tar.xz) = 1692720
Index: files/yquake2
===================================================================
RCS file: files/yquake2
diff -N files/yquake2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/yquake2 14 Jan 2016 20:33:03 -0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/local/share/yquake2
+exec /usr/local/share/yquake2/quake2 "$@"
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR 14 Jan 2016 20:33:03 -0000
@@ -0,0 +1,7 @@
+Yamagi Quake II is an enhanced client for id Software's Quake II. The
+main focus is an unchanged single player experience like back in 1997,
+thus the gameplay and the graphics are unaltered. Over 1000 bugs were
+fixed and an extensive code audit done, making Yamagi Quake II one of
+the most solid Quake II implementations available. Other than most ports
+Yamagi Quake II is full 64 bit clean, so it works perfectly on modern 64
+bit processors and operating systems.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST 14 Jan 2016 20:33:03 -0000
@@ -0,0 +1,8 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/14 20:33:03 bmercer Exp $
+bin/yquake2
+share/doc/pkg-readmes/${FULLPKGNAME}
+share/yquake2/
+share/yquake2/baseq2/
+share/yquake2/baseq2/game.so
+@bin share/yquake2/q2ded
+@bin share/yquake2/quake2
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README 14 Jan 2016 20:33:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: README,v 1.1.1.1 2016/01/14 20:33:03 bmercer Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+To play yquake2 on OpenBSD, you need the original game CD key and *.pk3
+files.
+
+Copy the game data (*.[cfg,dll,lst,pak])to ~/.yq2/baseq2/ then start up
+yquake2!
+
