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.

23 files changed, 307 insertions, 302 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 --- */
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index 0e548796315..fc2c77cc09f 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/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=		mdiff216
@@ -16,6 +16,7 @@ USE_GNU_TOOLS+=		make
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		mamediff
+EXTRACT_CMD_OPTS.zip=	-Laaqo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/MAMEDiff/distinfo b/emulators/MAMEDiff/distinfo
index 2fdf370a514..5e0ee80dbce 100644
--- a/emulators/MAMEDiff/distinfo
+++ b/emulators/MAMEDiff/distinfo
@@ -1,9 +1,9 @@
-$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 (mdiff216.zip) = bc6dd8b21c20b73027dfb0e541681227d11173a9
 RMD160 (mdiff216.zip) = 8b144e710c75b20309fc12f8f24399aec4bc5294
 Size (mdiff216.zip) = 153474 bytes
-SHA1 (patch-aa) = 889efeca6087d8b43b793d015e84a40ee39cd64c
-SHA1 (patch-ab) = 71d9b2b8321f3e1d7adead3c385d6d7d4b2f53be
-SHA1 (patch-ac) = a7d6acfc086ee4eec481e9c1aea10fbe3636f63b
-SHA1 (patch-ad) = 02187fcf5720f639e922f8e6cdc7e3dec783793b
+SHA1 (patch-aa) = da1422224efb2c332b2a4d1117f6b3184535cebe
+SHA1 (patch-ab) = 0558a1b50e869a40e5268ba567b0a6c23e354c07
+SHA1 (patch-ac) = d5095a349590a9f2a96173b973a9bec78f9fdd4f
+SHA1 (patch-ad) = 878633f71e1cab024801937307bd30e880a72eb0
diff --git a/emulators/MAMEDiff/patches/patch-aa b/emulators/MAMEDiff/patches/patch-aa
index 2bab95d8340..6fa5bc0dc44 100644
--- a/emulators/MAMEDiff/patches/patch-aa
+++ b/emulators/MAMEDiff/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:38.000000000 +0100
 +++ makefile
 @@ -3,7 +3,7 @@
- #

- 

- NAME=mamediff

--EXT=.exe

-+EXT=

- EXE=$(NAME)$(EXT)

- 

- SRC=src

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

- # Build the obj tree then build the EXE

- #

- 

--all: dlmaketree maketree $(EXE)

-+all: maketree $(EXE)

- 

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

+ #
+ 
+ NAME=mamediff
+-EXT=.exe
++EXT=
+ EXE=$(NAME)$(EXT)
+ 
+ SRC=src
+@@ -20,9 +20,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
 @@ -51,8 +52,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(SRC)/%.h $(SRC)
- 

- $(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/MAMEDiff/patches/patch-ab b/emulators/MAMEDiff/patches/patch-ab
index 04b7fe17e87..869beb149b0 100644
--- a/emulators/MAMEDiff/patches/patch-ab
+++ b/emulators/MAMEDiff/patches/patch-ab
@@ -1,19 +1,19 @@
-$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/mamediff.c.orig	2005-02-28 19:12:48.000000000 +0100
 +++ src/mamediff.c
 @@ -19,12 +19,12 @@
- 

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

- 

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

-+#include <DatLib/datlib.h>

- 

- 

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

- 

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

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

- 

- 

- /* --- MAMEDiff definitions and macros --- */

+ 
+ /* --- Dat library includes --- */
+ 
+-#include "datlib/src/datlib.h"
++#include <DatLib/datlib.h>
+ 
+ 
+ /* --- Misc library includes --- */
+ 
+-#include "datlib/src/misc/getopt.h"
++#include <DatLib/misc/getopt.h>
+ 
+ 
+ /* --- MAMEDiff definitions and macros --- */
diff --git a/emulators/MAMEDiff/patches/patch-ac b/emulators/MAMEDiff/patches/patch-ac
index 1c9a7143d06..abc0c19fbcb 100644
--- a/emulators/MAMEDiff/patches/patch-ac
+++ b/emulators/MAMEDiff/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2005/03/14 16:20:58 wiz Exp $
 
 --- src/compare.c.orig	2005-02-20 16:08:38.000000000 +0100
 +++ src/compare.c
 @@ -15,8 +15,8 @@
- 

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

- 

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

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

-+#include "DatLib/datlib.h"

-+#include "DatLib/macro.h"

- 

- 

- /* --- MAMEDiff definitions and macros --- */

+ 
+ /* --- Dat library includes --- */
+ 
+-#include "datlib/src/datlib.h"
+-#include "datlib/src/macro.h"
++#include "DatLib/datlib.h"
++#include "DatLib/macro.h"
+ 
+ 
+ /* --- MAMEDiff definitions and macros --- */
diff --git a/emulators/MAMEDiff/patches/patch-ad b/emulators/MAMEDiff/patches/patch-ad
index 681b941607c..f073e5c7d96 100644
--- a/emulators/MAMEDiff/patches/patch-ad
+++ b/emulators/MAMEDiff/patches/patch-ad
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2005/03/14 16:20:58 wiz Exp $
 
 --- src/generate.c.orig	2005-02-13 16:11:00.000000000 +0100
 +++ src/generate.c
 @@ -15,8 +15,8 @@
- 

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

- 

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

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

-+#include "DatLib/datlib.h"

-+#include "DatLib/macro.h"

- 

- 

- /* --- MAMEDiff definitions and macros --- */

+ 
+ /* --- Dat library includes --- */
+ 
+-#include "datlib/src/datlib.h"
+-#include "datlib/src/macro.h"
++#include "DatLib/datlib.h"
++#include "DatLib/macro.h"
+ 
+ 
+ /* --- MAMEDiff definitions and macros --- */
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
index 5c89581ec4e..38abb53374c 100644
--- a/emulators/ROMBuild/Makefile
+++ b/emulators/ROMBuild/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=		rbuild25
@@ -16,6 +16,7 @@ USE_GNU_TOOLS+=		make
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		rombuild
+EXTRACT_CMD_OPTS.zip=	-Laaqo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/ROMBuild/distinfo b/emulators/ROMBuild/distinfo
index 002aa8a8233..22b33b1dc91 100644
--- a/emulators/ROMBuild/distinfo
+++ b/emulators/ROMBuild/distinfo
@@ -1,8 +1,8 @@
-$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 (rbuild25.zip) = 25042f50ad727f001bba9777811d893fdbd59e41
 RMD160 (rbuild25.zip) = 7d718c268be64223afbe21d1f91a587b01861fc5
 Size (rbuild25.zip) = 107497 bytes
-SHA1 (patch-aa) = db393d4c23106875be652c9f2118fab7edf5d35f
-SHA1 (patch-ab) = e14b0892737292f6ca3d0907f70bbbe25a5f2559
-SHA1 (patch-ac) = 7149cce6e51000d8f86042368b7c777b7a8200cb
+SHA1 (patch-aa) = c7d5a9c16c2da0a97d30c2e21d99827b3ab8f2a6
+SHA1 (patch-ab) = 1fbc4887a532d1f956875589baa8a2e0211070fc
+SHA1 (patch-ac) = 484bd715983c109f41f1d01e7150266e7c2ca4d1
diff --git a/emulators/ROMBuild/patches/patch-aa b/emulators/ROMBuild/patches/patch-aa
index ab0ccf007e2..195f281cf31 100644
--- a/emulators/ROMBuild/patches/patch-aa
+++ b/emulators/ROMBuild/patches/patch-aa
@@ -1,47 +1,47 @@
-$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:18.000000000 +0200
 +++ makefile
 @@ -3,7 +3,7 @@
- #

- 

- NAME=rombuild

--EXT=.exe

-+EXT=

- EXE=$(NAME)$(EXT)

- 

- SRC=src

-@@ -11,19 +11,17 @@ OBJ=obj

- 

- OBJDIRS=$(OBJ)

- 

--OBJS=	$(DLOBJ)/misc/getopt.o \

--	$(DLOBJ)/mame/unzip.o \

--	$(DLOBJ)/mame/msdos/msdos.o \

--	$(OBJ)/$(NAME).o \

-+OBJS=	$(OBJ)/$(NAME).o \

- 	$(OBJ)/rominfo.o

- 

- #

- # Build the obj tree then build the EXE

- #

- 

--all: dlmaketree maketree $(EXE)

-+all: maketree $(EXE)

- 

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

+ #
+ 
+ NAME=rombuild
+-EXT=.exe
++EXT=
+ EXE=$(NAME)$(EXT)
+ 
+ SRC=src
+@@ -11,19 +11,17 @@ OBJ=obj
+ 
+ OBJDIRS=$(OBJ)
+ 
+-OBJS=	$(DLOBJ)/misc/getopt.o \
+-	$(DLOBJ)/mame/unzip.o \
+-	$(DLOBJ)/mame/msdos/msdos.o \
+-	$(OBJ)/$(NAME).o \
++OBJS=	$(OBJ)/$(NAME).o \
+ 	$(OBJ)/rominfo.o
+ 
+ #
+ # 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
 @@ -52,8 +50,7 @@ $(OBJ)/rominfo.o: $(SRC)/rominfo.c $(SRC
- 

- $(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/ROMBuild/patches/patch-ab b/emulators/ROMBuild/patches/patch-ab
index 9fef4a0a37c..07dc6f619b5 100644
--- a/emulators/ROMBuild/patches/patch-ab
+++ b/emulators/ROMBuild/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/rombuild.c.orig	2005-01-30 12:19:54.000000000 +0100
 +++ src/rombuild.c
 @@ -23,13 +23,13 @@
- 

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

- 

--#include "datlib/src/macro.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"

- 

- 

- /* --- ROMBuild definitions and macros --- */

+ 
+ /* --- Dat library includes --- */
+ 
+-#include "datlib/src/macro.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"
+ 
+ 
+ /* --- ROMBuild definitions and macros --- */
diff --git a/emulators/ROMBuild/patches/patch-ac b/emulators/ROMBuild/patches/patch-ac
index 328c5c47801..6e597d1b499 100644
--- a/emulators/ROMBuild/patches/patch-ac
+++ b/emulators/ROMBuild/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/03/04 12:05:13 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2005/03/14 16:20:58 wiz Exp $
 
 --- src/rombuild.h.orig	2005-01-02 22:50:32.000000000 +0100
 +++ src/rombuild.h
 @@ -6,7 +6,7 @@
- 

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

- 

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

-+#include "DatLib/macro.h"

- 

- 

- /* --- Types of ROMBuild operation --- */

+ 
+ /* --- Dat library includes --- */
+ 
+-#include "datlib/src/macro.h"
++#include "DatLib/macro.h"
+ 
+ 
+ /* --- Types of ROMBuild operation --- */
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 --- */
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
index 37653c3e4d1..e0319f7ae9c 100644
--- a/emulators/ZIPIdent/Makefile
+++ b/emulators/ZIPIdent/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=		zident24
@@ -16,6 +16,7 @@ USE_GNU_TOOLS+=		make
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		zipident
+EXTRACT_CMD_OPTS.zip=	-Laaqo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/ZIPIdent/distinfo b/emulators/ZIPIdent/distinfo
index cfee43b6190..8257816558e 100644
--- a/emulators/ZIPIdent/distinfo
+++ b/emulators/ZIPIdent/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 (zident24.zip) = 2c22835ac1ad9ee8c7f9c40b125e3b856718828b
 RMD160 (zident24.zip) = 09500182746f6be1b2c78769474a632bf10ae7a9
 Size (zident24.zip) = 132766 bytes
-SHA1 (patch-aa) = b67b6cdb5961c697d673baef7a0a0cf49bfb400e
-SHA1 (patch-ab) = bd0d8a41f7f497da845113256e6aa8a0edeec75a
+SHA1 (patch-aa) = 2718a0187b02e57001d9f6f8e9b3b5c1760daea6
+SHA1 (patch-ab) = 67ad17076bff44fc854a7f0b076283b4f3c135de
diff --git a/emulators/ZIPIdent/patches/patch-aa b/emulators/ZIPIdent/patches/patch-aa
index f00411fbcf9..2d255b6649e 100644
--- a/emulators/ZIPIdent/patches/patch-aa
+++ b/emulators/ZIPIdent/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:20.000000000 +0200
 +++ makefile
 @@ -3,7 +3,7 @@
- #

- 

- NAME=zipident

--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=zipident
+-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/ZIPIdent/patches/patch-ab b/emulators/ZIPIdent/patches/patch-ab
index 27901fad039..0934d2b1a07 100644
--- a/emulators/ZIPIdent/patches/patch-ab
+++ b/emulators/ZIPIdent/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/zipident.c.orig	2005-02-13 14:07:40.000000000 +0100
 +++ src/zipident.c
 @@ -21,14 +21,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"

- 

- 

- /* --- ZipIdent 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"
+ 
+ 
+ /* --- ZipIdent definitions and macros --- */