pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators Automatically convert all files to unix line...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee40556a5ad3
branches:  trunk
changeset: 490534:ee40556a5ad3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Mar 14 16:20:58 2005 +0000

description:
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.

diffstat:

 emulators/DatUtil/Makefile          |   3 +-
 emulators/DatUtil/distinfo          |   6 +-
 emulators/DatUtil/patches/patch-aa  |  60 +++++++++++++-------------
 emulators/DatUtil/patches/patch-ab  |  34 +++++++-------
 emulators/MAMEDiff/Makefile         |   3 +-
 emulators/MAMEDiff/distinfo         |  10 ++--
 emulators/MAMEDiff/patches/patch-aa |  60 +++++++++++++-------------
 emulators/MAMEDiff/patches/patch-ab |  30 ++++++------
 emulators/MAMEDiff/patches/patch-ac |  22 ++++----
 emulators/MAMEDiff/patches/patch-ad |  22 ++++----
 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 ++++----
 emulators/ROMInfo/Makefile          |   3 +-
 emulators/ROMInfo/distinfo          |   6 +-
 emulators/ROMInfo/patches/patch-aa  |  60 +++++++++++++-------------
 emulators/ROMInfo/patches/patch-ab  |  38 ++++++++--------
 emulators/ZIPIdent/Makefile         |   3 +-
 emulators/ZIPIdent/distinfo         |   6 +-
 emulators/ZIPIdent/patches/patch-aa |  60 +++++++++++++-------------
 emulators/ZIPIdent/patches/patch-ab |  38 ++++++++--------
 23 files changed, 307 insertions(+), 302 deletions(-)

diffs (truncated from 833 to 300 lines):

diff -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/DatUtil/Makefile
--- a/emulators/DatUtil/Makefile        Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/DatUtil/Makefile        Mon Mar 14 16:20:58 2005 +0000
@@ -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 @@
 WRKSRC=                        ${WRKDIR}
 MAKEFILE=              makefile
 BUILD_TARGET=          datutil
+EXTRACT_CMD_OPTS.zip=  -Laaqo
 
 post-extract:
        ${MKDIR} ${WRKSRC}/obj
diff -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/DatUtil/distinfo
--- a/emulators/DatUtil/distinfo        Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/DatUtil/distinfo        Mon Mar 14 16:20:58 2005 +0000
@@ -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 -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/DatUtil/patches/patch-aa
--- a/emulators/DatUtil/patches/patch-aa        Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/DatUtil/patches/patch-aa        Mon Mar 14 16:20:58 2005 +0000
@@ -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 -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/DatUtil/patches/patch-ab
--- a/emulators/DatUtil/patches/patch-ab        Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/DatUtil/patches/patch-ab        Mon Mar 14 16:20:58 2005 +0000
@@ -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 -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/MAMEDiff/Makefile
--- a/emulators/MAMEDiff/Makefile       Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/MAMEDiff/Makefile       Mon Mar 14 16:20:58 2005 +0000
@@ -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 @@
 WRKSRC=                        ${WRKDIR}
 MAKEFILE=              makefile
 BUILD_TARGET=          mamediff
+EXTRACT_CMD_OPTS.zip=  -Laaqo
 
 post-extract:
        ${MKDIR} ${WRKSRC}/obj
diff -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/MAMEDiff/distinfo
--- a/emulators/MAMEDiff/distinfo       Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/MAMEDiff/distinfo       Mon Mar 14 16:20:58 2005 +0000
@@ -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 -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/MAMEDiff/patches/patch-aa
--- a/emulators/MAMEDiff/patches/patch-aa       Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/MAMEDiff/patches/patch-aa       Mon Mar 14 16:20:58 2005 +0000
@@ -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 -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/MAMEDiff/patches/patch-ab
--- a/emulators/MAMEDiff/patches/patch-ab       Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/MAMEDiff/patches/patch-ab       Mon Mar 14 16:20:58 2005 +0000
@@ -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 -r 0c1bcfe35d4c -r ee40556a5ad3 emulators/MAMEDiff/patches/patch-ac
--- a/emulators/MAMEDiff/patches/patch-ac       Mon Mar 14 16:11:42 2005 +0000
+++ b/emulators/MAMEDiff/patches/patch-ac       Mon Mar 14 16:20:58 2005 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index