Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

[Ryan Freeman]

On Sun, Aug 02, 2020 at 01:09:18PM -0700, Ryan Freeman wrote:
> On Sat, Aug 01, 2020 at 03:47:19AM +, Brian Callahan wrote:
> > Hi ports and Ryan --
> > 
> > I noticed via Repology that our version of chocolate-doom is
> > vulnerable to CVE-2020-14983 [0].
> > 
> > The simple solution is to update to version 3.0.1, which contains the
> > fix [1].
> > 
> > Doom works here for me.
> > 
> > OK?
> > 
> > ~Brian
> > 
> > [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> > [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293
> 
> Hey Brian,
> 
> Thanks again for pointing this out!  I managed to roll my old DESCR and
> pkg README enhancements into your diff to upgrade to 3.0.1.  Please
> consider this one for commit, builds and runs fine on amd64 here.
> 
> This is based on a diff I had from last year that never made it in seen
> here, but with a bit more word-smoothing:
> https://marc.info/?l=openbsd-ports=156485054232532=2
> 
> Thanks!
> 

Ping

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile  12 Jul 2019 20:46:15 -  1.27
> +++ Makefile  2 Aug 2020 20:03:43 -
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
>  
>  COMMENT =portable release of Doom, Heretic, Hexen, and Strife
> -V =  3.0.0
> +V =  3.0.1
>  DISTNAME =   chocolate-doom-${V}
>  CATEGORIES = games x11
> -REVISION =   0
>  
>  HOMEPAGE =   https://www.chocolate-doom.org/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  18 Jan 2018 09:30:58 -  1.9
> +++ distinfo  2 Aug 2020 20:03:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (chocolate-doom-3.0.0.tar.gz) = 
> c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
> -SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
> +SHA256 (chocolate-doom-3.0.1.tar.gz) = 
> 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
> +SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/games/chocolate-doom/pkg/DESCR,v
> retrieving revision 1.4
> diff -u -p -r1.4 DESCR
> --- pkg/DESCR 11 Dec 2014 08:10:51 -  1.4
> +++ pkg/DESCR 2 Aug 2020 20:03:43 -
> @@ -1,28 +1,7 @@
> -Chocolate Doom is a portable branch of the classic doom.exe experience
> -from the days of DOS. The author, Simon Howard, has worked to ensure
> -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.  The project also
> -maintains versions of the engine for Heretic, Hexen, and Strife.
> +Chocolate Doom is an SDL-based port of the classic DOOM.EXE experience from
> +the days of DOS.  The project aims to provide an experience identical to that
> +of the original games on original hardware.  A game configuration program is 
> +included, and emulates the classic DOS-style SETUP.EXE of the originals.
>  
> -Chocolate Doom provides:
> -  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 games as closely as
> -possible, all original game PWADs and demos work flawlessly. Other
> -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.
> +The project also maintains versions of the engine for Heretic, Hexen, and
> +Strife.  All original game PWADs and demos should work flawlessly.
> Index: pkg/MESSAGE
> ===
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- pkg/MESSAGE   27 May 2014 06:35:01 -  1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -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 

Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

[Ryan Freeman]

On Sat, Aug 01, 2020 at 03:47:19AM +, Brian Callahan wrote:
> Hi ports and Ryan --
> 
> I noticed via Repology that our version of chocolate-doom is
> vulnerable to CVE-2020-14983 [0].
> 
> The simple solution is to update to version 3.0.1, which contains the
> fix [1].
> 
> Doom works here for me.
> 
> OK?
> 
> ~Brian
> 
> [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293

Hey Brian,

Thanks again for pointing this out!  I managed to roll my old DESCR and
pkg README enhancements into your diff to upgrade to 3.0.1.  Please
consider this one for commit, builds and runs fine on amd64 here.

This is based on a diff I had from last year that never made it in seen
here, but with a bit more word-smoothing:
https://marc.info/?l=openbsd-ports=156485054232532=2

Thanks!


Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile12 Jul 2019 20:46:15 -  1.27
+++ Makefile2 Aug 2020 20:03:43 -
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
 
 COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
-V =3.0.0
+V =3.0.1
 DISTNAME = chocolate-doom-${V}
 CATEGORIES =   games x11
-REVISION = 0
 
 HOMEPAGE = https://www.chocolate-doom.org/
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo18 Jan 2018 09:30:58 -  1.9
+++ distinfo2 Aug 2020 20:03:43 -
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-3.0.0.tar.gz) = 
c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
-SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
+SHA256 (chocolate-doom-3.0.1.tar.gz) = 
1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
+SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
Index: pkg/DESCR
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR   11 Dec 2014 08:10:51 -  1.4
+++ pkg/DESCR   2 Aug 2020 20:03:43 -
@@ -1,28 +1,7 @@
-Chocolate Doom is a portable branch of the classic doom.exe experience
-from the days of DOS. The author, Simon Howard, has worked to ensure
-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.  The project also
-maintains versions of the engine for Heretic, Hexen, and Strife.
+Chocolate Doom is an SDL-based port of the classic DOOM.EXE experience from
+the days of DOS.  The project aims to provide an experience identical to that
+of the original games on original hardware.  A game configuration program is 
+included, and emulates the classic DOS-style SETUP.EXE of the originals.
 
-Chocolate Doom provides:
-  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 games as closely as
-possible, all original game PWADs and demos work flawlessly. Other
-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.
+The project also maintains versions of the engine for Heretic, Hexen, and
+Strife.  All original game PWADs and demos should work flawlessly.
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE 27 May 2014 06:35:01 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-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 

Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

[Ryan Freeman]

On Sat, Aug 01, 2020 at 10:32:53AM -0700, Ryan Freeman wrote:
> On Sat, Aug 01, 2020 at 03:47:19AM +, Brian Callahan wrote:
> > Hi ports and Ryan --
> > 
> > I noticed via Repology that our version of chocolate-doom is
> > vulnerable to CVE-2020-14983 [0].
> > 
> > The simple solution is to update to version 3.0.1, which contains the
> > fix [1].
> > 
> > Doom works here for me.
> 
> Thanks for this, I will look at this in a bit, perfect opportunity
> for me to get my changes[1] for DESCR and README in :P
> 
> So please hold tight on this before committing

Well, it is taking me longer to update my laptop than anticipated,
and now I need to step away.  Apologies, I am good with just getting
the CVE taken care of.  Thanks!

> 
> [1] https://marc.info/?l=openbsd-ports=156418849704190=2
> 
> > 
> > OK?
> > 
> > ~Brian
> > 
> > [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> > [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -r1.27 Makefile
> > --- Makefile12 Jul 2019 20:46:15 -  1.27
> > +++ Makefile1 Aug 2020 03:43:21 -
> > @@ -1,10 +1,9 @@
> >  # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
> >  
> >  COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
> > -V =3.0.0
> > +V =3.0.1
> >  DISTNAME = chocolate-doom-${V}
> >  CATEGORIES =   games x11
> > -REVISION = 0
> >  
> >  HOMEPAGE = https://www.chocolate-doom.org/
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 distinfo
> > --- distinfo18 Jan 2018 09:30:58 -  1.9
> > +++ distinfo1 Aug 2020 03:43:21 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (chocolate-doom-3.0.0.tar.gz) = 
> > c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
> > -SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
> > +SHA256 (chocolate-doom-3.0.1.tar.gz) = 
> > 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
> > +SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
> 

Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

[Ryan Freeman]

On Sat, Aug 01, 2020 at 03:47:19AM +, Brian Callahan wrote:
> Hi ports and Ryan --
> 
> I noticed via Repology that our version of chocolate-doom is
> vulnerable to CVE-2020-14983 [0].
> 
> The simple solution is to update to version 3.0.1, which contains the
> fix [1].
> 
> Doom works here for me.

Thanks for this, I will look at this in a bit, perfect opportunity
for me to get my changes[1] for DESCR and README in :P

So please hold tight on this before committing

[1] https://marc.info/?l=openbsd-ports=156418849704190=2

> 
> OK?
> 
> ~Brian
> 
> [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293

> Index: Makefile
> ===
> RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile  12 Jul 2019 20:46:15 -  1.27
> +++ Makefile  1 Aug 2020 03:43:21 -
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
>  
>  COMMENT =portable release of Doom, Heretic, Hexen, and Strife
> -V =  3.0.0
> +V =  3.0.1
>  DISTNAME =   chocolate-doom-${V}
>  CATEGORIES = games x11
> -REVISION =   0
>  
>  HOMEPAGE =   https://www.chocolate-doom.org/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  18 Jan 2018 09:30:58 -  1.9
> +++ distinfo  1 Aug 2020 03:43:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (chocolate-doom-3.0.0.tar.gz) = 
> c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
> -SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
> +SHA256 (chocolate-doom-3.0.1.tar.gz) = 
> 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
> +SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985

UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

[Brian Callahan]

Hi ports and Ryan --

I noticed via Repology that our version of chocolate-doom is
vulnerable to CVE-2020-14983 [0].

The simple solution is to update to version 3.0.1, which contains the
fix [1].

Doom works here for me.

OK?

~Brian

[0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
[1] https://github.com/chocolate-doom/chocolate-doom/issues/1293
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile	12 Jul 2019 20:46:15 -	1.27
+++ Makefile	1 Aug 2020 03:43:21 -
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
 
 COMMENT =	portable release of Doom, Heretic, Hexen, and Strife
-V =		3.0.0
+V =		3.0.1
 DISTNAME =	chocolate-doom-${V}
 CATEGORIES =	games x11
-REVISION =	0
 
 HOMEPAGE =	https://www.chocolate-doom.org/
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	18 Jan 2018 09:30:58 -	1.9
+++ distinfo	1 Aug 2020 03:43:21 -
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-3.0.0.tar.gz) = c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
-SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
+SHA256 (chocolate-doom-3.0.1.tar.gz) = 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
+SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985

Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

[Nam Nguyen]

Brian Callahan writes:

> Hi ports and Ryan --
>
> I noticed via Repology that our version of chocolate-doom is
> vulnerable to CVE-2020-14983 [0].
>
> The simple solution is to update to version 3.0.1, which contains the
> fix [1].
>
> Doom works here for me.

In my testing singleplayer and multiplayer continue to work.

I tested singleplayer by completing the first maps in Doom and Doom 2.

I tested multiplayer by creating a server and having two players join.

$ chocolate-server -privateserver
$ chocolate-doom -iwad doom2.wad -connect 127.0.0.1 -deathmatch -nomonsters
$ chocolate-doom -iwad doom2.wad -connect 127.0.0.1

>
> OK?
>
> ~Brian
>
> [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile  12 Jul 2019 20:46:15 -  1.27
> +++ Makefile  1 Aug 2020 03:43:21 -
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
>  
>  COMMENT =portable release of Doom, Heretic, Hexen, and Strife
> -V =  3.0.0
> +V =  3.0.1
>  DISTNAME =   chocolate-doom-${V}
>  CATEGORIES = games x11
> -REVISION =   0
>  
>  HOMEPAGE =   https://www.chocolate-doom.org/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  18 Jan 2018 09:30:58 -  1.9
> +++ distinfo  1 Aug 2020 03:43:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (chocolate-doom-3.0.0.tar.gz) = 
> c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
> -SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
> +SHA256 (chocolate-doom-3.0.1.tar.gz) = 
> 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
> +SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

Here is an updated patch with your suggestion incorporated.

On Sat, Jul 27, 2019 at 1:55 PM Ryan Freeman  wrote:

> On Sat, Jul 27, 2019 at 04:13:07PM -0400, Brian Callahan wrote:
> >
> >
> > On 7/27/19 3:52 PM, Ryan Freeman wrote:
> > >Thanks Brian.  How about this, then?  Same thing, just without
> > >Simon's name in the DESCR.
> > >
> >
> > How about just "Chocolate Doom aims to provide an experience
> > identical to that of the original games on original hardware." Same
> > effect, no weird "author" this or that.
> >
> > ~Brian
>
> That works great :)  OK by with with your change.
> -Ryan
>
> >
> > >On Sat, Jul 27, 2019 at 5:41 AM Brian Callahan  > >> wrote:
> > >
> > >
> > >
> > >On 7/26/19 8:46 PM, Ryan Freeman wrote:
> > >> Hey All,
> > >>
> > >> For some reason my normal email doesn't seem to be working with
> > >regards to
> > >> reaching ports@.
> > >> Apologies for the gmail-based delivery.
> > >>
> > >> This isn't a version update, just a change to the package DESCR,
> and
> > >> removal of MESSAGE
> > >> in lieu of a pkg README.  I've tried to dress it up to cover
> > >most things a
> > >> user might need
> > >> to know on installation of chocolate-doom, and now the DESCR
> > >doesn't scroll
> > >> away an
> > >> 80x24 terminal.
> > >
> > >I like this overall. I think it's a good improvement.
> > >That one sentence with the author's name feels awkward (we don't
> list
> > >the authors of any other software in DESCR, do we?) but that was
> > >in the
> > >original DESCR too.
> > >
> > >OK for me.
> > >
> > >~Brian
> > >
> >
>
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile	12 Jul 2019 20:46:15 -	1.27
+++ Makefile	3 Aug 2019 16:35:57 -
@@ -4,7 +4,7 @@ COMMENT =	portable release of Doom, Here
 V =		3.0.0
 DISTNAME =	chocolate-doom-${V}
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://www.chocolate-doom.org/
 
Index: pkg/DESCR
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR	11 Dec 2014 08:10:51 -	1.4
+++ pkg/DESCR	3 Aug 2019 16:35:57 -
@@ -1,28 +1,8 @@
 Chocolate Doom is a portable branch of the classic doom.exe experience
-from the days of DOS. The author, Simon Howard, has worked to ensure
-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.  The project also
-maintains versions of the engine for Heretic, Hexen, and Strife.
+from the days of DOS. Chocolate Doom aims to provide an experience
+identical to that of the original games on original hardware.  A setup
+program has been created to emulate the classic DOS setup.exe from the
+original games for handling configuration.
 
-Chocolate Doom provides:
-  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 games as closely as
-possible, all original game PWADs and demos work flawlessly. Other
-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.
+The project also maintains versions of the engine for Heretic, Hexen,
+and Strife.  All original game PWADs and demos should work flawlessly.
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE	27 May 2014 06:35:01 -	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-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.
-
-  $ 

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Sat, Jul 27, 2019 at 04:13:07PM -0400, Brian Callahan wrote:
> 
> 
> On 7/27/19 3:52 PM, Ryan Freeman wrote:
> >Thanks Brian.  How about this, then?  Same thing, just without
> >Simon's name in the DESCR.
> >
> 
> How about just "Chocolate Doom aims to provide an experience
> identical to that of the original games on original hardware." Same
> effect, no weird "author" this or that.
> 
> ~Brian

That works great :)  OK by with with your change.
-Ryan

> 
> >On Sat, Jul 27, 2019 at 5:41 AM Brian Callahan  >> wrote:
> >
> >
> >
> >On 7/26/19 8:46 PM, Ryan Freeman wrote:
> >> Hey All,
> >>
> >> For some reason my normal email doesn't seem to be working with
> >regards to
> >> reaching ports@.
> >> Apologies for the gmail-based delivery.
> >>
> >> This isn't a version update, just a change to the package DESCR, and
> >> removal of MESSAGE
> >> in lieu of a pkg README.  I've tried to dress it up to cover
> >most things a
> >> user might need
> >> to know on installation of chocolate-doom, and now the DESCR
> >doesn't scroll
> >> away an
> >> 80x24 terminal.
> >
> >I like this overall. I think it's a good improvement.
> >That one sentence with the author's name feels awkward (we don't list
> >the authors of any other software in DESCR, do we?) but that was
> >in the
> >original DESCR too.
> >
> >OK for me.
> >
> >~Brian
> >
> 

Re: UPDATE: games/chocolate-doom

[Brian Callahan]

On 7/27/19 3:52 PM, Ryan Freeman wrote:
Thanks Brian.  How about this, then?  Same thing, just without Simon's 
name in the DESCR.




How about just "Chocolate Doom aims to provide an experience identical 
to that of the original games on original hardware." Same effect, no 
weird "author" this or that.


~Brian

On Sat, Jul 27, 2019 at 5:41 AM Brian Callahan > wrote:




On 7/26/19 8:46 PM, Ryan Freeman wrote:
> Hey All,
>
> For some reason my normal email doesn't seem to be working with
regards to
> reaching ports@.
> Apologies for the gmail-based delivery.
>
> This isn't a version update, just a change to the package DESCR, and
> removal of MESSAGE
> in lieu of a pkg README.  I've tried to dress it up to cover
most things a
> user might need
> to know on installation of chocolate-doom, and now the DESCR
doesn't scroll
> away an
> 80x24 terminal.

I like this overall. I think it's a good improvement.
That one sentence with the author's name feels awkward (we don't list
the authors of any other software in DESCR, do we?) but that was
in the
original DESCR too.

OK for me.

~Brian

Re: UPDATE: games/chocolate-doom

[Brian Callahan]

On 7/26/19 8:46 PM, Ryan Freeman wrote:

Hey All,

For some reason my normal email doesn't seem to be working with regards to
reaching ports@.
Apologies for the gmail-based delivery.

This isn't a version update, just a change to the package DESCR, and
removal of MESSAGE
in lieu of a pkg README.  I've tried to dress it up to cover most things a
user might need
to know on installation of chocolate-doom, and now the DESCR doesn't scroll
away an
80x24 terminal.


I like this overall. I think it's a good improvement.
That one sentence with the author's name feels awkward (we don't list 
the authors of any other software in DESCR, do we?) but that was in the 
original DESCR too.


OK for me.

~Brian

UPDATE: games/chocolate-doom

[Ryan Freeman]

Hey All,

For some reason my normal email doesn't seem to be working with regards to
reaching ports@.
Apologies for the gmail-based delivery.

This isn't a version update, just a change to the package DESCR, and
removal of MESSAGE
in lieu of a pkg README.  I've tried to dress it up to cover most things a
user might need
to know on installation of chocolate-doom, and now the DESCR doesn't scroll
away an
80x24 terminal.

Thoughts? OK?
Cheers,
-Ryan
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile	12 Jul 2019 20:46:15 -	1.27
+++ Makefile	21 Jul 2019 07:20:20 -
@@ -4,7 +4,7 @@ COMMENT =	portable release of Doom, Here
 V =		3.0.0
 DISTNAME =	chocolate-doom-${V}
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://www.chocolate-doom.org/
 
Index: pkg/DESCR
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR	11 Dec 2014 08:10:51 -	1.4
+++ pkg/DESCR	21 Jul 2019 07:20:20 -
@@ -1,28 +1,8 @@
 Chocolate Doom is a portable branch of the classic doom.exe experience
 from the days of DOS. The author, Simon Howard, has worked to ensure
-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.  The project also
-maintains versions of the engine for Heretic, Hexen, and Strife.
+there are zero changes that affect gameplay, look, or feel.  A setup
+program has been created to emulate the classic DOS setup.exe from the
+original games for handling configuration.
 
-Chocolate Doom provides:
-  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 games as closely as
-possible, all original game PWADs and demos work flawlessly. Other
-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.
+The project also maintains versions of the engine for Heretic, Hexen,
+and Strife.  All original game PWADs and demos should work flawlessly.
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE	27 May 2014 06:35:01 -	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-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 Doom Shareware IWAD is available in the doomdata package.
-
-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.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST	27 Jun 2018 21:03:44 -	1.9
+++ pkg/PLIST	21 Jul 2019 07:20:20 -
@@ -76,6 +76,7 @@ share/doc/chocolate-strife/PHILOSOPHY.md
 share/doc/chocolate-strife/README.Music.md
 share/doc/chocolate-strife/README.Strife.md
 share/doc/chocolate-strife/README.md
+share/doc/pkg-readmes/${PKGSTEM}
 share/doom/
 share/icons/
 share/icons/chocolate-doom.png
Index: pkg/README
===
RCS file: pkg/README
diff -N pkg/README
--- /dev/null	1 Jan 1970 00:00:00 -
+++ pkg/README	21 Jul 2019 07:20:20 -
@@ -0,0 +1,62 @@
+$OpenBSD$
+
++--
+| Running ${PKGSTEM} on OpenBSD
++--
+
+Game Data
+=
+
+To play the game you will need an original Doom, 

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Wed, Jan 10, 2018 at 06:55:50PM -0800, Ryan Freeman wrote:
> On Tue, Nov 21, 2017 at 07:14:18PM -0800, Ryan Freeman wrote:
> > After prodding from bentley@ about modified chunk canary crashes,
> > when running with 'ln -s S /etc/malloc.conf', I had a go at
> > resolving it.  Lucky for me, the new sdl2-branch of chocolate-doom
> > seems to neatly skirt around the issue.
> > 
> > I first had a go at seeing if the current release could just be
> > patched, but I got lost with no usable results.
> > 
> > Here is an update to chocolate-doom 3.0.0beta1, which works with
> > malloc S option set.  I tested doom2, and a local chocolate-server
> > + connect to localhost via chocolate-doom-setup.
> > 
> > I quickly ran the heretic, hexen, and strife games and confirmed
> > they start and the games play.
> > 
> > For the port, I used the latest github sdl2-branch as a base,
> > rather than an available chocolate-doom-3.0.0beta1 prerolled
> > tarball from February 2017.  This is because various little fixes
> > to that branch have rolled in since then, and it is more or less
> > stable until the actual release happens.
> > 
> > The manpages were not available pre-built, and thus I had to do
> > some dancing around with making sure its little manpage generator
> > could successfully use a python2 executable.  I am not sure if
> > I did this right at all, and was having issues finding other examples
> > in-tree.  A push in the right direction appreciated if necessary.
> 
> Hi,
> 
> Here is an update to the recently released chocolate-doom 3.0.0.
> 
> This still works fine with 'ln -s S /etc/malloc.conf' set.
> Builds, packages, and plays good here on amd64.
> 
> I let python stay as a BUILD_DEPENDS like the 3.0.0beta1 patch
> prior, as the manpages list has grown, manually maintaining
> lists of them in the Makefile starts to feel tedious :-)
> 
> Comments/OK?
> 
> Cheers!
> -ryan

ping?

> 
> 
> ? chocolate-doom.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile  13 Nov 2017 11:25:27 -  1.22
> +++ Makefile  11 Jan 2018 02:48:53 -
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.22 2017/11/13 11:25:27 bentley Exp $
>  
>  COMMENT =portable release of Doom, Heretic, Hexen, and Strife
> -V =  2.3.0
> +V =  3.0.0
>  DISTNAME =   chocolate-doom-${V}
>  CATEGORIES = games x11
> -REVISION =   0
>  
>  HOMEPAGE =   https://www.chocolate-doom.org/
>  
> @@ -13,10 +12,10 @@ MAINTAINER =  Ryan Freeman   # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB += SDL SDL_mixer SDL_net c m png pthread samplerate z
> +WANTLIB += SDL2 SDL2_mixer SDL2_net c m png samplerate z
>  
> -LIB_DEPENDS =devel/sdl-mixer \
> - devel/sdl-net \
> +LIB_DEPENDS =devel/sdl2-mixer \
> + devel/sdl2-net \
>   audio/libsamplerate \
>   graphics/png
>  
> @@ -24,31 +23,31 @@ MASTER_SITES =https://www.chocolate-doo
>  
>  RUN_DEPENDS =devel/desktop-file-utils
>  
> -
>  CONFIGURE_STYLE =gnu
> +AUTOMAKE_VERSION =   1.15
> +AUTOCONF_VERSION =   2.69
> +CONFIGURE_ARGS +=--mandir="${LOCALBASE}/man"
>  
> -# we don't need to require python to build
> -CONFIGURE_ENV += HAVE_PYTHON=false
> -
> -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
> +# just used for generating manpages
> +BUILD_DEPENDS =  lang/python/2.7
>  
>  post-extract:
>   # set correct data directory
>   @sed -i 's,"/games/doom","/doom",g' ${WRKSRC}/src/d_iwad.c
> -
> + # set correct python binary name
> + @sed -i 's/HAVE_PYTHON, python/HAVE_PYTHON, python2/' \
> + ${WRKSRC}/configure.ac
> + @sed -i 's,/usr/bin/env python,/usr/bin/env python2,' \
> + ${WRKSRC}/man/docgen
> + @sed -i 's,/usr/bin/env python,/usr/bin/env python2,' \
> + ${WRKSRC}/man/simplecpp
> +
> +pre-configure:
> + @cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> +AUTOCONF_VERSION=${AUTOCONF_VERSION} autoreconf -fi
> + 
>  post-install:
>   # Data files get installed to this directory.
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/
> -.for m in ${MAN_5}
> - ${INSTALL_MAN} ${WRKBUILD}/man/$m.5 ${PREFIX}/man/man5/
> -.endfor
> -.for m in ${MAN_6}
> - ${INSTALL_MAN} ${WRKBUILD}/man/$m.6 ${PREFIX}/man/man6/
> -.endfor
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Tue, Nov 21, 2017 at 07:14:18PM -0800, Ryan Freeman wrote:
> After prodding from bentley@ about modified chunk canary crashes,
> when running with 'ln -s S /etc/malloc.conf', I had a go at
> resolving it.  Lucky for me, the new sdl2-branch of chocolate-doom
> seems to neatly skirt around the issue.
> 
> I first had a go at seeing if the current release could just be
> patched, but I got lost with no usable results.
> 
> Here is an update to chocolate-doom 3.0.0beta1, which works with
> malloc S option set.  I tested doom2, and a local chocolate-server
> + connect to localhost via chocolate-doom-setup.
> 
> I quickly ran the heretic, hexen, and strife games and confirmed
> they start and the games play.
> 
> For the port, I used the latest github sdl2-branch as a base,
> rather than an available chocolate-doom-3.0.0beta1 prerolled
> tarball from February 2017.  This is because various little fixes
> to that branch have rolled in since then, and it is more or less
> stable until the actual release happens.
> 
> The manpages were not available pre-built, and thus I had to do
> some dancing around with making sure its little manpage generator
> could successfully use a python2 executable.  I am not sure if
> I did this right at all, and was having issues finding other examples
> in-tree.  A push in the right direction appreciated if necessary.

Hi,

Here is an update to the recently released chocolate-doom 3.0.0.

This still works fine with 'ln -s S /etc/malloc.conf' set.
Builds, packages, and plays good here on amd64.

I let python stay as a BUILD_DEPENDS like the 3.0.0beta1 patch
prior, as the manpages list has grown, manually maintaining
lists of them in the Makefile starts to feel tedious :-)

Comments/OK?

Cheers!
-ryan


? chocolate-doom.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile13 Nov 2017 11:25:27 -  1.22
+++ Makefile11 Jan 2018 02:48:53 -
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.22 2017/11/13 11:25:27 bentley Exp $
 
 COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
-V =2.3.0
+V =3.0.0
 DISTNAME = chocolate-doom-${V}
 CATEGORIES =   games x11
-REVISION = 0
 
 HOMEPAGE = https://www.chocolate-doom.org/
 
@@ -13,10 +12,10 @@ MAINTAINER =Ryan Freeman 

UPDATE: games/chocolate-doom

[Ryan Freeman]

After prodding from bentley@ about modified chunk canary crashes,
when running with 'ln -s S /etc/malloc.conf', I had a go at
resolving it.  Lucky for me, the new sdl2-branch of chocolate-doom
seems to neatly skirt around the issue.

I first had a go at seeing if the current release could just be
patched, but I got lost with no usable results.

Here is an update to chocolate-doom 3.0.0beta1, which works with
malloc S option set.  I tested doom2, and a local chocolate-server
+ connect to localhost via chocolate-doom-setup.

I quickly ran the heretic, hexen, and strife games and confirmed
they start and the games play.

For the port, I used the latest github sdl2-branch as a base,
rather than an available chocolate-doom-3.0.0beta1 prerolled
tarball from February 2017.  This is because various little fixes
to that branch have rolled in since then, and it is more or less
stable until the actual release happens.

The manpages were not available pre-built, and thus I had to do
some dancing around with making sure its little manpage generator
could successfully use a python2 executable.  I am not sure if
I did this right at all, and was having issues finding other examples
in-tree.  A push in the right direction appreciated if necessary.

That all said, comments or OK? :-)

-ryan


? chocolate-doom-3.0.0beta1.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile13 Nov 2017 11:25:27 -  1.22
+++ Makefile22 Nov 2017 03:03:41 -
@@ -1,10 +1,13 @@
 # $OpenBSD: Makefile,v 1.22 2017/11/13 11:25:27 bentley Exp $
 
 COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
-V =2.3.0
-DISTNAME = chocolate-doom-${V}
+DISTNAME = chocolate-doom-3.0.0beta1
+
+GH_ACCOUNT =   chocolate-doom
+GH_PROJECT =   chocolate-doom
+GH_COMMIT =413f4ecd7aae41229cc7b40ea3275970dc18cdb4
+
 CATEGORIES =   games x11
-REVISION = 0
 
 HOMEPAGE = https://www.chocolate-doom.org/
 
@@ -13,42 +16,41 @@ MAINTAINER =Ryan Freeman 

UPDATE: games/chocolate-doom

[Ryan Freeman]

Update to chocolate-doom 2.3.0
https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-2.3.0

ports-related highlights:
- don't need gmake anymore
- don't need to modify final binary path via sed anymore

I remembered to try portcheck on this for once, only one complaint:
12:16 ryan@iddqd:..chocolate-doom$ /usr/ports/infrastructure/bin/portcheck  
installs icon chocolate-doom.png in share/icons, it should go in 
share/chocolate-doom/icons/ or like instead
installs icon chocolate-setup.png in share/icons, it should go in 
share/chocolate-setup/icons/ or like instead
games/chocolate-doom

I noticed all previous copies of this package violate this practice, and I
am not really sure how to adjust ${WRKDIST}/data/Makefile{.in} to know which
binary-named directory they should fall under, so I just left it as-is.


? chocolate-doom.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile9 Nov 2016 11:58:20 -   1.20
+++ Makefile2 Jan 2017 20:17:46 -
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.20 2016/11/09 11:58:20 sthen Exp $
 
 COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
-V =2.2.1
+V =2.3.0
 DISTNAME = chocolate-doom-${V}
 CATEGORIES =   games x11
-REVISION = 0
 
 HOMEPAGE = http://www.chocolate-doom.org/
 
@@ -26,7 +25,6 @@ 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
@@ -39,9 +37,6 @@ MAN_6 =   chocolate-doom chocolate-server
chocolate-heretic chocolate-hexen chocolate-strife
 
 post-extract:
-   # set correct program directory
-   @sed -i 's,{exec_prefix}/games,{exec_prefix}/bin,' \
-   ${WRKSRC}/src/Makefile.in
# set correct data directory
@sed -i 's,"/games/doom","/doom",g' ${WRKSRC}/src/d_iwad.c
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo16 Sep 2015 09:34:12 -  1.7
+++ distinfo2 Jan 2017 20:17:46 -
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-2.2.1.tar.gz) = 
rRHihxZnxvoGWKvy3LoM2bJvvWUe6N9Vrf3Bitj9Z0o=
-SIZE (chocolate-doom-2.2.1.tar.gz) = 2127538
+SHA256 (chocolate-doom-2.3.0.tar.gz) = 
Pm0agqxciwJalpXOHkfQ3G7RQuuxEpseSnDidA95FQw=
+SIZE (chocolate-doom-2.3.0.tar.gz) = 2190744
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   16 Sep 2015 09:34:12 -  1.6
+++ pkg/PLIST   2 Jan 2017 20:17:46 -
@@ -36,30 +36,30 @@ share/applications/screensavers/
 share/applications/screensavers/chocolate-doom-screensaver.desktop
 share/doc/chocolate-doom/
 share/doc/chocolate-doom/ChangeLog
-share/doc/chocolate-doom/NEWS
-share/doc/chocolate-doom/NOT-BUGS
-share/doc/chocolate-doom/PHILOSOPHY
-share/doc/chocolate-doom/README
-share/doc/chocolate-doom/README.Music
+share/doc/chocolate-doom/NEWS.md
+share/doc/chocolate-doom/NOT-BUGS.md
+share/doc/chocolate-doom/PHILOSOPHY.md
+share/doc/chocolate-doom/README.Music.md
+share/doc/chocolate-doom/README.md
 share/doc/chocolate-heretic/
 share/doc/chocolate-heretic/ChangeLog
-share/doc/chocolate-heretic/NEWS
-share/doc/chocolate-heretic/PHILOSOPHY
-share/doc/chocolate-heretic/README
-share/doc/chocolate-heretic/README.Music
+share/doc/chocolate-heretic/NEWS.md
+share/doc/chocolate-heretic/PHILOSOPHY.md
+share/doc/chocolate-heretic/README.Music.md
+share/doc/chocolate-heretic/README.md
 share/doc/chocolate-hexen/
 share/doc/chocolate-hexen/ChangeLog
-share/doc/chocolate-hexen/NEWS
-share/doc/chocolate-hexen/PHILOSOPHY
-share/doc/chocolate-hexen/README
-share/doc/chocolate-hexen/README.Music
+share/doc/chocolate-hexen/NEWS.md
+share/doc/chocolate-hexen/PHILOSOPHY.md
+share/doc/chocolate-hexen/README.Music.md
+share/doc/chocolate-hexen/README.md
 share/doc/chocolate-strife/
 share/doc/chocolate-strife/ChangeLog
-share/doc/chocolate-strife/NEWS
-share/doc/chocolate-strife/PHILOSOPHY
-share/doc/chocolate-strife/README
-share/doc/chocolate-strife/README.Music
-share/doc/chocolate-strife/README.Strife
+share/doc/chocolate-strife/NEWS.md
+share/doc/chocolate-strife/PHILOSOPHY.md
+share/doc/chocolate-strife/README.Music.md
+share/doc/chocolate-strife/README.Strife.md
+share/doc/chocolate-strife/README.md
 share/doom/
 share/icons/
 share/icons/chocolate-doom.png

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Tue, Dec 02, 2014 at 09:41:03AM -0800, Ryan Freeman wrote:
 Hey,
 
 Patch to update to chocolate-doom 2.1.0.  Lots of fixes/enhancements, see:
 https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-2.1.0
 
 Builds/runs fine on amd64, ok?
 
 Cheers,
 
 -ryan

For the archives, Daniel caught me forgetting to regen WANTLIB as there is now 
a png
LIB_DEPENDS, this should be the correct diff.

Cheers!

-ryan


? chocolate-doom-2.1.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile22 Oct 2014 13:55:07 -  1.16
+++ Makefile7 Dec 2014 23:55:15 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.16 2014/10/22 13:55:07 jasper Exp $
 
 COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
-V =2.0.0
+V =2.1.0
 DISTNAME = chocolate-doom-${V}
-REVISION = 0
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
@@ -13,11 +12,12 @@ MAINTAINER =Ryan Freeman ryan@slipgate
 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  SDL c m pthread SDL_mixer=3 SDL_net=1 samplerate=1
+WANTLIB += SDL SDL_mixer SDL_net c m png pthread samplerate z
 
 LIB_DEPENDS =  devel/sdl-mixer \
devel/sdl-net \
-   audio/libsamplerate
+   audio/libsamplerate \
+   graphics/png
 
 MASTER_SITES = http://www.chocolate-doom.org/downloads/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo27 May 2014 06:35:01 -  1.5
+++ distinfo7 Dec 2014 23:55:15 -
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-2.0.0.tar.gz) = 
hcWLd9rZMwEyU7RT7wGQdJK0cZrNVs+MtsdvSjYatgw=
-SIZE (chocolate-doom-2.0.0.tar.gz) = 2092519
+SHA256 (chocolate-doom-2.1.0.tar.gz) = 
YpMF5/MoZZ8+k+ibk63J2k6ZtaNR5RzrdJ3PPj2ovNM=
+SIZE (chocolate-doom-2.1.0.tar.gz) = 2129632
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST   27 May 2014 06:35:01 -  1.4
+++ pkg/PLIST   7 Dec 2014 23:55:15 -
@@ -23,30 +23,37 @@
 @man man/man6/chocolate-setup.6
 @man man/man6/chocolate-strife.6
 share/applications/chocolate-doom.desktop
+share/applications/chocolate-heretic.desktop
+share/applications/chocolate-hexen.desktop
 share/applications/chocolate-setup.desktop
+share/applications/chocolate-strife.desktop
 share/applications/screensavers/
 share/applications/screensavers/chocolate-doom-screensaver.desktop
 share/doc/chocolate-doom/
 share/doc/chocolate-doom/ChangeLog
 share/doc/chocolate-doom/NEWS
 share/doc/chocolate-doom/NOT-BUGS
+share/doc/chocolate-doom/PHILOSOPHY
 share/doc/chocolate-doom/README
-share/doc/chocolate-doom/README.OPL
+share/doc/chocolate-doom/README.Music
 share/doc/chocolate-heretic/
 share/doc/chocolate-heretic/ChangeLog
 share/doc/chocolate-heretic/NEWS
+share/doc/chocolate-heretic/PHILOSOPHY
 share/doc/chocolate-heretic/README
-share/doc/chocolate-heretic/README.OPL
+share/doc/chocolate-heretic/README.Music
 share/doc/chocolate-hexen/
 share/doc/chocolate-hexen/ChangeLog
 share/doc/chocolate-hexen/NEWS
+share/doc/chocolate-hexen/PHILOSOPHY
 share/doc/chocolate-hexen/README
-share/doc/chocolate-hexen/README.OPL
+share/doc/chocolate-hexen/README.Music
 share/doc/chocolate-strife/
 share/doc/chocolate-strife/ChangeLog
 share/doc/chocolate-strife/NEWS
+share/doc/chocolate-strife/PHILOSOPHY
 share/doc/chocolate-strife/README
-share/doc/chocolate-strife/README.OPL
+share/doc/chocolate-strife/README.Music
 share/doc/chocolate-strife/README.Strife
 share/doom/
 share/icons/

UPDATE: games/chocolate-doom

[Ryan Freeman]

Hey,

Patch to update to chocolate-doom 2.1.0.  Lots of fixes/enhancements, see:
https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-2.1.0

Builds/runs fine on amd64, ok?

Cheers,

-ryan


? chocolate-doom-2.1.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile22 Oct 2014 13:55:07 -  1.16
+++ Makefile2 Dec 2014 17:38:48 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.16 2014/10/22 13:55:07 jasper Exp $
 
 COMMENT =  portable release of Doom, Heretic, Hexen, and Strife
-V =2.0.0
+V =2.1.0
 DISTNAME = chocolate-doom-${V}
-REVISION = 0
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo27 May 2014 06:35:01 -  1.5
+++ distinfo2 Dec 2014 17:38:48 -
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-2.0.0.tar.gz) = 
hcWLd9rZMwEyU7RT7wGQdJK0cZrNVs+MtsdvSjYatgw=
-SIZE (chocolate-doom-2.0.0.tar.gz) = 2092519
+SHA256 (chocolate-doom-2.1.0.tar.gz) = 
YpMF5/MoZZ8+k+ibk63J2k6ZtaNR5RzrdJ3PPj2ovNM=
+SIZE (chocolate-doom-2.1.0.tar.gz) = 2129632
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST   27 May 2014 06:35:01 -  1.4
+++ pkg/PLIST   2 Dec 2014 17:38:48 -
@@ -23,30 +23,37 @@
 @man man/man6/chocolate-setup.6
 @man man/man6/chocolate-strife.6
 share/applications/chocolate-doom.desktop
+share/applications/chocolate-heretic.desktop
+share/applications/chocolate-hexen.desktop
 share/applications/chocolate-setup.desktop
+share/applications/chocolate-strife.desktop
 share/applications/screensavers/
 share/applications/screensavers/chocolate-doom-screensaver.desktop
 share/doc/chocolate-doom/
 share/doc/chocolate-doom/ChangeLog
 share/doc/chocolate-doom/NEWS
 share/doc/chocolate-doom/NOT-BUGS
+share/doc/chocolate-doom/PHILOSOPHY
 share/doc/chocolate-doom/README
-share/doc/chocolate-doom/README.OPL
+share/doc/chocolate-doom/README.Music
 share/doc/chocolate-heretic/
 share/doc/chocolate-heretic/ChangeLog
 share/doc/chocolate-heretic/NEWS
+share/doc/chocolate-heretic/PHILOSOPHY
 share/doc/chocolate-heretic/README
-share/doc/chocolate-heretic/README.OPL
+share/doc/chocolate-heretic/README.Music
 share/doc/chocolate-hexen/
 share/doc/chocolate-hexen/ChangeLog
 share/doc/chocolate-hexen/NEWS
+share/doc/chocolate-hexen/PHILOSOPHY
 share/doc/chocolate-hexen/README
-share/doc/chocolate-hexen/README.OPL
+share/doc/chocolate-hexen/README.Music
 share/doc/chocolate-strife/
 share/doc/chocolate-strife/ChangeLog
 share/doc/chocolate-strife/NEWS
+share/doc/chocolate-strife/PHILOSOPHY
 share/doc/chocolate-strife/README
-share/doc/chocolate-strife/README.OPL
+share/doc/chocolate-strife/README.Music
 share/doc/chocolate-strife/README.Strife
 share/doom/
 share/icons/

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Tue, Dec 02, 2014 at 09:41:03AM -0800, Ryan Freeman wrote:
 Hey,
 
 Patch to update to chocolate-doom 2.1.0.  Lots of fixes/enhancements, see:
 https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-2.1.0
 
 Builds/runs fine on amd64, ok?

forgot the best part of the changelog!

* Unsafe string functions have been eliminated from the codebase.
   Thanks to Theo de Raadt for calling out Chocolate Doom by name
   (alongside many other packages) for still using unsafe functions
   like strcpy: http://marc.info/?l=openbsd-techm=138733933417096

Cheers,
 
-ryan

Re: UPDATE: games/chocolate-doom

[Landry Breuil]

On Tue, Dec 02, 2014 at 09:43:54AM -0800, Ryan Freeman wrote:
 On Tue, Dec 02, 2014 at 09:41:03AM -0800, Ryan Freeman wrote:
  Hey,
  
  Patch to update to chocolate-doom 2.1.0.  Lots of fixes/enhancements, see:
  https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-2.1.0
  
  Builds/runs fine on amd64, ok?
 
 forgot the best part of the changelog!
 
 * Unsafe string functions have been eliminated from the codebase.
Thanks to Theo de Raadt for calling out Chocolate Doom by name
(alongside many other packages) for still using unsafe functions
like strcpy: http://marc.info/?l=openbsd-techm=138733933417096

Definitely ok :)

Landry

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Mon, Jul 09, 2012 at 04:09:33PM -0700, Ryan Freeman wrote:
 Hi,
 
 This updates chocolate-doom to 1.7.0.  Not too many changes:
 
 http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/tags/chocolate-doom-1.7.0/NEWS?revision=2511view=markup
 

I meant to actually summarize the changes:
- palette accuracy reduced to 6 bits per channel, to more accurately
  emulate the PC VGA hardware
- gmake no-longer required for build!
- running servers re-resolve address of master occasionally, to adapt
  to dns changes
- a few more bug fixes, refer to summary in NEWS file above or in
  archive for the rest.

attached a new patch that also updates my email to my openbsd
one.  simple but hoping to get it in for 5.2 to be on top of this
(ever so important) package for once ;)

edd@ had a look and it was running good on i386, building fine on
sparc64.  OK?

-ryan


? chocolate-doom-1.7.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile23 Mar 2012 08:47:03 -  1.11
+++ Makefile18 Jul 2012 19:33:34 -
@@ -1,13 +1,12 @@
 # $OpenBSD: Makefile,v 1.11 2012/03/23 08:47:03 rfreeman Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.6.0
-REVISION = 0
+DISTNAME = chocolate-doom-1.7.0
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
 
-MAINTAINER =   Ryan Freeman r...@slipgate.org
+MAINTAINER =   Ryan Freeman rfree...@openbsd.org
 
 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
@@ -26,7 +25,6 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
 RUN_DEPENDS =  devel/desktop-file-utils
 
 USE_GROFF =Yes
-USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo24 May 2011 00:11:48 -  1.3
+++ distinfo18 Jul 2012 19:33:34 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.6.0.tar.gz) = shDhFd2m6oi/tsT+Ea3hAQ==
-RMD160 (chocolate-doom-1.6.0.tar.gz) = j+jgX+OHNxmiRFjZOO7vKPotoh0=
-SHA1 (chocolate-doom-1.6.0.tar.gz) = CB66yJmWBytbv8OlcrFgRKsvx5A=
-SHA256 (chocolate-doom-1.6.0.tar.gz) = 
dBy+kS2rMlZBypfCcyqYf35s/HFnV/qdvaHYF5/WrkU=
-SIZE (chocolate-doom-1.6.0.tar.gz) = 1076134
+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

UPDATE: games/chocolate-doom

[Ryan Freeman]

Hi,

This updates chocolate-doom to 1.7.0.  Not too many changes:

http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/tags/chocolate-doom-1.7.0/NEWS?revision=2511view=markup

Cheers,

-ryan


? chocolate-doom-1.7.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile23 Mar 2012 08:47:03 -  1.11
+++ Makefile9 Jul 2012 23:02:50 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.11 2012/03/23 08:47:03 rfreeman Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.6.0
-REVISION = 0
+DISTNAME = chocolate-doom-1.7.0
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
@@ -26,7 +25,6 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
 RUN_DEPENDS =  devel/desktop-file-utils
 
 USE_GROFF =Yes
-USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo24 May 2011 00:11:48 -  1.3
+++ distinfo9 Jul 2012 23:02:50 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.6.0.tar.gz) = shDhFd2m6oi/tsT+Ea3hAQ==
-RMD160 (chocolate-doom-1.6.0.tar.gz) = j+jgX+OHNxmiRFjZOO7vKPotoh0=
-SHA1 (chocolate-doom-1.6.0.tar.gz) = CB66yJmWBytbv8OlcrFgRKsvx5A=
-SHA256 (chocolate-doom-1.6.0.tar.gz) = 
dBy+kS2rMlZBypfCcyqYf35s/HFnV/qdvaHYF5/WrkU=
-SIZE (chocolate-doom-1.6.0.tar.gz) = 1076134
+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

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Wed, Mar 07, 2012 at 11:56:44AM -0800, Ryan Freeman wrote:
 I have had this sitting around for about a year, this
 patch cleans up this port by removing the need for the patches,
 instead opting to use some perl.
 
 it also fixes the port correctly ignoring python.
 
 I am unsure if the revision bump is required, as the resulting
 packing list is exactly the same. 
 

I have updated the diff based on feedback received.  here we are
using MAKE_FLAGS instead of perl subst for the two rather generic
matches for the Makefile.in files, the subst for d_iwad.c is still
perfectly safe.

Another diff to update the doom-data port to install to the correct
data location will be along shortly

-ryan


Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- Makefile24 May 2011 00:11:48 -  1.10
+++ Makefile9 Mar 2012 08:55:10 -
@@ -2,6 +2,7 @@
 
 COMMENT =  portable version of iD Software's Doom
 DISTNAME = chocolate-doom-1.6.0
+REVISION = 0
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
@@ -28,14 +29,24 @@ USE_GROFF = Yes
 USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS +=  --without-python
 
-MAN_5= chocolate-doom.cfg default.cfg
-MAN_6= chocolate-doom chocolate-server chocolate-setup
+# we don't need to require python to build
+CONFIGURE_ENV +=   HAVE_PYTHON=false
+
+# set correct program directory
+MAKE_FLAGS =   gamesdir=${TRUEPREFIX}/bin
+
+MAN_5 =chocolate-doom.cfg default.cfg
+MAN_6 =chocolate-doom chocolate-server chocolate-setup
+
+post-extract:
+   # set correct data directory
+   @perl -pi -e s,/usr/share/games/doom,${TRUEPREFIX}/share/doom, \
+   ${WRKSRC}/src/d_iwad.c
 
 post-install:
# Data files get installed to this directory.
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/games/doom/
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/
 .for m in ${MAN_5}
${INSTALL_MAN} ${WRKBUILD}/man/$m.5 ${PREFIX}/man/man5/
 .endfor
Index: patches/patch-setup_Makefile_in
===
RCS file: patches/patch-setup_Makefile_in
diff -N patches/patch-setup_Makefile_in
--- patches/patch-setup_Makefile_in 13 Jan 2011 10:30:49 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_Makefile_in,v 1.3 2011/01/13 10:30:49 jasper Exp $
 setup/Makefile.in.orig Sun Jan  2 10:17:16 2011
-+++ setup/Makefile.in  Tue Jan 11 12:40:52 2011
-@@ -181,7 +181,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--gamesdir = $(prefix)/games
-+gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
- SOURCE_FILES = \
- compatibility.c   compatibility.h   \
Index: patches/patch-src_Makefile_in
===
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in   13 Jan 2011 10:30:49 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2011/01/13 10:30:49 jasper Exp $
 src/Makefile.in.orig   Sun Jan  2 10:17:17 2011
-+++ src/Makefile.inTue Jan 11 12:41:03 2011
-@@ -252,7 +252,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--gamesdir = $(prefix)/games
-+gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../opl -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ 
@SDLNET_CFLAGS@
- DEDSERV_FILES = \
- d_dedicated.c  \
Index: pkg/MESSAGE
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -p -u -r1.3 MESSAGE
--- pkg/MESSAGE 24 May 2011 00:11:48 -  1.3
+++ pkg/MESSAGE 9 Mar 2012 08:55:10 -
@@ -1,6 +1,7 @@
 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/games/doom/ to play.
+tnt.wad, or all of the above in ${PREFIX}/share/doom/ to play.
+
 If multiple IWADs are installed, you may specify the one you want to
 play via the -iwad command-line parameter e.g.
 
@@ -9,7 +10,3 @@ play via the -iwad command-line paramete
 The Shareware IWAD is available in the doomdata package.
 
 Run `chocolate-setup' to generate a configuration file to your liking.
-If you would like to enjoy the classic in-game Doom music, you may
-install audio/timidity and Chocolate Doom will automatically make use
-of it at runtime, no recompilation required. Be sure that the music is
-enabled within chocolate-setup.
Index: 

UPDATE: games/chocolate-doom

[Ryan Freeman]

I have had this sitting around for about a year, this
patch cleans up this port by removing the need for the patches,
instead opting to use some perl.

it also fixes the port correctly ignoring python.

I am unsure if the revision bump is required, as the resulting
packing list is exactly the same. 

comments/ok?

-ryan


Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- Makefile24 May 2011 00:11:48 -  1.10
+++ Makefile7 Mar 2012 04:11:26 -
@@ -2,6 +2,7 @@
 
 COMMENT =  portable version of iD Software's Doom
 DISTNAME = chocolate-doom-1.6.0
+REVISION = 0
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
@@ -28,14 +29,23 @@ USE_GROFF = Yes
 USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS +=  --without-python
 
-MAN_5= chocolate-doom.cfg default.cfg
-MAN_6= chocolate-doom chocolate-server chocolate-setup
+# we don't need to require python to build
+CONFIGURE_ENV +=   HAVE_PYTHON=false
+
+MAN_5 =chocolate-doom.cfg default.cfg
+MAN_6 =chocolate-doom chocolate-server chocolate-setup
+
+post-extract:
+   # set correct bin directory and data directory
+   @perl -pi -e s,/games,/bin, ${WRKSRC}/src/Makefile.in
+   @perl -pi -e s,/games,/bin, ${WRKSRC}/setup/Makefile.in
+   @perl -pi -e s,/usr/share/games/doom,${TRUEPREFIX}/share/doom, \
+   ${WRKSRC}/src/d_iwad.c
 
 post-install:
# Data files get installed to this directory.
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/games/doom/
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/
 .for m in ${MAN_5}
${INSTALL_MAN} ${WRKBUILD}/man/$m.5 ${PREFIX}/man/man5/
 .endfor
Index: patches/patch-setup_Makefile_in
===
RCS file: patches/patch-setup_Makefile_in
diff -N patches/patch-setup_Makefile_in
--- patches/patch-setup_Makefile_in 13 Jan 2011 10:30:49 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_Makefile_in,v 1.3 2011/01/13 10:30:49 jasper Exp $
 setup/Makefile.in.orig Sun Jan  2 10:17:16 2011
-+++ setup/Makefile.in  Tue Jan 11 12:40:52 2011
-@@ -181,7 +181,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--gamesdir = $(prefix)/games
-+gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
- SOURCE_FILES = \
- compatibility.c   compatibility.h   \
Index: patches/patch-src_Makefile_in
===
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in   13 Jan 2011 10:30:49 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2011/01/13 10:30:49 jasper Exp $
 src/Makefile.in.orig   Sun Jan  2 10:17:17 2011
-+++ src/Makefile.inTue Jan 11 12:41:03 2011
-@@ -252,7 +252,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--gamesdir = $(prefix)/games
-+gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../opl -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ 
@SDLNET_CFLAGS@
- DEDSERV_FILES = \
- d_dedicated.c  \
Index: pkg/MESSAGE
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -p -u -r1.3 MESSAGE
--- pkg/MESSAGE 24 May 2011 00:11:48 -  1.3
+++ pkg/MESSAGE 7 Mar 2012 04:11:26 -
@@ -1,6 +1,7 @@
 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/games/doom/ to play.
+tnt.wad, or all of the above in ${PREFIX}/share/doom/ to play.
+
 If multiple IWADs are installed, you may specify the one you want to
 play via the -iwad command-line parameter e.g.
 
@@ -9,7 +10,3 @@ play via the -iwad command-line paramete
 The Shareware IWAD is available in the doomdata package.
 
 Run `chocolate-setup' to generate a configuration file to your liking.
-If you would like to enjoy the classic in-game Doom music, you may
-install audio/timidity and Chocolate Doom will automatically make use
-of it at runtime, no recompilation required. Be sure that the music is
-enabled within chocolate-setup.
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST   24 May 2011 00:11:48 -  1.2
+++ pkg/PLIST   7 Mar 2012 04:11:26 -
@@ -18,8 +18,7 @@ 

UPDATE: games/chocolate-doom

[Ryan Freeman]

Hi Everybody!

Here is a diff to update chocolate-doom from 1.5.0 to 1.6.0.
There are a couple 'fixes' that enhance the authenticity of the
port to the original doom executables, some desktop file gooes
added, and some chocolate-setup enhancements.

i had to add USE_GMAKE = Yes to allow it to build without
puking at the icon stage of the build. Should we rather patch
the Makefile to still work with our make or is the addition of
USE_GMAKE fine?

Comments?

-ryan
? chocolate-doom-1.6.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile14 Mar 2011 09:17:00 -  1.9
+++ Makefile20 May 2011 21:27:14 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.9 2011/03/14 09:17:00 sthen Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.5.0
+DISTNAME = chocolate-doom-1.6.0
 CATEGORIES =   games x11
-REVISION = 0
 
 HOMEPAGE = http://www.chocolate-doom.org/
 
@@ -24,6 +23,7 @@ LIB_DEPENDS = devel/sdl-mixer \
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chocolate-doom/}
 
 USE_GROFF =Yes
+USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --without-python
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo13 Jan 2011 10:30:49 -  1.2
+++ distinfo20 May 2011 21:27:14 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.5.0.tar.gz) = 48eN5ZZdqSsVkuLSCvh+BQ==
-RMD160 (chocolate-doom-1.5.0.tar.gz) = uKPm7qNSo8Gyyd8ceAihuVc6Z+c=
-SHA1 (chocolate-doom-1.5.0.tar.gz) = EAcVccFJWl8xd7hN5S56MQ8bMKM=
-SHA256 (chocolate-doom-1.5.0.tar.gz) = 
eFeB/C03HOtbDYWeGej5Bi8tp++L+abwrP39rf7BsrE=
-SIZE (chocolate-doom-1.5.0.tar.gz) = 969789
+MD5 (chocolate-doom-1.6.0.tar.gz) = shDhFd2m6oi/tsT+Ea3hAQ==
+RMD160 (chocolate-doom-1.6.0.tar.gz) = j+jgX+OHNxmiRFjZOO7vKPotoh0=
+SHA1 (chocolate-doom-1.6.0.tar.gz) = CB66yJmWBytbv8OlcrFgRKsvx5A=
+SHA256 (chocolate-doom-1.6.0.tar.gz) = 
dBy+kS2rMlZBypfCcyqYf35s/HFnV/qdvaHYF5/WrkU=
+SIZE (chocolate-doom-1.6.0.tar.gz) = 1076134
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   5 Jun 2009 21:58:43 -   1.1.1.1
+++ pkg/PLIST   20 May 2011 21:27:14 -
@@ -7,5 +7,20 @@
 @man man/man6/chocolate-doom.6
 @man man/man6/chocolate-server.6
 @man man/man6/chocolate-setup.6
+share/applications/
+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/games/
 share/games/doom/
+share/icons/
+share/icons/chocolate-doom.png
+share/icons/chocolate-setup.png

Re: UPDATE: games/chocolate-doom

[Stuart Henderson]

On 2011-05-20, Ryan Freeman r...@slipgate.org wrote:

 --gBBFr7Ir9EOA20Yy
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 Hi Everybody!

 Here is a diff to update chocolate-doom from 1.5.0 to 1.6.0.
 There are a couple 'fixes' that enhance the authenticity of the
 port to the original doom executables, some desktop file gooes
 added, and some chocolate-setup enhancements.

Please also add the RUN_DEPENDS and @exec/@unexec-delete lines
(regen PLIST after adding the RUN_DEPENDS).

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Fri, May 20, 2011 at 10:34:10PM +, Stuart Henderson wrote:
 On 2011-05-20, Ryan Freeman r...@slipgate.org wrote:
 
  --gBBFr7Ir9EOA20Yy
  Content-Type: text/plain; charset=us-ascii
  Content-Disposition: inline
 
  Hi Everybody!
 
  Here is a diff to update chocolate-doom from 1.5.0 to 1.6.0.
  There are a couple 'fixes' that enhance the authenticity of the
  port to the original doom executables, some desktop file gooes
  added, and some chocolate-setup enhancements.
 
 Please also add the RUN_DEPENDS and @exec/@unexec-delete lines
 (regen PLIST after adding the RUN_DEPENDS).
 


hopefully fixed diff attached

-ryan 
? chocolate-doom-1.6.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile14 Mar 2011 09:17:00 -  1.9
+++ Makefile21 May 2011 05:39:53 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.9 2011/03/14 09:17:00 sthen Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.5.0
+DISTNAME = chocolate-doom-1.6.0
 CATEGORIES =   games x11
-REVISION = 0
 
 HOMEPAGE = http://www.chocolate-doom.org/
 
@@ -23,7 +22,10 @@ LIB_DEPENDS =devel/sdl-mixer \
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chocolate-doom/}
 
+RUN_DEPENDS =  devel/desktop-file-utils
+
 USE_GROFF =Yes
+USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --without-python
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo13 Jan 2011 10:30:49 -  1.2
+++ distinfo21 May 2011 05:39:53 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.5.0.tar.gz) = 48eN5ZZdqSsVkuLSCvh+BQ==
-RMD160 (chocolate-doom-1.5.0.tar.gz) = uKPm7qNSo8Gyyd8ceAihuVc6Z+c=
-SHA1 (chocolate-doom-1.5.0.tar.gz) = EAcVccFJWl8xd7hN5S56MQ8bMKM=
-SHA256 (chocolate-doom-1.5.0.tar.gz) = 
eFeB/C03HOtbDYWeGej5Bi8tp++L+abwrP39rf7BsrE=
-SIZE (chocolate-doom-1.5.0.tar.gz) = 969789
+MD5 (chocolate-doom-1.6.0.tar.gz) = shDhFd2m6oi/tsT+Ea3hAQ==
+RMD160 (chocolate-doom-1.6.0.tar.gz) = j+jgX+OHNxmiRFjZOO7vKPotoh0=
+SHA1 (chocolate-doom-1.6.0.tar.gz) = CB66yJmWBytbv8OlcrFgRKsvx5A=
+SHA256 (chocolate-doom-1.6.0.tar.gz) = 
dBy+kS2rMlZBypfCcyqYf35s/HFnV/qdvaHYF5/WrkU=
+SIZE (chocolate-doom-1.6.0.tar.gz) = 1076134
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   5 Jun 2009 21:58:43 -   1.1.1.1
+++ pkg/PLIST   21 May 2011 05:39:53 -
@@ -7,5 +7,21 @@
 @man man/man6/chocolate-doom.6
 @man man/man6/chocolate-server.6
 @man man/man6/chocolate-setup.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/games/
 share/games/doom/
+share/icons/
+share/icons/chocolate-doom.png
+share/icons/chocolate-setup.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

Re: UPDATE: games/chocolate-doom

[Jasper Lievisse Adriaanse]

On Thu, Jan 13, 2011 at 01:48:57PM -0800, Ryan Freeman wrote:
 On Thu, Jan 13, 2011 at 11:16:10AM +0100, Jasper Lievisse Adriaanse wrote:
  On Wed, Jan 12, 2011 at 04:22:05PM -0800, Ryan Freeman wrote:
   Hello ports@,
   
   It's that time again, Simon has emailed me notification of
   the newest chocolate-doom release. As there has been previous
   discussion from the 1.2.1-1.4.0 release, here are a few quick
   notes to refresh some memories:
   
   Edd Barrett notified me of an issue with sparc64. the result
   of discussions about that matter is here: (from the NEWS file
   in the chocolate-doom archive)
   
   71 * The zone memory system now aligns allocated memory to 8-byte
   72 boundaries on 64-bit systems, which may fix crashes on systems
   73 such as sparc64 (thanks Ryan Freeman and Edd Barrett).
   
   Alexander Hall sent me a small patch to fix a little typo
   changing CONFIGURE_ARGS+ = to CONFIGURE_ARGS +=
   
   I don't yet have official word from Edd or anyone else on sparc64
   systems if the patch introduced for 8-byte memory alignment showed
   help, so here is another chance to verify that i hope :)
   
   tested builds packages and runs flawless on i386.
   
   -ryan
  I got this warning on sparc64 when building:
  cc -DHAVE_CONFIG_H -I. -I.. -I../opl -I../textscreen -I../pcsound -O2 -g
  -Wall -O2 -pipe -I/usr/local/include -I/usr/local/include/SDL 
  -D_GNU_SOURCE=1
  -D_REENTRANT -I/usr/X11R6/include -DXTHREADS -MT i_main.o -MD -MP -MF
  .deps/i_main.Tpo -c -o i_main.o i_main.c
  i_main.c:117:2: warning: #warning No known way to set processor affinity on
  this platform.
  i_main.c:118:2: warning: #warning You may experience crashes due to 
  SDL_mixer.
  
  and the warning is repeated at launch, though it appears to play fine 
  (albeit a
  tad slow) with X11 forwarding ;-)
  
 
 that error actually appears on i386 as well, but its a known sdl_mixer bug
 (apparently). that being said, i'm not sure that it affects our sdl_mixer,
 and furthermore i've never actually had the game crash. :)
 
 -ryan
It worked fine on sparc64, and I've played for some time on amd64 as well,
no issues ;-) Anyway, it's been committed.

  -- 
  Cheers,
  Jasper
  
  Capable, generous men do not create victims, they nurture them.
  
 

-- 
Cheers,
Jasper

Capable, generous men do not create victims, they nurture them.

Re: UPDATE: games/chocolate-doom

[Jasper Lievisse Adriaanse]

On Wed, Jan 12, 2011 at 04:22:05PM -0800, Ryan Freeman wrote:
 Hello ports@,
 
 It's that time again, Simon has emailed me notification of
 the newest chocolate-doom release. As there has been previous
 discussion from the 1.2.1-1.4.0 release, here are a few quick
 notes to refresh some memories:
 
 Edd Barrett notified me of an issue with sparc64. the result
 of discussions about that matter is here: (from the NEWS file
 in the chocolate-doom archive)
 
 71 * The zone memory system now aligns allocated memory to 8-byte
 72 boundaries on 64-bit systems, which may fix crashes on systems
 73 such as sparc64 (thanks Ryan Freeman and Edd Barrett).
 
 Alexander Hall sent me a small patch to fix a little typo
 changing CONFIGURE_ARGS+ = to CONFIGURE_ARGS +=
 
 I don't yet have official word from Edd or anyone else on sparc64
 systems if the patch introduced for 8-byte memory alignment showed
 help, so here is another chance to verify that i hope :)
 
 tested builds packages and runs flawless on i386.
 
 -ryan
I got this warning on sparc64 when building:
cc -DHAVE_CONFIG_H -I. -I.. -I../opl -I../textscreen -I../pcsound -O2 -g
-Wall -O2 -pipe -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1
-D_REENTRANT -I/usr/X11R6/include -DXTHREADS -MT i_main.o -MD -MP -MF
.deps/i_main.Tpo -c -o i_main.o i_main.c
i_main.c:117:2: warning: #warning No known way to set processor affinity on
this platform.
i_main.c:118:2: warning: #warning You may experience crashes due to SDL_mixer.

and the warning is repeated at launch, though it appears to play fine (albeit a
tad slow) with X11 forwarding ;-)


 ? chocolate-doom-1.5.0.patch
 Index: Makefile
 ===
 RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
 retrieving revision 1.7
 diff -u -p -r1.7 Makefile
 --- Makefile  16 Nov 2010 11:23:26 -  1.7
 +++ Makefile  11 Jan 2011 20:55:05 -
 @@ -1,8 +1,8 @@
  # $OpenBSD: Makefile,v 1.7 2010/11/16 11:23:26 espie Exp $
  
  COMMENT =portable version of iD Software's Doom
 -DISTNAME =   chocolate-doom-1.2.1
 -REVISION =   0
 +DISTNAME =   chocolate-doom-1.5.0
 +#REVISION =  0
  CATEGORIES = games x11
  
  HOMEPAGE =   http://www.chocolate-doom.org/
 @@ -26,7 +26,7 @@ MASTER_SITES =  ${MASTER_SITE_SOURCEFORGE
  USE_GROFF =  Yes
  
  CONFIGURE_STYLE =gnu
 -CONFIGURE_ARGS+ =--without-python
 +CONFIGURE_ARGS +=--without-python
  
  MAN_5=   chocolate-doom.cfg default.cfg
  MAN_6=   chocolate-doom chocolate-server chocolate-setup
 Index: distinfo
 ===
 RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
 retrieving revision 1.1.1.1
 diff -u -p -r1.1.1.1 distinfo
 --- distinfo  5 Jun 2009 21:58:43 -   1.1.1.1
 +++ distinfo  11 Jan 2011 20:55:05 -
 @@ -1,5 +1,5 @@
 -MD5 (chocolate-doom-1.2.1.tar.gz) = 3wTDgANO/3iea57hwBZJdw==
 -RMD160 (chocolate-doom-1.2.1.tar.gz) = JACmlVqKRSlHJXB5Mo5ESAHD0vc=
 -SHA1 (chocolate-doom-1.2.1.tar.gz) = OygCwPiosCvJxCXt4KE6qf0TFNc=
 -SHA256 (chocolate-doom-1.2.1.tar.gz) = 
 /61QqEf3B+pch4RNvZwTOebS0YK7XPbm9infQg9mKcE=
 -SIZE (chocolate-doom-1.2.1.tar.gz) = 664600
 +MD5 (chocolate-doom-1.5.0.tar.gz) = 48eN5ZZdqSsVkuLSCvh+BQ==
 +RMD160 (chocolate-doom-1.5.0.tar.gz) = uKPm7qNSo8Gyyd8ceAihuVc6Z+c=
 +SHA1 (chocolate-doom-1.5.0.tar.gz) = EAcVccFJWl8xd7hN5S56MQ8bMKM=
 +SHA256 (chocolate-doom-1.5.0.tar.gz) = 
 eFeB/C03HOtbDYWeGej5Bi8tp++L+abwrP39rf7BsrE=
 +SIZE (chocolate-doom-1.5.0.tar.gz) = 969789
 Index: patches/patch-setup_Makefile_in
 ===
 RCS file: /cvs/ports/games/chocolate-doom/patches/patch-setup_Makefile_in,v
 retrieving revision 1.2
 diff -u -p -r1.2 patch-setup_Makefile_in
 --- patches/patch-setup_Makefile_in   5 Jun 2009 22:27:29 -   1.2
 +++ patches/patch-setup_Makefile_in   11 Jan 2011 20:55:05 -
 @@ -1,12 +1,12 @@
  $OpenBSD: patch-setup_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
  setup/Makefile.in.orig   Wed Dec 10 21:29:26 2008
 -+++ setup/Makefile.inWed Dec 10 21:28:32 2008
 -@@ -170,7 +170,7 @@ sysconfdir = @sysconfdir@
 - target_alias = @target_alias@
 +--- setup/Makefile.in.orig   Sun Jan  2 10:17:16 2011
  setup/Makefile.inTue Jan 11 12:40:52 2011
 +@@ -181,7 +181,7 @@ target_alias = @target_alias@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -gamesdir = $(prefix)/games
  +gamesdir = $(prefix)/bin
 - AM_CFLAGS = -I../textscreen -I../src -DINSTALL_DIR=\$(gamesdir)\
 + AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
   SOURCE_FILES = \
   compatibility.c   compatibility.h   \
 Index: patches/patch-src_Makefile_in
 ===
 RCS file: /cvs/ports/games/chocolate-doom/patches/patch-src_Makefile_in,v
 retrieving revision 1.2
 diff -u -p -r1.2 

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

On Thu, Jan 13, 2011 at 11:16:10AM +0100, Jasper Lievisse Adriaanse wrote:
 On Wed, Jan 12, 2011 at 04:22:05PM -0800, Ryan Freeman wrote:
  Hello ports@,
  
  It's that time again, Simon has emailed me notification of
  the newest chocolate-doom release. As there has been previous
  discussion from the 1.2.1-1.4.0 release, here are a few quick
  notes to refresh some memories:
  
  Edd Barrett notified me of an issue with sparc64. the result
  of discussions about that matter is here: (from the NEWS file
  in the chocolate-doom archive)
  
  71 * The zone memory system now aligns allocated memory to 8-byte
  72 boundaries on 64-bit systems, which may fix crashes on systems
  73 such as sparc64 (thanks Ryan Freeman and Edd Barrett).
  
  Alexander Hall sent me a small patch to fix a little typo
  changing CONFIGURE_ARGS+ = to CONFIGURE_ARGS +=
  
  I don't yet have official word from Edd or anyone else on sparc64
  systems if the patch introduced for 8-byte memory alignment showed
  help, so here is another chance to verify that i hope :)
  
  tested builds packages and runs flawless on i386.
  
  -ryan
 I got this warning on sparc64 when building:
 cc -DHAVE_CONFIG_H -I. -I.. -I../opl -I../textscreen -I../pcsound -O2 -g
 -Wall -O2 -pipe -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1
 -D_REENTRANT -I/usr/X11R6/include -DXTHREADS -MT i_main.o -MD -MP -MF
 .deps/i_main.Tpo -c -o i_main.o i_main.c
 i_main.c:117:2: warning: #warning No known way to set processor affinity on
 this platform.
 i_main.c:118:2: warning: #warning You may experience crashes due to SDL_mixer.
 
 and the warning is repeated at launch, though it appears to play fine (albeit 
 a
 tad slow) with X11 forwarding ;-)
 

that error actually appears on i386 as well, but its a known sdl_mixer bug
(apparently). that being said, i'm not sure that it affects our sdl_mixer,
and furthermore i've never actually had the game crash. :)

-ryan

 -- 
 Cheers,
 Jasper
 
 Capable, generous men do not create victims, they nurture them.
 

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

Excerpts from Ryan Freeman's message of Mon Aug 16 09:13:29 -0700 2010:
 Excerpts from Ryan Freeman's message of Fri Aug 13 08:49:30 -0700 2010:
  Hello ports@
  
  Here is a patch updating my chocolate-doom port from 1.2.1 to the
  latest version, 1.4.0. Daniel Dickman previously submitted a patch
  to me updating to 1.3.0, however Edd Barrett informed me that the
  1.4.0 version would not build on sparc64.
  
  To summarize changes, the 1.4.0 and 1.5.0 release logs are here:
  1.3.0 to 1.4.0: 
  http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1869r2=1941
  1.2.1 to 1.3.0: 
  http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1421r2=1869
  
  One thing to note is fraggle's efforts to add support for openbsd's
  OPL device driver, and a software OPL emulator to play back doom's
  music as closely as possible to the way it would have originally
  sounded back in 1993 with the appropriate audio card :)
  
  Please test, and Edd if you could let me know if this now builds
  on sparc64, i would appreciate it :D Also if it doesn't, did you
  ever get a chance to check and see if chocolate-doom 1.2.1 built
  on sparc64? 
 
 
 first of all to correct confusion there is no 1.5.0 release, i meant
 to type 'the 1.3.0 and 1.4.0 release logs are here:'
 
 Calling Edd! :) I received a patch from Simon Howard (chocolate-doom
 author) for sparc64 issues can this be tested by Edd or anyone
 with sparc64?  thanks!
 

Edd! :) can you test this on your sparc64 real quick? i have Simon
asking if he can commit the below fix to his trunk, i'm hoping that
resolves it all .

-ryan

 From Simon:
 I checked the ports@ archives about the sparc64 problem and it seems
 to be a SIGBUS, which implies a memory alignment problem.  Apparently
 SPARC64 expects some things to be 8-byte word aligned.  Doom's zone  
 memory system aligns allocated memory to 4 byte boundaries and I   
 assumed this would be enough, but it may be an invalid assumption.
 
 
 /usr/ports/mystuff/games/chocolate-doom/patches/patch-src_z_zone_c:
 
 $OpenBSD$
 --- src/z_zone.c.origMon Aug 16 09:05:39 2010
 +++ src/z_zone.cMon Aug 16 09:06:59 2010
 @@ -40,7 +40,8 @@
  // It is of no value to free a cachable block,
  //  because it will get overwritten automatically if needed.
  // 
 - 
 +
 +#define MEM_ALIGN sizeof(void *) 
  #define ZONEID0x1d4a11
  
  typedef struct memblock_s
 @@ -201,7 +202,7 @@ Z_Malloc
  memblock_t*base;
  void *result;
  
 -size = (size + 3)  ~3;
 +size = (size + MEM_ALIGN - 1)  ~(MEM_ALIGN - 1);
  
  // scan through the block list,
  // looking for the first free block
  

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

Excerpts from Jacob Meuser's message of Sat Aug 14 04:33:21 -0700 2010:
 On Fri, Aug 13, 2010 at 08:49:30AM -0700, Ryan Freeman wrote:
 
  One thing to note is fraggle's efforts to add support for openbsd's
  OPL device driver, and a software OPL emulator to play back doom's
  music as closely as possible to the way it would have originally
  sounded back in 1993 with the appropriate audio card :)
 
 opl(4) was removed from the kernel not long ago.
 
 from the chololate-doom README.OPL: 
 
   === OpenBSD/NetBSD ===
 
   You must be running as root to access the hardware OPL directly.
 
 also, opl(4) didn't seem to work with cmpci(4).  I asked a couple years
 ago for eso(4) testing and didn't get much response.  I recently asked
 for testing of several ISA cards that have opl(4), even particularly
 ym(4), and got no replies *at all*.


my bad, i had received this information from Simon Howard directly
in one of my many conversations with him, and i must have heard 
incorrectly. i revisited the opl(4) issue (and lack thereof) with
him and realized my error; it doesn't use any kernel drivers, the
game itself has the option of accessing opl hardware directly
via ioport access. hence requiring root access. ignore hardware
opl(4) things. the software opl emulator it provides by default
anyhow is quite authentic sounding.

Re: UPDATE: games/chocolate-doom

[Ryan Freeman]

Excerpts from Ryan Freeman's message of Fri Aug 13 08:49:30 -0700 2010:
 Hello ports@
 
 Here is a patch updating my chocolate-doom port from 1.2.1 to the
 latest version, 1.4.0. Daniel Dickman previously submitted a patch
 to me updating to 1.3.0, however Edd Barrett informed me that the
 1.4.0 version would not build on sparc64.
 
 To summarize changes, the 1.4.0 and 1.5.0 release logs are here:
 1.3.0 to 1.4.0: 
 http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1869r2=1941
 1.2.1 to 1.3.0: 
 http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1421r2=1869
 
 One thing to note is fraggle's efforts to add support for openbsd's
 OPL device driver, and a software OPL emulator to play back doom's
 music as closely as possible to the way it would have originally
 sounded back in 1993 with the appropriate audio card :)
 
 Please test, and Edd if you could let me know if this now builds
 on sparc64, i would appreciate it :D Also if it doesn't, did you
 ever get a chance to check and see if chocolate-doom 1.2.1 built
 on sparc64? 


first of all to correct confusion there is no 1.5.0 release, i meant
to type 'the 1.3.0 and 1.4.0 release logs are here:'

Calling Edd! :) I received a patch from Simon Howard (chocolate-doom
author) for sparc64 issues can this be tested by Edd or anyone
with sparc64?  thanks!

From Simon:
I checked the ports@ archives about the sparc64 problem and it seems
to be a SIGBUS, which implies a memory alignment problem.  Apparently
SPARC64 expects some things to be 8-byte word aligned.  Doom's zone  
memory system aligns allocated memory to 4 byte boundaries and I   
assumed this would be enough, but it may be an invalid assumption.


/usr/ports/mystuff/games/chocolate-doom/patches/patch-src_z_zone_c:

$OpenBSD$
--- src/z_zone.c.orig   Mon Aug 16 09:05:39 2010
+++ src/z_zone.cMon Aug 16 09:06:59 2010
@@ -40,7 +40,8 @@
 // It is of no value to free a cachable block,
 //  because it will get overwritten automatically if needed.
 // 
- 
+
+#define MEM_ALIGN sizeof(void *) 
 #define ZONEID 0x1d4a11
 
 typedef struct memblock_s
@@ -201,7 +202,7 @@ Z_Malloc
 memblock_t*base;
 void *result;
 
-size = (size + 3)  ~3;
+size = (size + MEM_ALIGN - 1)  ~(MEM_ALIGN - 1);
 
 // scan through the block list,
 // looking for the first free block
 

Re: UPDATE: games/chocolate-doom

[Jacob Meuser]

On Fri, Aug 13, 2010 at 08:49:30AM -0700, Ryan Freeman wrote:

 One thing to note is fraggle's efforts to add support for openbsd's
 OPL device driver, and a software OPL emulator to play back doom's
 music as closely as possible to the way it would have originally
 sounded back in 1993 with the appropriate audio card :)

opl(4) was removed from the kernel not long ago.

from the chololate-doom README.OPL: 

  === OpenBSD/NetBSD ===

  You must be running as root to access the hardware OPL directly.

also, opl(4) didn't seem to work with cmpci(4).  I asked a couple years
ago for eso(4) testing and didn't get much response.  I recently asked
for testing of several ISA cards that have opl(4), even particularly
ym(4), and got no replies *at all*.

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

UPDATE: games/chocolate-doom

[Ryan Freeman]

Hello ports@

Here is a patch updating my chocolate-doom port from 1.2.1 to the
latest version, 1.4.0. Daniel Dickman previously submitted a patch
to me updating to 1.3.0, however Edd Barrett informed me that the
1.4.0 version would not build on sparc64.

To summarize changes, the 1.4.0 and 1.5.0 release logs are here:
1.3.0 to 1.4.0: 
http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1869r2=1941
1.2.1 to 1.3.0: 
http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1421r2=1869

One thing to note is fraggle's efforts to add support for openbsd's
OPL device driver, and a software OPL emulator to play back doom's
music as closely as possible to the way it would have originally
sounded back in 1993 with the appropriate audio card :)

Please test, and Edd if you could let me know if this now builds
on sparc64, i would appreciate it :D Also if it doesn't, did you
ever get a chance to check and see if chocolate-doom 1.2.1 built
on sparc64? 

Comments?

tests/builds/runs good on i386

-ryan


? chocolate-doom.patch
Index: Makefile
===
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile5 Jun 2009 22:38:04 -   1.3
+++ Makefile5 Aug 2010 01:14:40 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.3 2009/06/05 22:38:04 jasper Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.2.1
-PKGNAME =  ${DISTNAME}p0
+DISTNAME = chocolate-doom-1.4.0
+PKGNAME =  ${DISTNAME}
 CATEGORIES =   games x11
 
 HOMEPAGE = http://www.chocolate-doom.org/
@@ -17,9 +17,9 @@ PERMIT_DISTFILES_FTP =Yes
 
 WANTLIB =  SDL c m pthread
 
-LIB_DEPENDS =  SDL_mixer.=3::devel/sdl-mixer \
+LIB_DEPENDS =  SDL_mixer.=4::devel/sdl-mixer \
SDL_net.=1::devel/sdl-net \
-   samplerate.=1::audio/libsamplerate
+   samplerate.=2::audio/libsamplerate
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chocolate-doom/}
 
Index: distinfo
===
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo5 Jun 2009 21:58:43 -   1.1.1.1
+++ distinfo5 Aug 2010 01:14:40 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.2.1.tar.gz) = 3wTDgANO/3iea57hwBZJdw==
-RMD160 (chocolate-doom-1.2.1.tar.gz) = JACmlVqKRSlHJXB5Mo5ESAHD0vc=
-SHA1 (chocolate-doom-1.2.1.tar.gz) = OygCwPiosCvJxCXt4KE6qf0TFNc=
-SHA256 (chocolate-doom-1.2.1.tar.gz) = 
/61QqEf3B+pch4RNvZwTOebS0YK7XPbm9infQg9mKcE=
-SIZE (chocolate-doom-1.2.1.tar.gz) = 664600
+MD5 (chocolate-doom-1.4.0.tar.gz) = xrC7z3/aDmnYaFighgCjug==
+RMD160 (chocolate-doom-1.4.0.tar.gz) = vlVgh5rxgz3B+qHTUX/dYgAE4do=
+SHA1 (chocolate-doom-1.4.0.tar.gz) = 8gVn5VsfRVNBXEpK3UXz5dB8Gqw=
+SHA256 (chocolate-doom-1.4.0.tar.gz) = 
wOb5H991rDYT3vrhCw7vZqkpz3A1eTBqObgGZEZhqNM=
+SIZE (chocolate-doom-1.4.0.tar.gz) = 966186
Index: patches/patch-setup_Makefile_in
===
RCS file: /cvs/ports/games/chocolate-doom/patches/patch-setup_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_Makefile_in
--- patches/patch-setup_Makefile_in 5 Jun 2009 22:27:29 -   1.2
+++ patches/patch-setup_Makefile_in 5 Aug 2010 01:14:40 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-setup_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
 setup/Makefile.in.orig Wed Dec 10 21:29:26 2008
-+++ setup/Makefile.in  Wed Dec 10 21:28:32 2008
-@@ -170,7 +170,7 @@ sysconfdir = @sysconfdir@
+$OpenBSD$
+--- setup/Makefile.in.orig Wed Aug  4 10:25:08 2010
 setup/Makefile.in  Wed Aug  4 10:25:48 2010
+@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -gamesdir = $(prefix)/games
 +gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../textscreen -I../src -DINSTALL_DIR=\$(gamesdir)\
+ AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
  SOURCE_FILES = \
  compatibility.c   compatibility.h   \
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/games/chocolate-doom/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   5 Jun 2009 22:27:29 -   1.2
+++ patches/patch-src_Makefile_in   5 Aug 2010 01:14:40 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
 src/Makefile.in.orig   Wed Dec 10 21:27:14 2008
-+++ src/Makefile.inWed Dec 10 21:27:39 2008
-@@ -239,7 +239,7 @@ sysconfdir = @sysconfdir@
+$OpenBSD$
+--- src/Makefile.in.orig   Wed Aug  4 10:26:17 2010
 src/Makefile.inWed Aug  4 10:26:31 2010
+@@ 

Re: [UPDATE] games/chocolate-doom

[Edd Barrett]

On Fri, Mar 26, 2010 at 04:04:56PM -0700, Ryan Freeman wrote:
 tested this on two differnet i386 machines and plays great, no issues
 to be seen with this update. thanks to Daniel Dickman!
 
 -ryan

I hate to be a buzzkill, but this doesnt appear to work on sparc64 :(

edd-sparc% chocolate-doom -iwad /usr/local/share/games/doom/doom1.wad
WARNING: No known way to set processor affinity on this platform.
 You may experience crashes due to SDL_mixer.
 Chocolate Doom 1.3.0
Z_Init: Init zone memory allocation daemon. 
zone memory: 0x519e, 100 allocated for zone
DEH_Init: Init Dehacked support.
V_Init: allocate screens.
M_LoadDefaults: Load system defaults.
saving config in /home/edd/.chocolate-doom/default.cfg
W_Init: Init WADfiles.
 adding /usr/local/share/games/doom/doom1.wad
===
DOOM Shareware
===
 Chocolate Doom is free software, covered by the GNU General Public
 License.  There is NO warranty; not even for MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. You are welcome to change and distribute
 copies under certain conditions. See the source for more information.
===
M_Init: Init miscellaneous info.
zsh: bus error (core dumped)  chocolate-doom -iwad
/usr/local/share/games/doom/doom1.wad


I also tried using chocolate-setup to disable sound, hoping that the crash would
go away, but with no joy.

I will build adebug version and run gdb on there for you shortly.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: [UPDATE] games/chocolate-doom

[Ryan Freeman]

On Sun, Mar 28, 2010 at 01:32:56PM +0100, Edd Barrett wrote:
 On Fri, Mar 26, 2010 at 04:04:56PM -0700, Ryan Freeman wrote:
  tested this on two differnet i386 machines and plays great, no issues
  to be seen with this update. thanks to Daniel Dickman!
  
  -ryan
 
 I hate to be a buzzkill, but this doesnt appear to work on sparc64 :(

hmm well no its still good to find bugs. if chocolate-doom 1.2.1 was still
working fine, i'll get in contact with simon (the author, i've been friends
with and known for years now) and see if we can work together to squash it.

he has been doing an excellent job keeping things as portable as possible
so he'd appreciate knowing we could fix sparc64. if you're willing perhaps
we can hook him up with access to a sparc64 machine to debug, else if you
come up with a patch i'll definitely forward it on to him.

finally he informed me he has been working on his OPL branch for just over
a year which will be included in the next release, this includes a driver
that will work with OpenBSD's OPL driver for those of us with old soundcards.
I'll have to rummage through my parts and see if i can put something together
to test that, that'd be the second OpenBSD specific thing hes managed to do
for chocolate-doom, which i think is nifty considering hes a heavy linux
user. very nice to see a linux dev that considers other platforms. the 
OpenBSD PC speaker driver is nifty for nostalgic purposes too :D

-ryan

 
 edd-sparc% chocolate-doom -iwad /usr/local/share/games/doom/doom1.wad
 WARNING: No known way to set processor affinity on this platform.
  You may experience crashes due to SDL_mixer.
  Chocolate Doom 1.3.0
 Z_Init: Init zone memory allocation daemon. 
 zone memory: 0x519e, 100 allocated for zone
 DEH_Init: Init Dehacked support.
 V_Init: allocate screens.
 M_LoadDefaults: Load system defaults.
 saving config in /home/edd/.chocolate-doom/default.cfg
 W_Init: Init WADfiles.
  adding /usr/local/share/games/doom/doom1.wad
 ===
 DOOM Shareware
 ===
  Chocolate Doom is free software, covered by the GNU General Public
  License.  There is NO warranty; not even for MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE. You are welcome to change and distribute
  copies under certain conditions. See the source for more information.
 ===
 M_Init: Init miscellaneous info.
 zsh: bus error (core dumped)  chocolate-doom -iwad
 /usr/local/share/games/doom/doom1.wad
 
 
 I also tried using chocolate-setup to disable sound, hoping that the crash 
 would
 go away, but with no joy.
 
 I will build adebug version and run gdb on there for you shortly.
 
 -- 
 Best Regards
 Edd Barrett
 
 http://www.theunixzoo.co.uk
 

Re: [UPDATE] games/chocolate-doom

[Edd Barrett]

On Sun, Mar 28, 2010 at 11:42:55AM -0700, Ryan Freeman wrote:
  I hate to be a buzzkill, but this doesnt appear to work on sparc64 :(
 
 hmm well no its still good to find bugs. if chocolate-doom 1.2.1 was still
 working fine, i'll get in contact with simon (the author, i've been friends
 with and known for years now) and see if we can work together to squash it.

OK, I will try 1.2.1 when I get some time to see if the bug existed there.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: [UPDATE] games/chocolate-doom

[Ryan Freeman]

tested this on two differnet i386 machines and plays great, no issues
to be seen with this update. thanks to Daniel Dickman!

-ryan

On Sat, Mar 20, 2010 at 10:49:07PM -0400, Daniel Dickman wrote:
 Here's an update of chocolate to 1.3.0 if you don't already have it. I've 
 been playing it on amd64 for a few weeks without a problem...
 

Index: Makefile
===
RCS file: /usr/cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile5 Jun 2009 22:38:04 -   1.3
+++ Makefile12 Feb 2010 22:59:30 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.3 2009/06/05 22:38:04 jasper Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.2.1
+DISTNAME = chocolate-doom-1.3.0
 PKGNAME =  ${DISTNAME}p0
 CATEGORIES =   games x11
 
Index: distinfo
===
RCS file: /usr/cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo5 Jun 2009 21:58:43 -   1.1.1.1
+++ distinfo12 Feb 2010 22:59:48 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.2.1.tar.gz) = 3wTDgANO/3iea57hwBZJdw==
-RMD160 (chocolate-doom-1.2.1.tar.gz) = JACmlVqKRSlHJXB5Mo5ESAHD0vc=
-SHA1 (chocolate-doom-1.2.1.tar.gz) = OygCwPiosCvJxCXt4KE6qf0TFNc=
-SHA256 (chocolate-doom-1.2.1.tar.gz) = 
/61QqEf3B+pch4RNvZwTOebS0YK7XPbm9infQg9mKcE=
-SIZE (chocolate-doom-1.2.1.tar.gz) = 664600
+MD5 (chocolate-doom-1.3.0.tar.gz) = wbaAuI5SS4YdTj+8dpwuEA==
+RMD160 (chocolate-doom-1.3.0.tar.gz) = NtLaLOvWvV5CnKDek6ljUCT2r+Q=
+SHA1 (chocolate-doom-1.3.0.tar.gz) = XO+IVqBeRH9MlLaR4uLKOqHnQ3E=
+SHA256 (chocolate-doom-1.3.0.tar.gz) = 
rCotq297/ixUwZypvCUcLDC+pCjIkxXon8FBubtTAXM=
+SIZE (chocolate-doom-1.3.0.tar.gz) = 859985
Index: patches/patch-setup_Makefile_in
===
RCS file: /usr/cvs/ports/games/chocolate-doom/patches/patch-setup_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-setup_Makefile_in
--- patches/patch-setup_Makefile_in 5 Jun 2009 22:27:29 -   1.2
+++ patches/patch-setup_Makefile_in 12 Feb 2010 23:01:26 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-setup_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
 setup/Makefile.in.orig Wed Dec 10 21:29:26 2008
-+++ setup/Makefile.in  Wed Dec 10 21:28:32 2008
-@@ -170,7 +170,7 @@ sysconfdir = @sysconfdir@
+--- setup/Makefile.in.orig Wed Feb 10 15:24:41 2010
 setup/Makefile.in  Fri Feb 12 18:00:47 2010
+@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -gamesdir = $(prefix)/games
 +gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../textscreen -I../src -DINSTALL_DIR=\$(gamesdir)\
+ AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
  SOURCE_FILES = \
  compatibility.c   compatibility.h   \
Index: patches/patch-src_Makefile_in
===
RCS file: /usr/cvs/ports/games/chocolate-doom/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   5 Jun 2009 22:27:29 -   1.2
+++ patches/patch-src_Makefile_in   12 Feb 2010 23:01:21 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
 src/Makefile.in.orig   Wed Dec 10 21:27:14 2008
-+++ src/Makefile.inWed Dec 10 21:27:39 2008
-@@ -239,7 +239,7 @@ sysconfdir = @sysconfdir@
+--- src/Makefile.in.orig   Wed Feb 10 15:24:41 2010
 src/Makefile.inFri Feb 12 17:59:51 2010
+@@ -245,7 +245,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@

Index: Makefile
===
RCS file: /usr/cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile5 Jun 2009 22:38:04 -   1.3
+++ Makefile12 Feb 2010 22:59:30 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.3 2009/06/05 22:38:04 jasper Exp $
 
 COMMENT =  portable version of iD Software's Doom
-DISTNAME = chocolate-doom-1.2.1
+DISTNAME = chocolate-doom-1.3.0
 PKGNAME =  ${DISTNAME}p0
 CATEGORIES =   games x11
 
Index: distinfo
===
RCS file: /usr/cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo5 Jun 2009 21:58:43 -   1.1.1.1
+++ distinfo12 Feb 2010 22:59:48 -
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.2.1.tar.gz) = 3wTDgANO/3iea57hwBZJdw==
-RMD160 (chocolate-doom-1.2.1.tar.gz) = JACmlVqKRSlHJXB5Mo5ESAHD0vc=
-SHA1 (chocolate-doom-1.2.1.tar.gz) = OygCwPiosCvJxCXt4KE6qf0TFNc=
-SHA256 (chocolate-doom-1.2.1.tar.gz) =