Automatically convert all files to unix line endings by extracting, and

remove DOS line endings from patches too. Improves probability of
compilation on gcc2 systems.

4 files changed, 52 insertions, 51 deletions

diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index fe67e6cb8a5..d60b53b7442 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/14 16:20:58 wiz Exp $
 #
 
 DISTNAME=		dutil214
@@ -16,6 +16,7 @@ USE_GNU_TOOLS+=		make
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		datutil
+EXTRACT_CMD_OPTS.zip=	-Laaqo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/DatUtil/distinfo b/emulators/DatUtil/distinfo
index 86b11638c52..2dea0fb2493 100644
--- a/emulators/DatUtil/distinfo
+++ b/emulators/DatUtil/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/03/14 16:20:58 wiz Exp $
 
 SHA1 (dutil214.zip) = 22392a9797fa7986d4ae35008375fe55f34e4eab
 RMD160 (dutil214.zip) = 1b5edd53ce75f0e8386b507aef986673b27ee206
 Size (dutil214.zip) = 132739 bytes
-SHA1 (patch-aa) = 213e8401442c241cd138f8148ef543cf46faf013
-SHA1 (patch-ab) = 81fdb02636842b4ee8f7e7260c45fb943346b4da
+SHA1 (patch-aa) = a6f3eee2549bc795bdf16b3672ec770ee16794a0
+SHA1 (patch-ab) = 2926b8e6dda83ca30e20de6f27933a318a2db404
diff --git a/emulators/DatUtil/patches/patch-aa b/emulators/DatUtil/patches/patch-aa
index 8179d281bf8..76e13364735 100644
--- a/emulators/DatUtil/patches/patch-aa
+++ b/emulators/DatUtil/patches/patch-aa
@@ -1,36 +1,36 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
 
 --- makefile.orig	2004-07-01 16:25:16.000000000 +0200
 +++ makefile
 @@ -3,7 +3,7 @@
- #

- 

- NAME=datutil

--EXT=.exe

-+EXT=

- EXE=$(NAME)$(EXT)

- 

- SRC=src

-@@ -18,9 +18,10 @@ OBJS=	$(DLOBJS) \

- # Build the obj tree then build the EXE

- #

- 

--all: dlmaketree maketree $(EXE)

-+all: maketree $(EXE)

- 

--include $(LOGIQX)/dev/datlib/makefile

+ #
+ 
+ NAME=datutil
+-EXT=.exe
++EXT=
+ EXE=$(NAME)$(EXT)
+ 
+ SRC=src
+@@ -18,9 +18,10 @@ OBJS=	$(DLOBJS) \
+ # Build the obj tree then build the EXE
+ #
+ 
+-all: dlmaketree maketree $(EXE)
++all: maketree $(EXE)
+ 
+-include $(LOGIQX)/dev/datlib/makefile
 +DLSRC=	$(PREFIX)/include/DatLib
-+CFLAGS+=	-I src -I $(PREFIX)/include

- 

- #

- # Creating obj directory tree

++CFLAGS+=	-I src -I $(PREFIX)/include
+ 
+ #
+ # Creating obj directory tree
 @@ -45,8 +46,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(SRC)/%.h $(DLSR
- 

- $(EXE): $(OBJS)

- 	@echo Linking $@...

--	$(LD) $(OBJS) $(LIBS) -o $@

--	$(UPX) $@

-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz

- 

- #

- # Complete removal of built objects

+ 
+ $(EXE): $(OBJS)
+ 	@echo Linking $@...
+-	$(LD) $(OBJS) $(LIBS) -o $@
+-	$(UPX) $@
++	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
+ 
+ #
+ # Complete removal of built objects
diff --git a/emulators/DatUtil/patches/patch-ab b/emulators/DatUtil/patches/patch-ab
index d38ee72bdbf..daa22e55b22 100644
--- a/emulators/DatUtil/patches/patch-ab
+++ b/emulators/DatUtil/patches/patch-ab
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/14 16:20:58 wiz Exp $
 
 --- src/datutil.c.orig	2005-02-22 21:04:44.000000000 +0100
 +++ src/datutil.c
 @@ -21,13 +21,13 @@
- 

- /* --- Dat library includes --- */

- 

--#include "datlib/src/datlib.h"

--#include "datlib/src/macro.h"

-+#include <DatLib/datlib.h>

-+#include <DatLib/macro.h>

- 

- 

- /* --- Misc library includes --- */

- 

--#include "datlib/src/misc/getopt.h"

-+#include <DatLib/misc/getopt.h>

- 

- 

- /* --- DatUtil definitions and macros --- */

+ 
+ /* --- Dat library includes --- */
+ 
+-#include "datlib/src/datlib.h"
+-#include "datlib/src/macro.h"
++#include <DatLib/datlib.h>
++#include <DatLib/macro.h>
+ 
+ 
+ /* --- Misc library includes --- */
+ 
+-#include "datlib/src/misc/getopt.h"
++#include <DatLib/misc/getopt.h>
+ 
+ 
+ /* --- DatUtil definitions and macros --- */