4 files changed, 21 insertions, 111 deletions

diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index c96beffc0de5..da8a769655c4 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -1,18 +1,25 @@
 # New ports collection makefile for:	cpm-emulator
-# Version required:	0.2
+# Version required:	0.2.1
 # Date created:		28 June 1995
 # Whom:			janek@gaja.ipan.lublin.pl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cpm-0.2
-PKGNAME=	cpmemu-0.2
+DISTNAME=	cpm-0.2.1
+PKGNAME=	cpmemu-0.2.1
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/linux/slackware-3.2/source/extra-stuff/CPM-80-emulator/
-
-BROKEN_ELF=	yes
+MASTER_SITES=	ftp://ftp.cdrom.com/pub/linux/slackware/source/extra-stuff/CPM-80-emulator/
 
 MAINTAINER=	ports@FreeBSD.org
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cpm ${PREFIX}/bin/cpmemu
+	${INSTALL_PROGRAM} ${WRKSRC}/format ${PREFIX}/bin/cpmformat
+	${MKDIR} ${PREFIX}/share/cpm
+	${INSTALL_DATA} ${WRKSRC}/z80-binaries/cpm.sys ${PREFIX}/share/cpm
+	${INSTALL_DATA} ${WRKSRC}/z80-binaries/cd.com ${PREFIX}/share/cpm
+	${INSTALL_DATA} ${WRKSRC}/z80-binaries/link.com ${PREFIX}/share/cpm
+	${INSTALL_DATA} ${WRKSRC}/z80-binaries/xccp.com ${PREFIX}/share/cpm
+
 .include <bsd.port.mk>
diff --git a/emulators/cpmemu/distinfo b/emulators/cpmemu/distinfo
index 2aded555c1aa..6acaef148c8b 100644
--- a/emulators/cpmemu/distinfo
+++ b/emulators/cpmemu/distinfo
@@ -1 +1 @@
-MD5 (cpm-0.2.tar.gz) = b99db60568b9259989b4a90e7d851474
+MD5 (cpm-0.2.1.tar.gz) = b6aa29c7164e10c2a0ad2f4ac72c3a83
diff --git a/emulators/cpmemu/pkg-descr b/emulators/cpmemu/pkg-descr
index a29c9aaca028..63eea9037104 100644
--- a/emulators/cpmemu/pkg-descr
+++ b/emulators/cpmemu/pkg-descr
@@ -1,106 +1,7 @@
-%
-%  Time-stamp: <06/06/94 23:08:26 Michael Bischoff moulder>
-%
-% CP/M emulator README
-%
-
-Introduction:
-=============
+A CPM emulator.
 
 Type 'UNIX' at the CCP prompt to leave the emulator.
 (Or ctrl-@, followed by 'q' any time the keyboard is polled)
 
-
 WARNING! This software runs only on 386 compatible processors
 and systems which allow nonaligned word/dword memory access.
-
-WARNING! This software has no documentation. If you want to use it, you're
-probably a Real Programmer; and Real Programmers don't read documentation.
-
-WARNING! This software is supplied AS IS. There is No Warranty!
-
-The software emulates an Intel 8080 CPU (quite accurate,
-except for the halfcarry flag for a couple of instructions)
-and a lot of Zilog Z80 instructions (not the complete set).
-Unimplemented instructions are input/output commands (IN A,(nn); OUT (nn),A;
-  INI, OUTI, INIR, OTIR, IND, OUTD, INDR, OTDR, IN C,(r), OUT r,(C)), and
-interrupt mode commands (IM 0, IM 1, IM 2, RETN, RETI), and the refresh
-register doesn't count at all.
-
-A 486DX2-66 emulates a Z80 clocked at 22 MHz, a 386DX-33 simulates a 6MHz
-Z80. (approximately)
-
-
-The BDOS emulator does only provide
-- user 0
-- a single drive (A:)
-- access to lowercase-files.
-
-A CCP-lookalike command interpreter is provided and the BDOS
-is emulated. The CCP is stored in the file /usr/local/lib/cpm/cpm.sys.
-Any CP/M .COM-files may also go in the directory /usr/local/lib/cpm.
-
-If you have an original CP/M, with CCP-address e800, BDOS-address f006,
-and put it in the file /usr/local/lib/cpm/cpm.sys, you can have an
-emulator quite near to the original thing, using the -e option.
-The -e option tells the emulator to use the BDOS from cpm.sys,
-instead of catching the BDOS-calls.
-Pros:
-- a real CP/M running
-- access to CP/M-formatted floppies (you have to set the DPB correctly)
-  Try "cpm -e -i /dev/fd1" with a 800 KB CP/M floppy in B:
-	 (bls = 2K, drm = 255)
-  after setting setfdprm -p /dev/fd1 800/1200 or the like.
-
-Cons:
-- no access to the Linux filesystem
-
-
-About the emulator:
-===================
-
-Type "cpm -h" for a short usage message.
-You can interrupt the emulator by typing ctrl-@. This will enter
-the debug mode, where you can disassemble z80 memory, dump memory,
-edit data, set listpoints, breakpoints, set counts for breakpoints
-and the like. Type '?' for a short summary.
-
-
-extensions:
-BDOS:
- there is a new BDOS function (41), "change directory"
- and a CP/M program CD.COM which calls this function.
-
-CCP:
- ERA understands the /Q option (question!)
- Example: ERA *.*/Q
- TYPE understands the /W option (wait!)
- Example: TYPE TEST.TXT/W
- You can access files from other user numbers (image mode only)
- Example: ERA *.BAS/2
-
- Again: Type UNIX to leave the Emulator.
-
-
-
-TODO:
-=====
-- Improve the emulation of BDOS
-- Allow multiple drives (some as CP/M filesystem images?)
-- implement interrupt modes / signal catching to simulate NMI, INT
-- improve the accuracy of the emulator (but; after all, a Z80 isn't
-  8080-compatible as well; the sequence
-	XOR A
-	DEC A
-	JP PO,Z80_installed
-	/* an 8080, if we are here */
-  will find out...
-- merge the code with xtrs-80, to play GALAXY again!
-
-
-BUGS:
-=====
-
-Surely there are LOTS of bugs. Please send fixes to mbi@mo.math.nat.tu-bs.de
-Bug reports (without fixes) are also accepted, but it would be nice if you
-could track down the bad opcode.
diff --git a/emulators/cpmemu/pkg-plist b/emulators/cpmemu/pkg-plist
index 66ebe8083f03..513931c3edb3 100644
--- a/emulators/cpmemu/pkg-plist
+++ b/emulators/cpmemu/pkg-plist
@@ -1,5 +1,7 @@
 bin/cpmemu
-lib/cpm/cpm.sys
-lib/cpm/cd.com
-lib/cpm/link.com
-lib/cpm/xccp.com
+bin/cpmformat
+share/cpm/cpm.sys
+share/cpm/cd.com
+share/cpm/link.com
+share/cpm/xccp.com
+@dirrm share/cpm