Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Dec 2013 23:46:19 GMT
From:      Jakub Lach <jakub_lach@mailplus.pl>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/184710: [maintainer-update] games/chocolate-doom 1.7.0 to 2.0.0
Message-ID:  <201312112346.rBBNkJNl038060@oldred.freebsd.org>
Resent-Message-ID: <201312112350.rBBNo0Tc031291@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184710
>Category:       ports
>Synopsis:       [maintainer-update] games/chocolate-doom 1.7.0 to 2.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 11 23:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Jakub Lach
>Release:        FreeBSD 9.2-STABLE #0 r259130 amd64
>Organization:
-
>Environment:
-
>Description:
On the 20th anniversary of Doom, Simon Howard (Fraggle) brings milestone chocolate-doom release cut from fresh v2 branch sporting numerous improvements i.a. Heretic, Hexen and Strife support.

* Please check this submission diligently, as I'm still unsure of staging :)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruPN /usr/ports/games/chocolate-doom.orig/Makefile /usr/ports/games/chocolate-doom/Makefile
--- /usr/ports/games/chocolate-doom.orig/Makefile	2013-12-11 22:00:01.000000000 +0100
+++ /usr/ports/games/chocolate-doom/Makefile	2013-12-12 00:35:10.000000000 +0100
@@ -1,12 +1,12 @@
 # $FreeBSD: games/chocolate-doom/Makefile 327730 2013-09-20 17:36:33Z bapt $
 
 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,12 @@
 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
-
-NO_STAGE=	yes
 .include "${.CURDIR}/../doom-data/Makefile.include"
 
 .include <bsd.port.options.mk>
 
 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 -ruPN /usr/ports/games/chocolate-doom.orig/distinfo /usr/ports/games/chocolate-doom/distinfo
--- /usr/ports/games/chocolate-doom.orig/distinfo	2013-12-11 14:42:06.000000000 +0100
+++ /usr/ports/games/chocolate-doom/distinfo	2013-12-11 14:45:13.000000000 +0100
@@ -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 -ruPN /usr/ports/games/chocolate-doom.orig/pkg-descr /usr/ports/games/chocolate-doom/pkg-descr
--- /usr/ports/games/chocolate-doom.orig/pkg-descr	2013-12-11 14:42:06.000000000 +0100
+++ /usr/ports/games/chocolate-doom/pkg-descr	2013-12-11 17:59:05.000000000 +0100
@@ -3,6 +3,7 @@
 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 -ruPN /usr/ports/games/chocolate-doom.orig/pkg-message /usr/ports/games/chocolate-doom/pkg-message
--- /usr/ports/games/chocolate-doom.orig/pkg-message	2013-12-11 14:42:06.000000000 +0100
+++ /usr/ports/games/chocolate-doom/pkg-message	2013-12-11 18:52:11.000000000 +0100
@@ -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 -ruPN /usr/ports/games/chocolate-doom.orig/pkg-plist /usr/ports/games/chocolate-doom/pkg-plist
--- /usr/ports/games/chocolate-doom.orig/pkg-plist	2013-12-11 14:42:06.000000000 +0100
+++ /usr/ports/games/chocolate-doom/pkg-plist	2013-12-12 00:29:47.000000000 +0100
@@ -1,10 +1,60 @@
-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
+%%PORTDOCS%%%%DOCSDIR%%/CMDLINE.doom
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.doom
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/NOT-BUGS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.OPL
+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
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry share/applications/screensavers


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312112346.rBBNkJNl038060>