Attachment #193975 for bug #225453

Lines 1-3 Link Here

(-)/usr/ports/games/chocolate-doom/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483106037	1	TIMESTAMP = 1514687305
2	SHA256 (chocolate-doom-2.3.0.tar.gz) = 3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c	2	SHA256 (chocolate-doom-3.0.0.tar.gz) = 73aea623930c7d18a7a778eea391e1ddfbe90ad1ac40a91b380afca4b0e1dab8
3	SIZE (chocolate-doom-2.3.0.tar.gz) = 2190744	3	SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591




--- src/d_iwad.c.orig	2017-12-30 16:20:28.000000000 -0500
+++ src/d_iwad.c	2018-01-25 09:43:00.567417000 -0500
@@ -658,7 +658,7 @@
     // The "standard" location for IWADs on Unix that is supported by most
     // source ports is /usr/share/games/doom - we support this through the
     // XDG_DATA_DIRS mechanism, through which it can be overridden.
-    AddIWADPath(env, "/games/doom");
+    AddIWADPath(env, "/doom");
 }
 
     // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG
     // Edition into this directory, under which includes the Doom

Lines 1-7 Link Here

(-)/usr/ports/games/chocolate-doom/Makefile (-3 / +3 lines)
1	# $FreeBSD: head/games/chocolate-doom/Makefile 462532 2018-02-21 16:24:53Z antoine $	1	# $FreeBSD: head/games/chocolate-doom/Makefile 462532 2018-02-21 16:24:53Z antoine $
2		2
3	PORTNAME= chocolate-doom	3	PORTNAME= chocolate-doom
4	PORTVERSION= 2.3.0	4	PORTVERSION= 3.0.0
5	CATEGORIES= games	5	CATEGORIES= games
6	MASTER_SITES= http://www.chocolate-doom.org/downloads/${PORTVERSION}/	6	MASTER_SITES= http://www.chocolate-doom.org/downloads/${PORTVERSION}/
7		7
Lines 12-19 Link Here
12		12
13	LIB_DEPENDS= libpng.so:graphics/png	13	LIB_DEPENDS= libpng.so:graphics/png
14		14
15	USES= gmake python:build	15	USES= gmake python:build pkgconfig
16	USE_SDL= mixer net sdl	16	USE_SDL= mixer2 net2 sdl2
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	BINARY_ALIAS= python=${PYTHON_CMD}	18	BINARY_ALIAS= python=${PYTHON_CMD}
19		19




******************************************************

The default location for a configuration files and
saves is no longer ~/.chocolate-doom, current one is
~/.local/share/chocolate-doom/.


You can recreate the sound of the vanilla game according 
to your preferences.

Chocolate Doom defaults to a emulation of OPL2 (Adlib/
Soundblaster) for MIDI music and should work without 
any further configuration. OPL3 is also available.

If you wish to enable Gravis Ultrasound emulation,
ensure that audio/guspat is installed, enter
chocolate-doom-setup, select "Configure Sound",
choose "GUS (emulated)", and enter the directory

/usr/local/share/guspat/inst/GUS

into the "Path to patch files:" field.

If you wish to enable native MIDI, ensure that a
suitable set of patches is installed such as
audio/eawpats, audio/eawplus, audio/freepats, or
audio/guspat, enter chocolate-doom-setup, select
"Configure Sound", choose "Native MIDI", and enter
the path to the Timidity configuration file.

Examples:

/usr/local/share/timidity/timidity.cfg-eawpats

/usr/local/share/timidity/timidity.cfg-eawplus

/usr/local/share/freepats/freepats.cfg

/usr/local/share/timidity/timidity.cfg-guspat

If you choose either Gravis Ultrasound emulation or
native MIDI and provide no path, there will be no
music. 

******************************************************

Return to bug 225453

Lines 1-11 Link Here

(-)/usr/ports/games/chocolate-doom/files/patch-src_d__iwad.c (-5 / +5 lines)
1	--- src/d_iwad.c.orig 2015-09-26 11:05:54 UTC	1	--- src/d_iwad.c.orig 2017-12-30 16:20:28.000000000 -0500
2	+++ src/d_iwad.c	2	+++ src/d_iwad.c 2018-01-25 09:43:00.567417000 -0500
3	@@ -632,7 +632,7 @@ static void AddXdgDirs(void)	3	@@ -658,7 +658,7 @@
4	// The "standard" location for IWADs on Unix that is supported by most	4	// The "standard" location for IWADs on Unix that is supported by most
5	// source ports is /usr/share/games/doom - we support this through the	5	// source ports is /usr/share/games/doom - we support this through the
6	// XDG_DATA_DIRS mechanism, through which it can be overridden.	6	// XDG_DATA_DIRS mechanism, through which it can be overridden.
7	- AddIWADPath(env, "/games/doom");	7	- AddIWADPath(env, "/games/doom");
8	+ AddIWADPath(env, "/doom");	8	+ AddIWADPath(env, "/doom");
9	}
10		9
11	//	10	// The convention set by RBDOOM-3-BFG is to install Doom 3: BFG
		11	// Edition into this directory, under which includes the Doom

Lines 1-10 Link Here

(-)/usr/ports/games/chocolate-doom/pkg-message (-5 / +40 lines)
1	******************************************************	1	******************************************************
2		2
3	To switch on OPL (Adlib/SB) or GUS emulation you need	3	The default location for a configuration files and
4	to run chocolate-doom-setup, default Native MIDI is	4	saves is no longer ~/.chocolate-doom, current one is
5	very similar to Roland SC-55.	5	~/.local/share/chocolate-doom/.
6		6
7	GUS emulation needs setting "gus_patch_path" in *.cfg	7
8	to GUS patch set (dgguspat.zip).	8	You can recreate the sound of the vanilla game according
		9	to your preferences.
		10
		11	Chocolate Doom defaults to a emulation of OPL2 (Adlib/
		12	Soundblaster) for MIDI music and should work without
		13	any further configuration. OPL3 is also available.
		14
		15	If you wish to enable Gravis Ultrasound emulation,
		16	ensure that audio/guspat is installed, enter
		17	chocolate-doom-setup, select "Configure Sound",
		18	choose "GUS (emulated)", and enter the directory
		19
		20	/usr/local/share/guspat/inst/GUS
		21
		22	into the "Path to patch files:" field.
		23
		24	If you wish to enable native MIDI, ensure that a
		25	suitable set of patches is installed such as
		26	audio/eawpats, audio/eawplus, audio/freepats, or
		27	audio/guspat, enter chocolate-doom-setup, select
		28	"Configure Sound", choose "Native MIDI", and enter
		29	the path to the Timidity configuration file.
		30
		31	Examples:
		32
		33	/usr/local/share/timidity/timidity.cfg-eawpats
		34
		35	/usr/local/share/timidity/timidity.cfg-eawplus
		36
		37	/usr/local/share/freepats/freepats.cfg
		38
		39	/usr/local/share/timidity/timidity.cfg-guspat
		40
		41	If you choose either Gravis Ultrasound emulation or
		42	native MIDI and provide no path, there will be no
		43	music.
9		44
10	******************************************************	45	******************************************************