diff -ruPN /usr/ports/games/chocolate-doom.orig/distinfo /usr/ports/games/chocolate-doom/distinfo
--- /usr/ports/games/chocolate-doom.orig/distinfo	2018-06-03 23:01:22.944840000 +0200
+++ /usr/ports/games/chocolate-doom/distinfo	2018-06-03 23:04:00.231103000 +0200
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483106037
-SHA256 (chocolate-doom-2.3.0.tar.gz) = 3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c
-SIZE (chocolate-doom-2.3.0.tar.gz) = 2190744
+TIMESTAMP = 1514687305
+SHA256 (chocolate-doom-3.0.0.tar.gz) = 73aea623930c7d18a7a778eea391e1ddfbe90ad1ac40a91b380afca4b0e1dab8
+SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
diff -ruPN /usr/ports/games/chocolate-doom.orig/files/patch-src_d__iwad.c /usr/ports/games/chocolate-doom/files/patch-src_d__iwad.c
--- /usr/ports/games/chocolate-doom.orig/files/patch-src_d__iwad.c	2018-06-03 23:01:22.947810000 +0200
+++ /usr/ports/games/chocolate-doom/files/patch-src_d__iwad.c	2018-06-03 23:04:17.760688000 +0200
@@ -1,11 +1,11 @@
---- src/d_iwad.c.orig	2015-09-26 11:05:54 UTC
-+++ src/d_iwad.c
-@@ -632,7 +632,7 @@ static void AddXdgDirs(void)
+--- 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
diff -ruPN /usr/ports/games/chocolate-doom.orig/Makefile /usr/ports/games/chocolate-doom/Makefile
--- /usr/ports/games/chocolate-doom.orig/Makefile	2018-06-03 23:01:22.943450000 +0200
+++ /usr/ports/games/chocolate-doom/Makefile	2018-06-03 23:46:15.266160000 +0200
@@ -1,7 +1,7 @@
 # $FreeBSD: head/games/chocolate-doom/Makefile 462532 2018-02-21 16:24:53Z antoine $
 
 PORTNAME=	chocolate-doom
-PORTVERSION=	2.3.0
+PORTVERSION=	3.0.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.chocolate-doom.org/downloads/${PORTVERSION}/
 
@@ -12,8 +12,8 @@
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		gmake python:build
-USE_SDL=	mixer net sdl
+USES=		gmake python:build pkgconfig
+USE_SDL=	mixer2 net2 sdl2
 GNU_CONFIGURE=	yes
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
diff -ruPN /usr/ports/games/chocolate-doom.orig/pkg-message /usr/ports/games/chocolate-doom/pkg-message
--- /usr/ports/games/chocolate-doom.orig/pkg-message	2018-06-03 23:01:22.950655000 +0200
+++ /usr/ports/games/chocolate-doom/pkg-message	2018-06-04 00:15:48.314458000 +0200
@@ -1,10 +1,45 @@
 ******************************************************
 
-To switch on OPL (Adlib/SB) or GUS emulation you need
-to run chocolate-doom-setup, default Native MIDI is
-very similar to Roland SC-55.
+The default location for a configuration files and
+saves is no longer ~/.chocolate-doom, current one is
+~/.local/share/chocolate-doom/.
 
-GUS emulation needs setting "gus_patch_path" in *.cfg
-to GUS patch set (dgguspat.zip).
+
+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. 
 
 ******************************************************