From c43ff2fe78fbc12fc5e670f324e3244652bbb351 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 14 Mar 2005 16:20:58 +0000
Subject: 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.

---
 emulators/ROMBuild/Makefile         |  3 +-
 emulators/ROMBuild/distinfo         |  8 ++--
 emulators/ROMBuild/patches/patch-aa | 82 ++++++++++++++++++-------------------
 emulators/ROMBuild/patches/patch-ab | 34 +++++++--------
 emulators/ROMBuild/patches/patch-ac | 18 ++++----
 5 files changed, 73 insertions(+), 72 deletions(-)

(limited to 'emulators/ROMBuild')

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 --- */
-- 
cgit v1.2.3