- Update to version 2.0.0

- Convert to staging

PR:		ports/184710
Submitted by:	maintainer

5 files changed, 67 insertions, 27 deletions

diff --git a/games/chocolate-doom/Makefile b/games/chocolate-doom/Makefile
index 8d2983ccbd84..aaea1c70a461 100644
--- a/games/chocolate-doom/Makefile
+++ b/games/chocolate-doom/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	chocolate-doom
-PORTVERSION=	1.7.0
+PORTVERSION=	2.0.0
 CATEGORIES=	games
-MASTER_SITES=	SF
+MASTER_SITES=	http://www.chocolate-doom.org/downloads/2.0.0/
 
 MAINTAINER=	jakub_lach@mailplus.pl
-COMMENT=	Doom port that aims to be compatible with the original exe
+COMMENT=	Doom/Heretic/Hexen/Strife engine port compatible with the original exes
 
 LICENSE=	GPLv2
 
@@ -15,21 +15,14 @@ USE_SDL=	mixer net sdl
 USE_PYTHON=	2.5+
 GNU_CONFIGURE=	yes
 
-MAN5=		chocolate-doom.cfg.5 default.cfg.5
-MAN6=		chocolate-doom.6 chocolate-server.6 chocolate-setup.6
-PORTDOCS=	CMDLINE ChangeLog HACKING INSTALL NEWS NOT-BUGS README README.OPL
+PORTDOCS=	CMDLINE.doom ChangeLog INSTALL.doom NEWS NOT-BUGS README README.OPL
 
-NO_STAGE=	yes
-.include "${.CURDIR}/../doom-data/Makefile.include"
+OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../doom-data/Makefile.include"
 
 post-patch-script:
 	${REINPLACE_CMD} -e 's|gamesdir = $$(prefix)/games|gamesdir = $$(prefix)/bin|' \
-		${WRKSRC}/src/Makefile.in ${WRKSRC}/setup/Makefile.in
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/HACKING ${DOCSDIR}
-	@${CAT} ${PKGMESSAGE}
+		${WRKSRC}/src/Makefile.in ${WRKSRC}/src/setup/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/chocolate-doom/distinfo b/games/chocolate-doom/distinfo
index aeb2b2d07dd1..a291746819bb 100644
--- a/games/chocolate-doom/distinfo
+++ b/games/chocolate-doom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-1.7.0.tar.gz) = c1cffb602e3cc3a82941b4675b9dc816a6e419076faf8f54db46df397f86bfc0
-SIZE (chocolate-doom-1.7.0.tar.gz) = 1091798
+SHA256 (chocolate-doom-2.0.0.tar.gz) = 85c58b77dad933013253b453ef01907492b4719acd56cf8cb6c76f4a361ab60c
+SIZE (chocolate-doom-2.0.0.tar.gz) = 2092519
diff --git a/games/chocolate-doom/pkg-descr b/games/chocolate-doom/pkg-descr
index 9af3ee9290a9..67a1f6d95ecd 100644
--- a/games/chocolate-doom/pkg-descr
+++ b/games/chocolate-doom/pkg-descr
@@ -3,6 +3,7 @@ modern operating systems that aims to be as compatible with the original DOS
 executable as possible. This includes emulating all the different versions,
 playing demos perfectly accurately, playing "vanilla-only" PWADS, and netcode
 that works on newer operating systems while still behaving the same as
-"vanilla" Doom.
+"vanilla" Doom. Additionally, Heretic, Hexen as well as Strife are also 
+supported.
 
 WWW: http://chocolate-doom.org
diff --git a/games/chocolate-doom/pkg-message b/games/chocolate-doom/pkg-message
index 847af4226051..814eb2f80233 100644
--- a/games/chocolate-doom/pkg-message
+++ b/games/chocolate-doom/pkg-message
@@ -1,6 +1,10 @@
-**************************************************************
+******************************************************
 
-To enable OPL MIDI emulation you need to run chocolate-setup,
-default Native MIDI is very similar to Roland SC-55.
+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. 
 
-**************************************************************
+GUS emulation needs setting "gus_patch_path" in *.cfg 
+to GUS patch set (dgguspat.zip).
+
+******************************************************
diff --git a/games/chocolate-doom/pkg-plist b/games/chocolate-doom/pkg-plist
index ff9dc8a985e2..5fde3fe33d4f 100644
--- a/games/chocolate-doom/pkg-plist
+++ b/games/chocolate-doom/pkg-plist
@@ -1,10 +1,52 @@
-share/icons/chocolate-doom.png
-share/icons/chocolate-setup.png
-share/applications/chocolate-doom.desktop
-share/applications/screensavers/chocolate-doom-screensaver.desktop
-share/applications/chocolate-setup.desktop
 bin/chocolate-doom
+bin/chocolate-doom-setup
+bin/chocolate-heretic
+bin/chocolate-heretic-setup
+bin/chocolate-hexen
+bin/chocolate-hexen-setup
 bin/chocolate-server
-bin/chocolate-setup
+bin/chocolate-strife
+bin/chocolate-strife-setup
+man/man5/chocolate-doom.cfg.5.gz
+man/man5/chocolate-heretic.cfg.5.gz
+man/man5/chocolate-hexen.cfg.5.gz
+man/man5/chocolate-strife.cfg.5.gz
+man/man5/default.cfg.5.gz
+man/man5/heretic.cfg.5.gz
+man/man5/hexen.cfg.5.gz
+man/man5/strife.cfg.5.gz
+man/man6/chocolate-doom.6.gz
+man/man6/chocolate-heretic.6.gz
+man/man6/chocolate-hexen.6.gz
+man/man6/chocolate-server.6.gz
+man/man6/chocolate-setup.6.gz
+man/man6/chocolate-strife.6.gz
+share/applications/chocolate-doom.desktop
+share/applications/chocolate-setup.desktop
+share/applications/screensavers/chocolate-doom-screensaver.desktop
+share/doc/chocolate-heretic/CMDLINE.heretic
+share/doc/chocolate-heretic/ChangeLog
+share/doc/chocolate-heretic/INSTALL.heretic
+share/doc/chocolate-heretic/NEWS
+share/doc/chocolate-heretic/README
+share/doc/chocolate-heretic/README.OPL
+share/doc/chocolate-hexen/CMDLINE.hexen
+share/doc/chocolate-hexen/ChangeLog
+share/doc/chocolate-hexen/INSTALL.hexen
+share/doc/chocolate-hexen/NEWS
+share/doc/chocolate-hexen/README
+share/doc/chocolate-hexen/README.OPL
+share/doc/chocolate-strife/CMDLINE.strife
+share/doc/chocolate-strife/ChangeLog
+share/doc/chocolate-strife/INSTALL.strife
+share/doc/chocolate-strife/NEWS
+share/doc/chocolate-strife/README
+share/doc/chocolate-strife/README.OPL
+share/doc/chocolate-strife/README.Strife
+share/icons/chocolate-doom.png
+share/icons/chocolate-setup.png
 @dirrmtry share/icons
+@dirrmtry share/doc/chocolate-strife
+@dirrmtry share/doc/chocolate-hexen
+@dirrmtry share/doc/chocolate-heretic
 @dirrmtry share/applications/screensavers