diff --git a/TODO b/TODO index 13fe384..0c65af7 100644 --- a/TODO +++ b/TODO @@ -17,5 +17,4 @@ trenchbroom uade xf86-input-xwiimote-git xwiimote-git -zdbsp -zennode +zokumbsp diff --git a/srcpkgs/zennode/patches/ZenMain.diff b/srcpkgs/zennode/patches/ZenMain.diff new file mode 100644 index 0000000..d676239 --- /dev/null +++ b/srcpkgs/zennode/patches/ZenMain.diff @@ -0,0 +1,32 @@ +--- src/ZenNode/ZenMain.cpp.orig 2004-05-30 15:29:42.000000000 -0400 ++++ src/ZenNode/ZenMain.cpp 2019-10-28 05:32:10.083695762 -0400 +@@ -39,17 +39,17 @@ + #include + #include + +-#if defined ( __OS2__ ) ++#if defined ( _OS2 ) + #include + #include + #include + #define INCL_DOS + #define INCL_SUB + #include +-#elif defined ( __WIN32__ ) ++#elif defined ( _WIN32 ) + #include + #include +-#elif defined ( __LINUX__ ) ++#elif defined ( __linux__ ) + #include + #else + #error This platform is not supported +@@ -101,7 +101,7 @@ + { + FUNCTION_ENTRY ( NULL, "printHelp", true ); + +- fprintf ( stdout, "Usage: ZenNode {-options} filename[.wad] [level{+level}] {-o|x output[.wad]}\n" ); ++ fprintf ( stdout, "Usage: zennode {-options} filename[.wad] [level{+level}] {-o|x output[.wad]}\n" ); + fprintf ( stdout, "\n" ); + fprintf ( stdout, " -x+ turn on option -x- turn off option %c = default\n", DEFAULT_CHAR ); + fprintf ( stdout, "\n" ); diff --git a/srcpkgs/zennode/patches/bspdiff.diff b/srcpkgs/zennode/patches/bspdiff.diff new file mode 100644 index 0000000..ee12037 --- /dev/null +++ b/srcpkgs/zennode/patches/bspdiff.diff @@ -0,0 +1,20 @@ +--- src/ZenNode/bspdiff.cpp.orig 2004-05-28 20:37:36.000000000 -0400 ++++ src/ZenNode/bspdiff.cpp 2019-10-28 05:33:26.853574198 -0400 +@@ -104,7 +104,7 @@ + + void printHelp () + { +- fprintf ( stderr, "Usage: nodediff {-options} filename1[.wad] filename2[.wad] [level{+level}]\n" ); ++ fprintf ( stderr, "Usage: zenbspdiff {-options} filename1[.wad] filename2[.wad] [level{+level}]\n" ); + fprintf ( stderr, "\n" ); + fprintf ( stderr, " -x+ turn on option -x- turn off option %c = default\n", DEFAULT_CHAR ); + fprintf ( stderr, "\n" ); +@@ -404,7 +404,7 @@ + + int main ( int argc, const char *argv[] ) + { +- fprintf ( stderr, "Compare Version %s (c) 2003-2004 Marc Rousseau\n\n", VERSION ); ++ fprintf ( stderr, "ZenNode Version %s (c) 2003-2004 Marc Rousseau\n\n", VERSION ); + + if ( argc == 1 ) { + printHelp (); diff --git a/srcpkgs/zennode/patches/bspinfo.diff b/srcpkgs/zennode/patches/bspinfo.diff new file mode 100644 index 0000000..8c84509 --- /dev/null +++ b/srcpkgs/zennode/patches/bspinfo.diff @@ -0,0 +1,20 @@ +--- src/ZenNode/bspinfo.cpp.orig 2004-05-28 17:04:32.000000000 -0400 ++++ src/ZenNode/bspinfo.cpp 2019-10-28 05:34:19.497490827 -0400 +@@ -52,7 +52,7 @@ + DBG_REGISTER ( __FILE__ ); + + #define VERSION "1.3" +-#define BANNER "BSPInfo Version " VERSION " (c) 1995-2004 Marc Rousseau" ++#define BANNER "ZenNode Version " VERSION " (c) 1995-2004 Marc Rousseau" + #define MAX_LEVELS 99 + + #if defined ( __GNUC__ ) || defined ( __INTEL_COMPILER ) +@@ -69,7 +69,7 @@ + + void printHelp () + { +- fprintf ( stderr, "Usage: bspInfo [-options] filename[.wad] [level[+level]]\n" ); ++ fprintf ( stderr, "Usage: zenbspinfo [-options] filename[.wad] [level[+level]]\n" ); + fprintf ( stderr, "\n" ); + fprintf ( stderr, " -x+ turn on option -x- turn off option %c = default\n", DEFAULT_CHAR ); + fprintf ( stderr, "\n" ); diff --git a/srcpkgs/zennode/patches/compare.diff b/srcpkgs/zennode/patches/compare.diff new file mode 100644 index 0000000..35a8442 --- /dev/null +++ b/srcpkgs/zennode/patches/compare.diff @@ -0,0 +1,20 @@ +--- src/ZenNode/compare.cpp.orig 2004-05-28 17:02:36.000000000 -0400 ++++ src/ZenNode/compare.cpp 2019-10-28 05:29:37.123938005 -0400 +@@ -59,7 +59,7 @@ + DBG_REGISTER ( __FILE__ ); + + #define VERSION "1.3" +-#define BANNER "compare Version " VERSION " (c) 1996-2004 Marc Rousseau" ++#define BANNER "zenbspcomp Version " VERSION " (c) 1996-2004 Marc Rousseau" + #define MAX_LEVELS 99 + + #define UNSUPPORTED_FEATURE -1 +@@ -81,7 +81,7 @@ + { + FUNCTION_ENTRY ( NULL, "printHelp", true ); + +- fprintf ( stderr, "Usage: compare {-options} filename1[.wad] filename2[.wad] [level{+level}]\n" ); ++ fprintf ( stderr, "Usage: zenbspcomp {-options} filename1[.wad] filename2[.wad] [level{+level}]\n" ); + fprintf ( stderr, "\n" ); + fprintf ( stderr, " -x+ turn on option -x- turn off option %c = default\n", DEFAULT_CHAR ); + fprintf ( stderr, "\n" ); diff --git a/srcpkgs/zennode/patches/makefile.diff b/srcpkgs/zennode/patches/makefile.diff new file mode 100644 index 0000000..832bc83 --- /dev/null +++ b/srcpkgs/zennode/patches/makefile.diff @@ -0,0 +1,50 @@ +--- src/ZenNode/makefile.orig 2004-05-28 01:27:38.000000000 -0400 ++++ src/ZenNode/makefile 2019-10-28 06:11:34.715211741 -0400 +@@ -1,21 +1,12 @@ + # ZenNode makefile for Linux + +-CC = g++ +-CFLAGS += -g -O -fstrength-reduce -fno-rtti ++CC = c++ ++CFLAGS += -fstrength-reduce -fno-rtti + CFLAGS += -fomit-frame-pointer -foptimize-sibling-calls +-#CFLAGS += -fbranch-probabilities +-#CFLAGS += -fprofile-arcs +-WARNINGS = -Wall -Wno-format -Wstrict-prototypes -Wmissing-prototypes -Winline +-#CC = /opt/intel/compiler60/ia32/bin/icc +-#CFLAGS = -g -O3 ++WARNINGS = -Wall -Wno-format -Winline + INCLUDES = -I../DOOM -I../common +-TARGETS = ZenNode bspdiff bspinfo compare +- +-CFLAGS += -D__LINUX__ +- +-ifdef WIN32 +-CFLAGS += -D__WIN32__ +-endif ++TARGETS = zennode zenbspdiff zenbspinfo zenbspcomp ++LIBS += -lstdc++ -lm + + ifdef DEBUG + CFLAGS += -DDEBUG +@@ -37,16 +28,16 @@ + clean: + rm -rf {.,../DOOM/,../common/logger}/{*.o,*~} $(TARGETS) + +-ZenNode: ZenMain.o ZenNode.o ZenReject.o ZenRMB.o blockmap.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) ++zennode: ZenMain.o ZenNode.o ZenReject.o ZenRMB.o blockmap.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) + $(CC) $(LIBS) -o $@ $^ + +-bspdiff: bspdiff.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) ++zenbspdiff: bspdiff.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) + $(CC) $(LIBS) -o $@ $^ + +-bspinfo: bspinfo.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) ++zenbspinfo: bspinfo.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) + $(CC) $(LIBS) -o $@ $^ + +-compare: compare.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) ++zenbspcomp: compare.o console.o ../DOOM/wad.o ../DOOM/level.o $(LOGGER) + $(CC) $(LIBS) -o $@ $^ + + ZenReject.o: \ diff --git a/srcpkgs/zennode/template b/srcpkgs/zennode/template new file mode 100644 index 0000000..8b9cbb6 --- /dev/null +++ b/srcpkgs/zennode/template @@ -0,0 +1,26 @@ +# Template file for 'zennode' +pkgname=zennode +version=1.2.1 +revision=1 +build_style=gnu-makefile +hostmakedepends="unzip" +create_wrksrc=yes +short_desc="A GPL node builder for Doom" +maintainer="Alison Watson " +license="GPL-2.0-or-later" +homepage="http://www.mrousseau.org/programs/ZenNode" +distfiles="http://www.mrousseau.org/programs/ZenNode/archives/zennode-1.2.1.zip" +checksum=137b50f9bc6efc69aebca4233bd3924a9ed21260855e6e37ed098486f90bd212 +build_wrksrc=src/ZenNode + +post_extract() { + cd ZenNode-1.2.1 + unzip -qd .. zennode-src.zip +} + +do_install() { + vinstall ${wrksrc}/${build_wrksrc}/zennode 0755 usr/bin/zennode + vinstall ${wrksrc}/${build_wrksrc}/zenbspdiff 0755 usr/bin/zenbspdiff + vinstall ${wrksrc}/${build_wrksrc}/zenbspinfo 0755 usr/bin/zenbspinfo + vinstall ${wrksrc}/${build_wrksrc}/zenbspcomp 0755 usr/bin/zenbspcomp +}