On Sat, May 24, 2014 at 12:03:10PM -0700, Ryan Freeman wrote:
>
> Thanks, I've had this for awhile but I don't think I can
> update anything on cvs.openbsd.org anymore.
>
> Your patch looks fine to me, tho a bit different.
>
> I don't think gamesdir is needed anymore and just execgamesdir.
>
> You got some extra man pages i appear to have missed, but i did
> update the DESCR for the fact that it supports pretty much
> every doom-based game out there now.
>
> Cheers
>
> -ryan
Thanks, here is an updated diff that adds your changes.
I'll likely commit it sometime soon.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 11 Oct 2013 23:49:34 -0000 1.14
+++ Makefile 25 May 2014 05:44:25 -0000
@@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2013/10/11 23:49:34 naddy Exp $
-COMMENT = portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.7.0
+COMMENT = portable release of Doom, Heretic, Hexen, and Strife
+V = 2.0.0
+DISTNAME = chocolate-doom-${V}
CATEGORIES = games x11
HOMEPAGE = http://www.chocolate-doom.org/
@@ -17,21 +18,26 @@ LIB_DEPENDS = devel/sdl-mixer \
devel/sdl-net \
audio/libsamplerate
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chocolate-doom/}
+MASTER_SITES = http://www.chocolate-doom.org/downloads/${V}/
RUN_DEPENDS = devel/desktop-file-utils
CONFIGURE_STYLE = gnu
+USE_GMAKE = Yes
# we don't need to require python to build
CONFIGURE_ENV += HAVE_PYTHON=false
# set correct program directory
-MAKE_FLAGS = gamesdir="${TRUEPREFIX}/bin"
+MAKE_FLAGS = execgamesdir="${TRUEPREFIX}/bin"
-MAN_5 = chocolate-doom.cfg default.cfg
-MAN_6 = chocolate-doom chocolate-server chocolate-setup
+MAN_5 = chocolate-doom.cfg default.cfg \
+ chocolate-heretic.cfg heretic.cfg \
+ chocolate-hexen.cfg hexen.cfg \
+ chocolate-strife.cfg strife.cfg
+MAN_6 = chocolate-doom chocolate-server chocolate-setup \
+ chocolate-heretic chocolate-hexen chocolate-strife
post-extract:
# set correct data directory
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 23 Aug 2012 20:20:27 -0000 1.4
+++ distinfo 21 May 2014 04:53:23 -0000
@@ -1,5 +1,2 @@
-MD5 (chocolate-doom-1.7.0.tar.gz) = wKiyQOXB25/B1Hcu1maf2g==
-RMD160 (chocolate-doom-1.7.0.tar.gz) = RS6E6RvriZ5jF/X9cx9JpiUm0aA=
-SHA1 (chocolate-doom-1.7.0.tar.gz) = Y7UGGNYQGrGRIk+fp6i+owrS2HI=
-SHA256 (chocolate-doom-1.7.0.tar.gz) =
wc/7YC48w6gpQbRnW53IFqbkGQdvr49U20bfOX+Gv8A=
-SIZE (chocolate-doom-1.7.0.tar.gz) = 1091798
+SHA256 (chocolate-doom-2.0.0.tar.gz) =
hcWLd9rZMwEyU7RT7wGQdJK0cZrNVs+MtsdvSjYatgw=
+SIZE (chocolate-doom-2.0.0.tar.gz) = 2092519
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 14 Mar 2011 09:17:00 -0000 1.2
+++ pkg/DESCR 25 May 2014 05:48:10 -0000
@@ -3,19 +3,26 @@ from the days of DOS. The author, Simon
Chocolate Doom, which is nothing more than a directly modified version
of the released iD Software source code, has zero changes that affect
gameplay, look, or feel, and also re-created a DOS-like setup program to
-configure the game much like the original setup.exe.
+configure the game much like the original setup.exe. The project also
+maintains versions of the engine for Heretic, Hexen, and Strife.
Chocolate Doom provides:
- chocolate-doom - the game
- chocolate-setup - the game setup program
- chocolate-server - server for up to 4-player net games
+ chocolate-doom - the Doom executable
+ chocolate-doom-setup - the Doom setup executable
+ chocolate-heretic - the Heretic executable
+ chocolate-heretic-setup - the Heretic setup executable
+ chocolate-hexen - the Hexen executable
+ chocolate-hexen-setup - the Hexen setup executable
+ chocolate-strife - the Strife executable
+ chocolate-strife-setup - the Strife setup executable
+ chocolate-server - server for up to 4-player net games
-Due to the port re-implementing the original game as closely as
+
+Due to the port re-implementing the original games as closely as
possible, all original game PWADs and demos work flawlessly. Other
-original features include a PC-speaker driver written with OpenBSD in
-mind, just like the DOS PC-speaker driver, and a working -left and
--right network command parameter system for the 'surround display' setup
-that was obtainable with the original DOS executables over an IPX
-network.
+original features include a PC-speaker driver, just like the DOS
+PC-speaker driver, and a working -left and -right network command
+parameter system for the 'surround display' setup that was
+obtainable with the original DOS executables over an IPX network.
Check the chocolate-*(6) manpages for additional information.
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/pkg/MESSAGE,v
retrieving revision 1.4
diff -u -p -r1.4 MESSAGE
--- pkg/MESSAGE 23 Mar 2012 08:47:03 -0000 1.4
+++ pkg/MESSAGE 25 May 2014 05:48:10 -0000
@@ -1,12 +1,16 @@
-To play the game you will need an original Doom, Ultimate Doom, Doom II
-or Final Doom IWAD. Place the doom.wad, doom2.wad, plutonia.wad,
-tnt.wad, or all of the above in ${PREFIX}/share/doom/ to play.
+To play the game you will need an original Doom, Ultimate Doom,
+Doom II, Final Doom, Heretic, Hexen, or Strife IWAD. Place the
+doom.wad, doom2.wad, plutonia.wad, tnt.wad, heretic.wad, hexen.wad,
+strife1.wad + voices.wad or all of the above in
+${PREFIX}/share/doom/ to play. The shareware will also work.
If multiple IWADs are installed, you may specify the one you want to
play via the -iwad command-line parameter e.g.
$ chocolate-doom -iwad doom.wad
+ $ chocolate-heretic -iwad heretic1.wad (heretic shareware)
-The Shareware IWAD is available in the doomdata package.
+The Doom Shareware IWAD is available in the doomdata package.
-Run `chocolate-setup' to generate a configuration file to your liking.
+Run `chocolate-gamename-setup' to generate a configuration file to your
+liking.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 23 Mar 2012 08:47:03 -0000 1.3
+++ pkg/PLIST 21 May 2014 05:59:00 -0000
@@ -1,23 +1,53 @@
@comment $OpenBSD: PLIST,v 1.3 2012/03/23 08:47:03 rfreeman Exp $
@bin bin/chocolate-doom
+@bin bin/chocolate-doom-setup
+@bin bin/chocolate-heretic
+@bin bin/chocolate-heretic-setup
+@bin bin/chocolate-hexen
+@bin bin/chocolate-hexen-setup
@bin bin/chocolate-server
-@bin bin/chocolate-setup
+@bin bin/chocolate-strife
+@bin bin/chocolate-strife-setup
@man man/man5/chocolate-doom.cfg.5
+@man man/man5/chocolate-heretic.cfg.5
+@man man/man5/chocolate-hexen.cfg.5
+@man man/man5/chocolate-strife.cfg.5
@man man/man5/default.cfg.5
+@man man/man5/heretic.cfg.5
+@man man/man5/hexen.cfg.5
+@man man/man5/strife.cfg.5
@man man/man6/chocolate-doom.6
+@man man/man6/chocolate-heretic.6
+@man man/man6/chocolate-hexen.6
@man man/man6/chocolate-server.6
@man man/man6/chocolate-setup.6
+@man man/man6/chocolate-strife.6
share/applications/chocolate-doom.desktop
share/applications/chocolate-setup.desktop
share/applications/screensavers/
share/applications/screensavers/chocolate-doom-screensaver.desktop
share/doc/chocolate-doom/
-share/doc/chocolate-doom/CMDLINE
share/doc/chocolate-doom/ChangeLog
share/doc/chocolate-doom/NEWS
share/doc/chocolate-doom/NOT-BUGS
share/doc/chocolate-doom/README
share/doc/chocolate-doom/README.OPL
+share/doc/chocolate-heretic/
+share/doc/chocolate-heretic/ChangeLog
+share/doc/chocolate-heretic/NEWS
+share/doc/chocolate-heretic/README
+share/doc/chocolate-heretic/README.OPL
+share/doc/chocolate-hexen/
+share/doc/chocolate-hexen/ChangeLog
+share/doc/chocolate-hexen/NEWS
+share/doc/chocolate-hexen/README
+share/doc/chocolate-hexen/README.OPL
+share/doc/chocolate-strife/
+share/doc/chocolate-strife/ChangeLog
+share/doc/chocolate-strife/NEWS
+share/doc/chocolate-strife/README
+share/doc/chocolate-strife/README.OPL
+share/doc/chocolate-strife/README.Strife
share/doom/
share/icons/
share/icons/chocolate-doom.png
