Date: Fri, 14 Oct 2011 19:29:18 GMT From: Cray Elliott <MP2E@archlinux.us> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161664: Updated port: archivers/deutex Doom WAD Archive editor Message-ID: <201110141929.p9EJTI4K050007@red.freebsd.org> Resent-Message-ID: <201110141930.p9EJU8rW091741@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161664 >Category: ports >Synopsis: Updated port: archivers/deutex Doom WAD Archive editor >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 14 19:30:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Cray Elliott >Release: 9.0-BETA3 >Organization: n/a >Environment: FreeBSD craypc 9.0-BETA3 FreeBSD 9.0-BETA3 #0: Thu Oct 13 07:01:52 UTC 2011 root@craypc:/usr/obj/usr/src/sys/CRAYPC amd64 >Description: Port would segfault when compiled under AMD64, the Makefile overwrote the CFLAGS, and also had some overflow issues that were all fixed with patches. >How-To-Repeat: 1. Install deutex on FreeBSD amd64(Any release) 2. run deutex 3. Segfault! >Fix: attached patches Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # deutex # deutex/pkg-descr # deutex/distinfo # deutex/files # deutex/files/patch-src-sound.c # deutex/files/patch-Makefile # deutex/files/patch-src-deutex.h # deutex/Makefile # echo c - deutex mkdir -p deutex > /dev/null 2>&1 echo x - deutex/pkg-descr sed 's/^X//' >deutex/pkg-descr << 'b61efaf2a47bd7dcc975a911197c2779' XDeuTex is a tool to work with WAD files for Doom, Heretic, Hexen, and Strife. XIt can be used to extract the lumps from a WAD and save them as individual Xfiles. Conversely, it can also build a WAD from separate files. When Xextracting a lump to a file, it does not just copy the raw data, it converts Xit to an appropriate format (such as PPM for graphics, Sun audio for samples, Xetc.). Conversely, when it reads files for inclusion in PWADs, it does the Xnecessary conversions (for example, from PPM to Doom picture format). In Xaddition, DeuTex has functions such as merging WADs, etc. If you're doing Xany WAD hacking beyond level editing, DeuTex is a must. X XWWW: http://www.teaser.fr/~amajorel/deutex/ b61efaf2a47bd7dcc975a911197c2779 echo x - deutex/distinfo sed 's/^X//' >deutex/distinfo << '72294346362a475e39e12fecbf36a128' XSHA256 (deutex-4.4.0.tar.gz) = e87ff2984c6555f30408ee7aa4e6461aac6f1d3d0a1e21b4e12a797a057ba3b7 XSIZE (deutex-4.4.0.tar.gz) = 215945 72294346362a475e39e12fecbf36a128 echo c - deutex/files mkdir -p deutex/files > /dev/null 2>&1 echo x - deutex/files/patch-src-sound.c sed 's/^X//' >deutex/files/patch-src-sound.c << 'bfbc46ae83fb8e81a14e1e9f8d0a8207' X--- src/sound.c 1999-12-30 15:20:22.000000000 -0800 X+++ src/sound.c 2011-10-14 12:00:18.262780464 -0700 X@@ -309,7 +309,7 @@ X if(fread(&headv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read header"); X if(strncmp(VocId,headv.ident,VOCIDLEN)!=0) ProgError("VOC: bad header"); X if(fseek(fp,headv.block1,SEEK_SET)) ProgError("VOC: bad header"); X- if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read block"); X+ if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1) ProgError("VOC: can't read block"); X if(blockv.type!=1) ProgError("VOC: first block is not sound"); X datasize= ((blockv.sizeU)<<16)&0xFF0000L; X datasize+=((blockv.sizeM)<<8)&0xFF00L; bfbc46ae83fb8e81a14e1e9f8d0a8207 echo x - deutex/files/patch-Makefile sed 's/^X//' >deutex/files/patch-Makefile << 'c448f6b8ccf07d94d9b4bdaa60a3de74' X--- Makefile 1999-12-24 04:50:16.000000000 -0800 X+++ Makefile 2011-10-14 12:01:47.749784259 -0700 X@@ -16,11 +16,6 @@ X X PREFIX=/usr/local X X-# Compiled by users X-CFLAGS = -O2 X-CC = cc X-LDFLAGS = X- X # Compiled by developers X DCFLAGS = -g -Wall -Wpointer-arith -Wstrict-prototypes X DCC = gcc X@@ -182,11 +177,11 @@ X (sleep 1; mkdir -p tmp; touch tmp/_deusf) & X X tmp/_deutex: X- -mkdir tmp X+ @mkdir tmp 2> /dev/null || true X touch $@ X X tmp/_deusf: X- -mkdir tmp X+ @mkdir tmp 2> /dev/null || true X touch $@ X X install: c448f6b8ccf07d94d9b4bdaa60a3de74 echo x - deutex/files/patch-src-deutex.h sed 's/^X//' >deutex/files/patch-src-deutex.h << 'a83f78eec4e20daa977974b64890ea29' X--- src/deutex.h 1999-12-30 15:20:22.000000000 -0800 X+++ src/deutex.h 2011-10-14 11:58:43.527798783 -0700 X@@ -31,7 +31,7 @@ X #define DeuSF for DOS .EXE Unix Linux OS/2 X *********************************************/ X X-#if defined (__alpha) /*__ALPHA__ for Alpha processor?*/ X+#if defined (__alpha) || (__x86_64__) /*__ALPHA__ for Alpha processor?*/ X /*long = int64 on a 64bit processor*/ X typedef char Int8; X typedef short Int16; a83f78eec4e20daa977974b64890ea29 echo x - deutex/Makefile sed 's/^X//' >deutex/Makefile << '861121e84f32231ac6781e41cced1221' X# New ports collection makefile for: DeuTex X# Date created: 14 Oct 2011 X# Whom: Cray Elliott <MP2E@archlinux.org> X# X# $FreeBSD$ X# X XPORTNAME= deutex XPORTVERSION= 4.4.0 XCATEGORIES= archivers games XMASTER_SITES= http://www.teaser.fr/~amajorel/deutex/ \ X http://freebsd.nsu.ru/distfiles/ X XMAINTAINER= danfe@FreeBSD.org XCOMMENT= WAD file manipulator for Doom, Heretic, Hexen, and Strife X XLICENSE= GPLv2 X XMAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" X XMAN6= ${PORTNAME}.6 XPLIST_FILES= bin/deusf bin/deutex XPORTDOCS= * X Xpost-extract: X @${REINPLACE_CMD} -e 's,malloc\.h,stdlib.h,' ${WRKSRC}/src/tools.c X Xdo-install: X ${INSTALL_PROGRAM} ${WRKSRC}/deusf ${WRKSRC}/deutex ${PREFIX}/bin X ${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MANPREFIX}/man/man6 X.if !defined(NOPORTDOCS) X @${MKDIR} ${DOCSDIR} X ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/TODO ${DOCSDIR} X ${INSTALL_DATA} ${WRKSRC}/dtexman6.txt ${DOCSDIR}/MANUAL X.endif X X.include <bsd.port.mk> 861121e84f32231ac6781e41cced1221 exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110141929.p9EJTI4K050007>