From 188fde5d60e529f3ade6436f2019f3e6ccb5dac5 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
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/ZIPIdent/Makefile         |  3 +-
 emulators/ZIPIdent/distinfo         |  6 ++--
 emulators/ZIPIdent/patches/patch-aa | 60 ++++++++++++++++++-------------------
 emulators/ZIPIdent/patches/patch-ab | 38 +++++++++++------------
 4 files changed, 54 insertions(+), 53 deletions(-)

(limited to 'emulators/ZIPIdent')

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