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.

6 files changed, 74 insertions, 73 deletions

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 --- */