Attachment #253724 for bug #281630

Lines 1-8 PORTNAME= chocolate-doom Link Here

(-)/usr/ports/games/chocolate-doom/Makefile (-15 / +13 lines)
1	PORTNAME= chocolate-doom	1	PORTNAME= chocolate-doom
2	PORTVERSION= 3.0.1	2	DISTVERSION= 3.1.0
3	PORTREVISION= 2
4	CATEGORIES= games	3	CATEGORIES= games
5	MASTER_SITES= http://www.chocolate-doom.org/downloads/${PORTVERSION}/
6		4
7	MAINTAINER= jakub_lach@mailplus.pl	5	MAINTAINER= jakub_lach@mailplus.pl
8	COMMENT= Doom/Heretic/Hexen/Strife engine port compatible with the originals	6	COMMENT= Doom/Heretic/Hexen/Strife engine port compatible with the originals
Lines 10-36 LICENSE= GPLv2 Link Here
10		8
11	LICENSE= GPLv2	9	LICENSE= GPLv2
12		10
13	LIB_DEPENDS= libpng.so:graphics/png	11	LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth \
		12	libpng.so:graphics/png \
		13	libsamplerate.so:audio/libsamplerate
14		14
15	USES= gmake pkgconfig python:build sdl	15	USES= autoreconf gmake pkgconfig python:build sdl
		16	USE_GITHUB= yes
		17	GH_TAGNAME= ${PORTNAME}-${DISTVERSION}
		18	USE_RC_SUBR= chocolate-server
16	USE_SDL= mixer2 net2 sdl2	19	USE_SDL= mixer2 net2 sdl2
		20
17	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
18	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
19	BINARY_ALIAS= python=${PYTHON_CMD}
20		22
21	PORTDOCS= CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md PHILOSOPHY.md \	23	BINARY_ALIAS= python3=${PYTHON_CMD}
22	README.md README.Music.md
23		24
		25	PORTDOCS= CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md \
		26	PHILOSOPHY.md README.md README.Music.md
		27
24	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOCS
25	USE_RC_SUBR= chocolate-server
26		29
27	.include "${.CURDIR}/../doom-data/Makefile.include"	30	.include "${.CURDIR}/../doom-data/Makefile.include"
28		31
29	post-patch:
30	${REINPLACE_CMD} -e 's\|gamesdir = $${exec_prefix}/games\|gamesdir = $${exec_prefix}/bin\|' \
31	${WRKSRC}/src/Makefile.in
32	${REINPLACE_CMD} -e 's\|gamesdir = $$(prefix)/games\|gamesdir = $$(prefix)/bin\|' \
33	${WRKSRC}/src/setup/Makefile.in
34	post-install:	32	post-install:
35	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chocolate-*	33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chocolate-*
36		34

Lines 1-3 Link Here

(-)/usr/ports/games/chocolate-doom/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1611306702	1	TIMESTAMP = 1726929127
2	SHA256 (chocolate-doom-3.0.1.tar.gz) = d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7	2	SHA256 (chocolate-doom-chocolate-doom-3.1.0-chocolate-doom-3.1.0_GH0.tar.gz) = f2c64843dcec312032b180c3b2f34b4cb26c4dcdaa7375a1601a3b1df11ef84d
3	SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985	3	SIZE (chocolate-doom-chocolate-doom-3.1.0-chocolate-doom-3.1.0_GH0.tar.gz) = 2256537

Lines 1-11 Link Here

(-)/usr/ports/games/chocolate-doom/files/patch-src_d__iwad.c (-11 lines)
1	--- src/d_iwad.c.orig 2017-12-30 16:20:28.000000000 -0500
2	+++ src/d_iwad.c 2018-01-25 09:43:00.567417000 -0500
3	@@ -658,7 +658,7 @@
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
6	// XDG_DATA_DIRS mechanism, through which it can be overridden.
7	- AddIWADPath(env, "/games/doom");
8	+ AddIWADPath(env, "/doom");
9
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-11 Link Here

(-)/usr/ports/games/chocolate-doom/files/patch-src_hexen_mn__menu.c (-11 lines)
1	--- src/hexen/mn_menu.c.orig 2020-08-28 17:00:20 UTC
2	+++ src/hexen/mn_menu.c
3	@@ -131,7 +131,7 @@ boolean MenuActive;
4	int InfoType;
5	int messageson = true;
6	boolean mn_SuicideConsole;
7	-boolean demoextend; // from h2def.h
8	+extern boolean demoextend; // from h2def.h
9
10	// PRIVATE DATA DEFINITIONS ------------------------------------------------
11




bin/chocolate-server
bin/chocolate-strife
bin/chocolate-strife-setup
share/applications/org.chocolate_doom.Doom.desktop
share/applications/org.chocolate_doom.Heretic.desktop
share/applications/org.chocolate_doom.Hexen.desktop
share/applications/org.chocolate_doom.Setup.desktop
share/applications/org.chocolate_doom.Strife.desktop
share/applications/screensavers/org.chocolate_doom.Doom_Screensaver.desktop
share/man/man5/hexen.cfg.5.gz
share/man/man5/strife.cfg.5.gz
share/man/man6/chocolate-doom-setup.6.gz
share/man/man6/chocolate-doom.6.gz
share/man/man6/chocolate-heretic-setup.6.gz
share/man/man6/chocolate-heretic.6.gz
share/man/man6/chocolate-hexen-setup.6.gz
share/man/man6/chocolate-hexen.6.gz
share/man/man6/chocolate-server.6.gz
share/man/man6/chocolate-setup.6.gz
share/man/man6/chocolate-strife-setup.6.gz
share/man/man6/chocolate-strife.6.gz
share/appdata/chocolate-doom.appdata.xml
share/appdata/chocolate-heretic.appdata.xml
share/appdata/chocolate-hexen.appdata.xml
share/appdata/chocolate-strife.appdata.xml
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/chocolate-doom-screensaver.desktop
share/bash-completion/completions/chocolate-doom
share/bash-completion/completions/chocolate-heretic
share/bash-completion/completions/chocolate-hexen
share/bash-completion/completions/chocolate-strife
%%PORTDOCS%%%%DOCSDIR%%/COPYING.md
share/doc/chocolate-heretic/CMDLINE.heretic
share/doc/chocolate-heretic/COPYING.md
share/doc/chocolate-heretic/ChangeLog
share/doc/chocolate-heretic/INSTALL.heretic
share/doc/chocolate-heretic/NEWS.md

share/doc/chocolate-heretic/README.Music.md
share/doc/chocolate-heretic/README.md
share/doc/chocolate-hexen/CMDLINE.hexen
share/doc/chocolate-hexen/COPYING.md
share/doc/chocolate-hexen/ChangeLog
share/doc/chocolate-hexen/INSTALL.hexen
share/doc/chocolate-hexen/NEWS.md

share/doc/chocolate-hexen/README.Music.md
share/doc/chocolate-hexen/README.md
share/doc/chocolate-strife/CMDLINE.strife
share/doc/chocolate-strife/COPYING.md
share/doc/chocolate-strife/ChangeLog
share/doc/chocolate-strife/INSTALL.strife
share/doc/chocolate-strife/NEWS.md

share/doc/chocolate-strife/README.Music.md
share/doc/chocolate-strife/README.Strife.md
share/doc/chocolate-strife/README.md
share/icons/hicolor/128x128/apps/chocolate-doom.png
share/icons/hicolor/128x128/apps/chocolate-heretic.png
share/icons/hicolor/128x128/apps/chocolate-hexen.png
share/icons/hicolor/128x128/apps/chocolate-setup.png
share/icons/hicolor/128x128/apps/chocolate-strife.png
share/man/man5/chocolate-doom.cfg.5.gz
share/man/man5/chocolate-heretic.cfg.5.gz
share/man/man5/chocolate-hexen.cfg.5.gz
share/man/man5/chocolate-strife.cfg.5.gz
share/man/man5/default.cfg.5.gz
share/man/man5/heretic.cfg.5.gz
share/man/man5/hexen.cfg.5.gz
share/man/man5/strife.cfg.5.gz
share/man/man6/chocolate-doom-setup.6.gz
share/man/man6/chocolate-doom.6.gz
share/man/man6/chocolate-heretic-setup.6.gz
share/man/man6/chocolate-heretic.6.gz
share/man/man6/chocolate-hexen-setup.6.gz
share/man/man6/chocolate-hexen.6.gz
share/man/man6/chocolate-server.6.gz
share/man/man6/chocolate-strife-setup.6.gz
share/man/man6/chocolate-strife.6.gz
share/metainfo/org.chocolate_doom.Doom.metainfo.xml
share/metainfo/org.chocolate_doom.Heretic.metainfo.xml
share/metainfo/org.chocolate_doom.Hexen.metainfo.xml
share/metainfo/org.chocolate_doom.Strife.metainfo.xml

Return to bug 281630

Lines 7-45 bin/chocolate-strife-setup Link Here

(-)/usr/ports/games/chocolate-doom/pkg-plist (-30 / +36 lines)
7	bin/chocolate-server	7	bin/chocolate-server
8	bin/chocolate-strife	8	bin/chocolate-strife
9	bin/chocolate-strife-setup	9	bin/chocolate-strife-setup
10	share/man/man5/chocolate-doom.cfg.5.gz	10	share/applications/org.chocolate_doom.Doom.desktop
11	share/man/man5/chocolate-heretic.cfg.5.gz	11	share/applications/org.chocolate_doom.Heretic.desktop
12	share/man/man5/chocolate-hexen.cfg.5.gz	12	share/applications/org.chocolate_doom.Hexen.desktop
13	share/man/man5/chocolate-strife.cfg.5.gz	13	share/applications/org.chocolate_doom.Setup.desktop
14	share/man/man5/default.cfg.5.gz	14	share/applications/org.chocolate_doom.Strife.desktop
15	share/man/man5/heretic.cfg.5.gz	15	share/applications/screensavers/org.chocolate_doom.Doom_Screensaver.desktop
16	share/man/man5/hexen.cfg.5.gz
17	share/man/man5/strife.cfg.5.gz
18	share/man/man6/chocolate-doom-setup.6.gz
19	share/man/man6/chocolate-doom.6.gz
20	share/man/man6/chocolate-heretic-setup.6.gz
21	share/man/man6/chocolate-heretic.6.gz
22	share/man/man6/chocolate-hexen-setup.6.gz
23	share/man/man6/chocolate-hexen.6.gz
24	share/man/man6/chocolate-server.6.gz
25	share/man/man6/chocolate-setup.6.gz
26	share/man/man6/chocolate-strife-setup.6.gz
27	share/man/man6/chocolate-strife.6.gz
28	share/appdata/chocolate-doom.appdata.xml
29	share/appdata/chocolate-heretic.appdata.xml
30	share/appdata/chocolate-hexen.appdata.xml
31	share/appdata/chocolate-strife.appdata.xml
32	share/applications/chocolate-doom.desktop
33	share/applications/chocolate-heretic.desktop
34	share/applications/chocolate-hexen.desktop
35	share/applications/chocolate-setup.desktop
36	share/applications/chocolate-strife.desktop
37	share/applications/screensavers/chocolate-doom-screensaver.desktop
38	share/bash-completion/completions/chocolate-doom	16	share/bash-completion/completions/chocolate-doom
39	share/bash-completion/completions/chocolate-heretic	17	share/bash-completion/completions/chocolate-heretic
40	share/bash-completion/completions/chocolate-hexen	18	share/bash-completion/completions/chocolate-hexen
41	share/bash-completion/completions/chocolate-strife	19	share/bash-completion/completions/chocolate-strife
		20	%%PORTDOCS%%%%DOCSDIR%%/COPYING.md
42	share/doc/chocolate-heretic/CMDLINE.heretic	21	share/doc/chocolate-heretic/CMDLINE.heretic
		22	share/doc/chocolate-heretic/COPYING.md
43	share/doc/chocolate-heretic/ChangeLog	23	share/doc/chocolate-heretic/ChangeLog
44	share/doc/chocolate-heretic/INSTALL.heretic	24	share/doc/chocolate-heretic/INSTALL.heretic
45	share/doc/chocolate-heretic/NEWS.md	25	share/doc/chocolate-heretic/NEWS.md
Lines 47-52 share/doc/chocolate-hexen/CMDLINE.hexen Link Here
47	share/doc/chocolate-heretic/README.Music.md	27	share/doc/chocolate-heretic/README.Music.md
48	share/doc/chocolate-heretic/README.md	28	share/doc/chocolate-heretic/README.md
49	share/doc/chocolate-hexen/CMDLINE.hexen	29	share/doc/chocolate-hexen/CMDLINE.hexen
		30	share/doc/chocolate-hexen/COPYING.md
50	share/doc/chocolate-hexen/ChangeLog	31	share/doc/chocolate-hexen/ChangeLog
51	share/doc/chocolate-hexen/INSTALL.hexen	32	share/doc/chocolate-hexen/INSTALL.hexen
52	share/doc/chocolate-hexen/NEWS.md	33	share/doc/chocolate-hexen/NEWS.md
Lines 54-59 share/doc/chocolate-strife/CMDLINE.strife Link Here
54	share/doc/chocolate-hexen/README.Music.md	35	share/doc/chocolate-hexen/README.Music.md
55	share/doc/chocolate-hexen/README.md	36	share/doc/chocolate-hexen/README.md
56	share/doc/chocolate-strife/CMDLINE.strife	37	share/doc/chocolate-strife/CMDLINE.strife
		38	share/doc/chocolate-strife/COPYING.md
57	share/doc/chocolate-strife/ChangeLog	39	share/doc/chocolate-strife/ChangeLog
58	share/doc/chocolate-strife/INSTALL.strife	40	share/doc/chocolate-strife/INSTALL.strife
59	share/doc/chocolate-strife/NEWS.md	41	share/doc/chocolate-strife/NEWS.md
Lines 61-65 share/doc/chocolate-strife/README.md Link Here
61	share/doc/chocolate-strife/README.Music.md	43	share/doc/chocolate-strife/README.Music.md
62	share/doc/chocolate-strife/README.Strife.md	44	share/doc/chocolate-strife/README.Strife.md
63	share/doc/chocolate-strife/README.md	45	share/doc/chocolate-strife/README.md
64	share/icons/chocolate-doom.png	46	share/icons/hicolor/128x128/apps/chocolate-doom.png
65	share/icons/chocolate-setup.png	47	share/icons/hicolor/128x128/apps/chocolate-heretic.png
		48	share/icons/hicolor/128x128/apps/chocolate-hexen.png
		49	share/icons/hicolor/128x128/apps/chocolate-setup.png
		50	share/icons/hicolor/128x128/apps/chocolate-strife.png
		51	share/man/man5/chocolate-doom.cfg.5.gz
		52	share/man/man5/chocolate-heretic.cfg.5.gz
		53	share/man/man5/chocolate-hexen.cfg.5.gz
		54	share/man/man5/chocolate-strife.cfg.5.gz
		55	share/man/man5/default.cfg.5.gz
		56	share/man/man5/heretic.cfg.5.gz
		57	share/man/man5/hexen.cfg.5.gz
		58	share/man/man5/strife.cfg.5.gz
		59	share/man/man6/chocolate-doom-setup.6.gz
		60	share/man/man6/chocolate-doom.6.gz
		61	share/man/man6/chocolate-heretic-setup.6.gz
		62	share/man/man6/chocolate-heretic.6.gz
		63	share/man/man6/chocolate-hexen-setup.6.gz
		64	share/man/man6/chocolate-hexen.6.gz
		65	share/man/man6/chocolate-server.6.gz
		66	share/man/man6/chocolate-strife-setup.6.gz
		67	share/man/man6/chocolate-strife.6.gz
		68	share/metainfo/org.chocolate_doom.Doom.metainfo.xml
		69	share/metainfo/org.chocolate_doom.Heretic.metainfo.xml
		70	share/metainfo/org.chocolate_doom.Hexen.metainfo.xml
		71	share/metainfo/org.chocolate_doom.Strife.metainfo.xml