Fix build under Apple OS X, bump PKGREVISION.

And install dosuments.
From Dean Matzkov via e-mail.

8 files changed, 146 insertions, 3 deletions

diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile
index e37fd8a1c41..8d09a3a03ef 100644
--- a/devel/z80-asm/Makefile
+++ b/devel/z80-asm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2014/12/21 00:31:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/21 07:40:39 ryoon Exp $
 #
 
 DISTNAME=	z80-asm-2.3.7
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://wwwhomes.uni-bielefeld.de/achim/z80-asm/
 
@@ -18,4 +19,20 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man5
 INSTALL_MAKE_FLAGS+=	BIN_DIR=${DESTDIR}${PREFIX}/bin
 INSTALL_MAKE_FLAGS+=	MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
+# Fix install under case insensitive file system.
+INSTALL_TARGET=		install-all
+
+INSTALLATION_DIRS+=	share/doc/${PKGBASE}
+Z80ASM_DOCS+=	CHANGELOG README SRC_FILES TODO dizz80.dvi dizz80.ps \
+		execute_timing.txt z80-asm.html Z80-cpu-pins z80-decoder.c \
+		z80-decoder.h z80-mon.html z80instructions.txt \
+		z80mnemonics.txt etc/ti86ports.txt
+
+post-install:
+.for f in ${Z80ASM_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+.endfor
+
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/z80-asm/PLIST b/devel/z80-asm/PLIST
index d76f673aafd..e1885760aca 100644
--- a/devel/z80-asm/PLIST
+++ b/devel/z80-asm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/12/21 00:31:56 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/02/21 07:40:39 ryoon Exp $
 bin/z80-asm
 bin/z80-mon
 man/man1/z80-asm.1
@@ -11,3 +11,18 @@ man/man5/z80-file.5
 man/man5/z80-keyboard.5
 man/man5/z80-memory.5
 man/man5/z80-ports.5
+share/doc/z80-asm/CHANGELOG
+share/doc/z80-asm/README
+share/doc/z80-asm/SRC_FILES
+share/doc/z80-asm/TODO
+share/doc/z80-asm/Z80-cpu-pins
+share/doc/z80-asm/dizz80.dvi
+share/doc/z80-asm/dizz80.ps
+share/doc/z80-asm/execute_timing.txt
+share/doc/z80-asm/ti86ports.txt
+share/doc/z80-asm/z80-asm.html
+share/doc/z80-asm/z80-decoder.c
+share/doc/z80-asm/z80-decoder.h
+share/doc/z80-asm/z80-mon.html
+share/doc/z80-asm/z80instructions.txt
+share/doc/z80-asm/z80mnemonics.txt
diff --git a/devel/z80-asm/distinfo b/devel/z80-asm/distinfo
index e4b170cc27b..dbf5a836ec8 100644
--- a/devel/z80-asm/distinfo
+++ b/devel/z80-asm/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:29:39 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/02/21 07:40:39 ryoon Exp $
 
 SHA1 (z80-asm-2.3.7.tar.gz) = a6355ab14f8e9de82e55fec5e4005e89d282cdb5
 RMD160 (z80-asm-2.3.7.tar.gz) = 65637277f2ab9b0d681fcbcc9034717419264915
 SHA512 (z80-asm-2.3.7.tar.gz) = 66c57404df21f85f695ed6c0a21755da8fb0a67ead10067421069d13175a49fced3050699bb750ed7253b76974f3dc5f989ab55d19459577f2277950a7f2e100
 Size (z80-asm-2.3.7.tar.gz) = 533983 bytes
+SHA1 (patch-Makefile) = 55e54eb99cff62d4163e20bbf59c190affccb7bf
 SHA1 (patch-aa) = f52a60e41d16936a49432febd592343b6aca6a10
+SHA1 (patch-hardware_analyzer.c) = f79f29c5d4810d83383d9b3245b3fccc26c646aa
+SHA1 (patch-interrupt.c) = 7a054b31d9d88d2c7272c956c8c41bf921e5226c
+SHA1 (patch-ports.c) = 782452b0e8941490513f3f0921708bf7c0f76ced
+SHA1 (patch-z80-cpu.h) = 5a22e7bb333f92aa5c38aaea9b3fc3b91deccfa2
diff --git a/devel/z80-asm/patches/patch-Makefile b/devel/z80-asm/patches/patch-Makefile
new file mode 100644
index 00000000000..a577799f42a
--- /dev/null
+++ b/devel/z80-asm/patches/patch-Makefile
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile,v 1.1 2016/02/21 07:40:39 ryoon Exp $
+
+--- Makefile.orig	2006-02-06 13:45:45.000000000 +0000
++++ Makefile
+@@ -48,7 +48,7 @@ clean:
+ 	$(RM) .bus_proto
+ 	cd hardware; make clean
+ 
+-install:
++install-all:
+ 	chmod a+rx $(ASM) $(MONI); cp -p $(ASM) $(MONI) $(BIN_DIR)
+ 	chmod a+r doc/man/z80-*.1; cp -p doc/man/z80-*.1 $(MAN_DIR)/man1
+ 	chmod a+r doc/man/z80-*.3; cp -p doc/man/z80-*.3 $(MAN_DIR)/man3
+@@ -115,7 +115,7 @@ cpu.a: execute.o decode-table.o decode.o
+ 	ar rcs cpu.a execute.o decode-table.o decode.o memory.o ports.o
+ 
+ 
+-$(ASM): z80-asm.o dummy.o asm.a $(HW)
+-	gcc -lc -o $(ASM) z80-asm.o dummy.o asm.a $(HW)
++$(ASM): z80-asm.o z80-cpu.o dummy.o asm.a $(HW)
++	gcc -lc -o $(ASM) z80-asm.o z80-cpu.o dummy.o asm.a $(HW)
+ $(MONI): z80-mon.o cpu.a console.o asm.a $(HW)
+ 	gcc -lc -o $(MONI) z80-mon.o cpu.a console.o asm.a $(HW)
diff --git a/devel/z80-asm/patches/patch-hardware_analyzer.c b/devel/z80-asm/patches/patch-hardware_analyzer.c
new file mode 100644
index 00000000000..9d421d9de2f
--- /dev/null
+++ b/devel/z80-asm/patches/patch-hardware_analyzer.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hardware_analyzer.c,v 1.1 2016/02/21 07:40:39 ryoon Exp $
+
+--- hardware/analyzer.c.orig	2005-06-06 09:02:29.000000000 +0000
++++ hardware/analyzer.c
+@@ -30,7 +30,7 @@ fprintf(fp,"%8s(%2x)  %c%c%c%c%c ", to_b
+     '0'+cpu_pin[rd],
+     '0'+cpu_pin[wr], '0'+cpu_pin[mreq], '0'+cpu_pin[iorq], '0'+cpu_pin[m1] );
+ fprintf(fp," %c%c %c%c%c %c%c %c ",
+-    '0'+cpu_pin[busrq],'0'+cpu_pin[busack],'0'+cpu_pin[wait],'0'+cpu_pin[halt],
++    '0'+cpu_pin[busrq],'0'+cpu_pin[busack],'0'+cpu_pin[mywait],'0'+cpu_pin[halt],
+     '0'+cpu_pin[reset],'0'+IFF3,'0'+cpu_pin[inter],'0'+cpu_pin[rfsh]);
+ if (cpu_pin[m1] && !last_m1)
+    m1_counter++;
diff --git a/devel/z80-asm/patches/patch-interrupt.c b/devel/z80-asm/patches/patch-interrupt.c
new file mode 100644
index 00000000000..725a8099d29
--- /dev/null
+++ b/devel/z80-asm/patches/patch-interrupt.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-interrupt.c,v 1.1 2016/02/21 07:40:39 ryoon Exp $
+
+--- interrupt.c.orig	2005-06-09 11:05:13.000000000 +0000
++++ interrupt.c
+@@ -66,7 +66,7 @@ init_cpu(char *filename)
+   IFF2= a>>2&1;
+   set_cpu_pin(halt,a>>3&1);
+   IM= a>>4 &3;
+-  /* set_cpu_pin(wait,a>>6&1); */
++  /* set_cpu_pin(mywait,a>>6&1); */
+   set_cpu_pin(inter,a>>7&1);
+   t = buffer[i++];
+   t |= buffer[i++]<<8;
+@@ -129,7 +129,7 @@ dump_cpu(char *filename)
+   a= (IFF0&1) | (IFF1&1)<<1 | (IFF2&1)<<2;
+   a|= (cpu_pin[halt]&1) << 3;
+   a|= (IM&3) << 4;
+-  a|= (cpu_pin[wait]&1) << 6;
++  a|= (cpu_pin[mywait]&1) << 6;
+   a|= (cpu_pin[inter]&1) << 7;
+   i=0;
+   buffer[i++]= I;
diff --git a/devel/z80-asm/patches/patch-ports.c b/devel/z80-asm/patches/patch-ports.c
new file mode 100644
index 00000000000..6b818963cae
--- /dev/null
+++ b/devel/z80-asm/patches/patch-ports.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-ports.c,v 1.1 2016/02/21 07:40:39 ryoon Exp $
+
+--- ports.c.orig	2005-06-10 16:41:45.000000000 +0000
++++ ports.c
+@@ -62,9 +62,9 @@ out_byte(unsigned char id, unsigned char
+ #endif
+    if (!cpu_is_in_disassemble)
+    {  wait_tics(TICS_MEMO);
+-      set_cpu_pin(wait,1);
++      set_cpu_pin(mywait,1);
+       wait_tics(TICS_WAIT);
+-      set_cpu_pin(wait,0);
++      set_cpu_pin(mywait,0);
+    }
+    set_cpu_pin(iorq,0);
+    set_cpu_pin(wr,0);
+@@ -90,9 +90,9 @@ in_byte(unsigned char id, unsigned char 
+    DATA= *data;
+    if (!cpu_is_in_disassemble)
+    {  wait_tics(TICS_MEMO);
+-      set_cpu_pin(wait,1);
++      set_cpu_pin(mywait,1);
+       wait_tics(TICS_WAIT);
+-      set_cpu_pin(wait,0);
++      set_cpu_pin(mywait,0);
+    }
+    *data= DATA;
+    set_cpu_pin(iorq,0);
diff --git a/devel/z80-asm/patches/patch-z80-cpu.h b/devel/z80-asm/patches/patch-z80-cpu.h
new file mode 100644
index 00000000000..a3fc479a126
--- /dev/null
+++ b/devel/z80-asm/patches/patch-z80-cpu.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-z80-cpu.h,v 1.1 2016/02/21 07:40:39 ryoon Exp $
+
+--- z80-cpu.h.orig	2006-06-30 15:11:24.000000000 +0000
++++ z80-cpu.h
+@@ -22,13 +22,13 @@ extern bit  IFF3;      /* NMI has occure
+    m1       machine cycle one  (together with iorq acknowledges interrupt)
+    inter    maskable interrupt pending
+    halt     cpu in halt instruction
+-   wait     cpu in wait state
++   mywait   cpu in wait state
+    reset    cpu reset requested
+    rfsh     cpu signals memory refresh (if mreq is set)
+    busrq    external hardware requests bus control
+    busack   cpu acknowledges bus control
+ *********************/
+-enum cpu_control_pin { rd, wr, iorq, mreq, m1, inter, halt, wait, reset, rfsh,
++enum cpu_control_pin { rd, wr, iorq, mreq, m1, inter, halt, mywait, reset, rfsh,
+                        busrq, busack };
+ extern const bit cpu_pin[NO_CPU_CONTROL_PINS];
+