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, 54 insertions, 53 deletions

diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index e033139d139..4ea2dda79a1 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/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=		rinfo23
@@ -16,6 +16,7 @@ USE_GNU_TOOLS+=		make
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		rominfo
+EXTRACT_CMD_OPTS.zip=	-Laaqo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/ROMInfo/distinfo b/emulators/ROMInfo/distinfo
index 70833f1e3a8..fffec785c59 100644
--- a/emulators/ROMInfo/distinfo
+++ b/emulators/ROMInfo/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 (rinfo23.zip) = f4fd3b662428414ddc23f2d65b11e7fd1bf9eb96
 RMD160 (rinfo23.zip) = 0e33d39221b3a94acd75dd430b798d9ca031d1ed
 Size (rinfo23.zip) = 125239 bytes
-SHA1 (patch-aa) = 3d08710e0b68799a789e0a8aa5fee9b2d0d7522c
-SHA1 (patch-ab) = d80e5487b764533547b4f5340e2a103b5de03adb
+SHA1 (patch-aa) = 5006204b7b458068be13f0258eddf739a984f23a
+SHA1 (patch-ab) = c8667dc5c0ba3085e14b56b88d1693a5a8abf329
diff --git a/emulators/ROMInfo/patches/patch-aa b/emulators/ROMInfo/patches/patch-aa
index 47574052b7b..b7a71fc96d2 100644
--- a/emulators/ROMInfo/patches/patch-aa
+++ b/emulators/ROMInfo/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	2005-02-24 23:39:06.000000000 +0100
 +++ makefile
 @@ -3,7 +3,7 @@
- #

- 

- NAME=rominfo

--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=rominfo
+-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/ROMInfo/patches/patch-ab b/emulators/ROMInfo/patches/patch-ab
index 06394135882..0a4341a5e30 100644
--- a/emulators/ROMInfo/patches/patch-ab
+++ b/emulators/ROMInfo/patches/patch-ab
@@ -1,23 +1,23 @@
-$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/rominfo.c.orig	2005-02-28 19:17:24.000000000 +0100
 +++ src/rominfo.c
 @@ -22,14 +22,14 @@
- 

- /* --- 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/src/mame/unzip.h"

-+#include "DatLib/misc/getopt.h"

-+#include "DatLib/mame/unzip.h"

- 

- 

- /* --- ROMInfo 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/src/mame/unzip.h"
++#include "DatLib/misc/getopt.h"
++#include "DatLib/mame/unzip.h"
+ 
+ 
+ /* --- ROMInfo definitions and macros --- */