From owner-freebsd-ports Mon Nov 15 10:20:19 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 5877714D7D for ; Mon, 15 Nov 1999 10:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA11405; Mon, 15 Nov 1999 10:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A890A14C57; Mon, 15 Nov 1999 10:15:06 -0800 (PST) Message-Id: <19991115181506.A890A14C57@hub.freebsd.org> Date: Mon, 15 Nov 1999 10:15:06 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/14903: Update port: emulators/cpmemu to 0.2.1.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14903 >Category: ports >Synopsis: Update port: emulators/cpmemu to 0.2.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 15 10:20:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Updated version 0.2.1 to 0.2.1.1 * Added MetaLab(sunsite) mirror to MASTER_SITES * Fixed some files to respect CFLAGS properly New file: patches/patch-ab patches/patch-ac patches/patch-ad patches/patch-ae Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/cpmemu/Makefile emulators/cpmemu/Makefile --- /usr/ports/emulators/cpmemu/Makefile Sun Nov 14 21:12:55 1999 +++ emulators/cpmemu/Makefile Tue Nov 16 00:52:25 1999 @@ -1,25 +1,23 @@ # New ports collection makefile for: cpm-emulator -# Version required: 0.2.1 +# Version required: 0.2.1.1 # Date created: 28 June 1995 # Whom: janek@gaja.ipan.lublin.pl # -# $FreeBSD: ports/emulators/cpmemu/Makefile,v 1.15 1999/11/14 03:07:58 steve Exp $ +# $FreeBSD: ports/emulators/cpmemu/Makefile,v 1.13 1999/08/28 16:50:28 cpiazza Exp $ # DISTNAME= cpm-0.2.1 -PKGNAME= cpmemu-0.2.1 +PKGNAME= cpmemu-0.2.1.1 CATEGORIES= emulators -MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/slackware-4.0/source/extra-stuff/CPM-80-emulator/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} \ + ftp://ftp.cdrom.com/pub/linux/slackware-4.0/source/extra-stuff/CPM-80-emulator/ +MASTER_SITE_SUBDIR= system/emulators -MAINTAINER= ports@FreeBSD.org +PATCH_SITES= ${MASTER_SITE_SUNSITE} +PATCH_SITE_SUBDIR= system/emulators +PATCHFILES= cpm-0.2.1-glibc-rjm.patch.gz +PATCH_DIST_STRIP= -p1 -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 +MAINTAINER= ports@FreeBSD.org .include diff -urN /usr/ports/emulators/cpmemu/files/md5 emulators/cpmemu/files/md5 --- /usr/ports/emulators/cpmemu/files/md5 Mon Aug 30 21:44:46 1999 +++ emulators/cpmemu/files/md5 Mon Nov 15 09:00:00 1999 @@ -1 +1,2 @@ MD5 (cpm-0.2.1.tar.gz) = b6aa29c7164e10c2a0ad2f4ac72c3a83 +MD5 (cpm-0.2.1-glibc-rjm.patch.gz) = 029b902a7a59239182ea264e02e33345 diff -urN /usr/ports/emulators/cpmemu/patches/patch-aa emulators/cpmemu/patches/patch-aa --- /usr/ports/emulators/cpmemu/patches/patch-aa Mon Aug 30 21:44:46 1999 +++ emulators/cpmemu/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,61 +0,0 @@ ---- Makefile.orig Wed Mar 4 04:12:02 1998 -+++ Makefile Fri Aug 27 14:27:33 1999 -@@ -1,9 +1,8 @@ --CPMLIBDIR = /usr/local/lib/cpm - CFLAGS = -O2 -pipe -ansi -Wall -Wshadow -Wpointer-arith -Wcast-qual \ - -Wcast-align -Waggregate-return \ - -Wstrict-prototypes -Wmissing-prototypes \ -- -Wnested-externs -Wwrite-strings -g -DCPMLIBDIR=\"$(CPMLIBDIR)\" --LDFLAGS = -s -N -+ -Wnested-externs -Wwrite-strings -g -DCPMLIBDIR=\"$(PREFIX)/share/cpm\" -+LDFLAGS = -s - OBJS = single.o z80emu.o em.o io.o bios.o \ - commands.o running.o main.o disneu.o disz80.o low.o - # old: z80out.o -@@ -21,7 +20,10 @@ - single.o: single.S code.s loads.s code2.s codeix.s codeiy.s - - cpm: $(OBJS) -- gcc $(LDFLAGS) -o cpm $(OBJS) -+ $(CC) $(LDFLAGS) -o cpm $(OBJS) -+ -+format: format.o -+ $(CC) $(LDFLAGS) -o format format.o - - clean: - rm -f *~ loads.s makeloads *.o $(TARGETS) ---- bios.c.orig Wed Mar 4 04:12:45 1998 -+++ bios.c Fri Aug 27 14:02:20 1999 -@@ -227,7 +227,7 @@ - case BIOS: /* System Reset (coldboot) */ - case DIRBUF-20: - if (!silent_exit) -- printf("\nCp/M BIOS COLDBOOT takes you back to Linux\n"); -+ printf("\nCp/M BIOS COLDBOOT takes you back to FreeBSD\n"); - exit(0); - case BIOS+3: /* System Reset (warmboot) */ - case DIRBUF-19: ---- io.c.orig Tue Jun 21 13:25:46 1994 -+++ io.c Fri Aug 27 14:03:37 1999 -@@ -13,7 +13,7 @@ - /*****************************************************************************/ - #include "cpmemu.h" - --#define HAVE_RAW_IO -+#undef HAVE_RAW_IO - - /* magic for character I/O */ - #include ---- low.c.orig Tue Jun 21 13:17:08 1994 -+++ low.c Fri Aug 27 14:04:28 1999 -@@ -67,10 +67,8 @@ - - /* get access to sound port */ - cptr = NULL; -- if (ioperm(0x61, 1, 1)) { - hardware_access = 0; /* no access to speaker port */ - return; -- } - - /* install signal handler */ - sa.sa_handler = tickerint; diff -urN /usr/ports/emulators/cpmemu/patches/patch-ab emulators/cpmemu/patches/patch-ab --- /usr/ports/emulators/cpmemu/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ emulators/cpmemu/patches/patch-ab Mon Nov 15 09:00:00 1999 @@ -0,0 +1,52 @@ +--- Makefile.orig Mon Nov 15 06:49:52 1999 ++++ Makefile Mon Nov 15 06:54:21 1999 +@@ -2,26 +2,26 @@ + + + # basic prefix for installation +-PREFIX = /usr/local ++PREFIX ?= /usr/local + + # where to install `cpm' executable. + BINDIR = $(PREFIX)/bin + + # where `cpm' looks for its files (cpm.sys and .com files). +-CPMLIBDIR = $(PREFIX)/lib/cpm ++CPMLIBDIR = $(PREFIX)/share/cpm + + + # You shouldn't need to edit below this line. + +-CC = gcc ++CC ?= gcc + +-CFLAGS = -O2 -pipe -ansi -Wall \ ++CFLAGS += -ansi -Wall \ + -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \ + -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Wwrite-strings \ + -DCPMLIBDIR=\"$(CPMLIBDIR)\" + +-LDFLAGS = -s ++LDFLAGS += -s + + OBJS = single.o z80emu.o em.o io.o bios.o \ + commands.o running.o main.o disneu.o disz80.o low.o +@@ -42,11 +42,14 @@ + cpm: $(OBJS) + $(CC) $(LDFLAGS) -o cpm $(OBJS) + ++format: format.o ++ $(CC) $(LDFLAGS) -o format format.o ++ + clean: + rm -f *~ loads.s makeloads *.o $(TARGETS) + + install: all +- install -m 511 cpm $(BINDIR) ++ ${BSD_INSTALL_PROGRAM} cpm $(BINDIR)/cpmemu ++ ${BSD_INSTALL_PROGRAM} format $(BINDIR)/cpmformat + -mkdir $(CPMLIBDIR) +- chmod 755 $(CPMLIBDIR) +- install -m 444 z80-binaries/* $(CPMLIBDIR) ++ ${BSD_INSTALL_DATA} z80-binaries/* $(CPMLIBDIR) diff -urN /usr/ports/emulators/cpmemu/patches/patch-ac emulators/cpmemu/patches/patch-ac --- /usr/ports/emulators/cpmemu/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ emulators/cpmemu/patches/patch-ac Mon Nov 15 09:00:00 1999 @@ -0,0 +1,11 @@ +--- bios.c.orig Mon Nov 15 06:33:54 1999 ++++ bios.c Mon Nov 15 06:39:55 1999 +@@ -227,7 +227,7 @@ + case BIOS: /* System Reset (coldboot) */ + case DIRBUF-20: + if (!silent_exit) +- printf("\nCp/M BIOS COLDBOOT takes you back to Linux\n"); ++ printf("\nCp/M BIOS COLDBOOT takes you back to FreeBSD\n"); + exit(0); + case BIOS+3: /* System Reset (warmboot) */ + case DIRBUF-19: diff -urN /usr/ports/emulators/cpmemu/patches/patch-ad emulators/cpmemu/patches/patch-ad --- /usr/ports/emulators/cpmemu/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ emulators/cpmemu/patches/patch-ad Mon Nov 15 09:00:00 1999 @@ -0,0 +1,11 @@ +--- io.c.orig Wed Jun 22 03:25:46 1994 ++++ io.c Mon Nov 15 06:31:36 1999 +@@ -13,7 +13,7 @@ + /*****************************************************************************/ + #include "cpmemu.h" + +-#define HAVE_RAW_IO ++#undef HAVE_RAW_IO + + /* magic for character I/O */ + #include diff -urN /usr/ports/emulators/cpmemu/patches/patch-ae emulators/cpmemu/patches/patch-ae --- /usr/ports/emulators/cpmemu/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ emulators/cpmemu/patches/patch-ae Mon Nov 15 09:00:00 1999 @@ -0,0 +1,21 @@ +--- low.c.orig Mon Nov 15 06:33:54 1999 ++++ low.c Mon Nov 15 06:41:26 1999 +@@ -21,7 +21,6 @@ + #include "cpmemu.h" + #include + #include +-#include /* needed for ioperm() -rjm */ + #include + #include + #include +@@ -88,10 +87,8 @@ + + /* get access to sound port */ + cptr = NULL; +- if (ioperm(0x61, 1, 1)) { + hardware_access = 0; /* no access to speaker port */ + return; +- } + + /* install signal handler */ + sa.sa_handler = tickerint; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message