Date: Mon, 21 Aug 2000 09:22:40 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20752: Update port: emulators/prodosemu Message-ID: <20000821162240.D8A3737B43C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20752 >Category: ports >Synopsis: Update port: emulators/prodosemu >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 Aug 21 09:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Remove obsolete site form MASTER_SITES - Change location of data files from libdata/ to share/ >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/prodosemu/Makefile emulators/prodosemu/Makefile --- /usr/ports/emulators/prodosemu/Makefile Wed Apr 12 21:21:07 2000 +++ emulators/prodosemu/Makefile Tue Aug 15 08:36:20 2000 @@ -8,18 +8,14 @@ PORTNAME= prodosemu PORTVERSION= 0.1 CATEGORIES= emulators -MASTER_SITES= ftp://ftp.apple.asimov.net/pub/apple_II/emulators/prodosemu/ \ - ftp://apple2.caltech.edu/pub/apple2/emulators/ +MASTER_SITES= ftp://apple2.caltech.edu/pub/apple2/emulators/ DISTNAME= ${PORTNAME}.v${PORTVERSION} MAINTAINER= ports@FreeBSD.org NO_PACKAGE= yes RESTRICTED= apple.rom copyright is owned by Apple and cannot be distributed. -WRKSRC= ${WRKDIR}/prodosemu-v0.1 - -post-patch: - @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.c +WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION} post-install: .if !defined(NOPORTDOCS) diff -urN /usr/ports/emulators/prodosemu/patches/patch-aa emulators/prodosemu/patches/patch-aa --- /usr/ports/emulators/prodosemu/patches/patch-aa Sat Jan 22 22:15:50 2000 +++ emulators/prodosemu/patches/patch-aa Tue Aug 15 20:42:11 2000 @@ -1,89 +1,63 @@ -*** Makefile.orig Tue Jan 9 13:00:03 1996 ---- Makefile Mon Jan 10 04:44:20 2000 -*************** -*** 1,12 **** - # -! #Makefile for ProDOS Emulator v0.1 -! # - - all : prodos - - # Linux doesn't seem to like Randy Frank's beep code, - # if you're compiling on something else, you could try not defining NOBEEP -! OPT = -O2 -DNOBEEP - - # Necessary libraries - LIB = -lcurses -ltermcap ---- 1,23 ---- - # -! # Makefile for ProDOS Emulator v0.1 -! # FreeBSD modifications by Joel Sutton 18th Feb, 1997 -! -! # Paths to various places -! PREFIX?= /usr/local -! BINDIR= ${PREFIX}/bin -! LIBDIR= ${PREFIX}/libdata -! ROMDIR= ${LIBDIR}/apple2 -! ROM= prodos-2e.rom -! -! # Certain programs -! CC?= cc -! MKDIR?= mkdir -p - - all : prodos - - # Linux doesn't seem to like Randy Frank's beep code, - # if you're compiling on something else, you could try not defining NOBEEP -! OPT = ${CFLAGS} -DNOBEEP -DROMFILE=\"${ROMDIR}/${ROM}\" - - # Necessary libraries - LIB = -lcurses -ltermcap -*************** -*** 16,35 **** - - # Build modules from source: - main.o: main.c apple.h -! cc -c $(OPT) main.c - 6502.o: 6502.c apple.h -! cc -c $(OPT) 6502.c - mega2.o: mega2.c apple.h -! cc -c $(OPT) mega2.c - debug.o: debug.c apple.h -! cc -c $(OPT) debug.c - prodos.o: prodos.c apple.h -! cc -c $(OPT) prodos.c - - # Build the executale - prodos : $(OBJ) -! cc $(OPT) -o prodos $(OBJ) $(LIB) - - # Clean up - clean: -! rm *.o *~ ---- 27,52 ---- - - # Build modules from source: - main.o: main.c apple.h -! $(CC) -c $(OPT) main.c - 6502.o: 6502.c apple.h -! $(CC) -c $(OPT) 6502.c - mega2.o: mega2.c apple.h -! $(CC) -c $(OPT) mega2.c - debug.o: debug.c apple.h -! $(CC) -c $(OPT) debug.c - prodos.o: prodos.c apple.h -! $(CC) -c $(OPT) prodos.c - - # Build the executale - prodos : $(OBJ) -! $(CC) $(OPT) -o prodos $(OBJ) $(LIB) -! -! # Install the program -! install: all -! if [ ! -f ${ROMDIR} ]; then ${MKDIR} ${ROMDIR}; fi -! ${BSD_INSTALL_PROGRAM} prodos ${BINDIR} -! ${BSD_INSTALL_DATA} apple.rom ${ROMDIR}/${ROM} - - # Clean up - clean: -! rm *.o +--- Makefile.orig Tue Jan 9 13:00:03 1996 ++++ Makefile Tue Aug 15 20:34:22 2000 +@@ -1,12 +1,23 @@ + # +-#Makefile for ProDOS Emulator v0.1 +-# ++# Makefile for ProDOS Emulator v0.1 ++# FreeBSD modifications by Joel Sutton 18th Feb, 1997 ++ ++# Paths to various places ++PREFIX?= /usr/local ++BINDIR= ${PREFIX}/bin ++LIBDIR= ${PREFIX}/share ++ROMDIR= ${LIBDIR}/apple2 ++ROM= prodos-2e.rom ++ ++# Certain programs ++CC?= cc ++MKDIR?= mkdir -p + + all : prodos + + # Linux doesn't seem to like Randy Frank's beep code, + # if you're compiling on something else, you could try not defining NOBEEP +-OPT = -O2 -DNOBEEP ++OPT = ${CFLAGS} -DNOBEEP -DROMFILE=\"${ROMDIR}/${ROM}\" + + # Necessary libraries + LIB = -lcurses -ltermcap +@@ -16,20 +27,26 @@ + + # Build modules from source: + main.o: main.c apple.h +- cc -c $(OPT) main.c ++ $(CC) -c $(OPT) main.c + 6502.o: 6502.c apple.h +- cc -c $(OPT) 6502.c ++ $(CC) -c $(OPT) 6502.c + mega2.o: mega2.c apple.h +- cc -c $(OPT) mega2.c ++ $(CC) -c $(OPT) mega2.c + debug.o: debug.c apple.h +- cc -c $(OPT) debug.c ++ $(CC) -c $(OPT) debug.c + prodos.o: prodos.c apple.h +- cc -c $(OPT) prodos.c ++ $(CC) -c $(OPT) prodos.c + + # Build the executale + prodos : $(OBJ) +- cc $(OPT) -o prodos $(OBJ) $(LIB) ++ $(CC) $(OPT) -o prodos $(OBJ) $(LIB) ++ ++# Install the program ++install: all ++ if [ ! -f ${ROMDIR} ]; then ${MKDIR} ${ROMDIR}; fi ++ ${BSD_INSTALL_PROGRAM} prodos ${BINDIR} ++ ${BSD_INSTALL_DATA} apple.rom ${ROMDIR}/${ROM} + + # Clean up + clean: +- rm *.o *~ ++ rm *.o diff -urN /usr/ports/emulators/prodosemu/patches/patch-ab emulators/prodosemu/patches/patch-ab --- /usr/ports/emulators/prodosemu/patches/patch-ab Mon Jul 7 20:22:08 1997 +++ emulators/prodosemu/patches/patch-ab Tue Aug 15 20:42:29 2000 @@ -1,21 +1,12 @@ -diff -rc prodosemu-v0.1/apple.h prodosemu/apple.h -*** apple.h Tue Jan 9 15:00:03 1996 ---- apple.h Tue Feb 18 07:02:04 1997 -*************** -*** 18,25 **** - #endif - - #ifndef CBREAK -! /*#include <sgtty.h>*/ -! #include <bsd/sgtty.h> - #endif - - #ifndef TIOCGETP ---- 18,24 ---- - #endif - - #ifndef CBREAK -! #include <sgtty.h> - #endif - - #ifndef TIOCGETP +--- apple.h.orig Tue Jan 9 13:00:03 1996 ++++ apple.h Tue Aug 15 20:34:22 2000 +@@ -18,8 +18,7 @@ + #endif + + #ifndef CBREAK +-/*#include <sgtty.h>*/ +-#include <bsd/sgtty.h> ++#include <sgtty.h> + #endif + + #ifndef TIOCGETP diff -urN /usr/ports/emulators/prodosemu/patches/patch-ac emulators/prodosemu/patches/patch-ac --- /usr/ports/emulators/prodosemu/patches/patch-ac Sat Jan 22 22:15:50 2000 +++ emulators/prodosemu/patches/patch-ac Tue Aug 15 20:42:40 2000 @@ -1,26 +1,14 @@ -*** main.c.orig Tue Jan 9 13:00:03 1996 ---- main.c Sun Jan 9 06:47:30 2000 -*************** -*** 9,16 **** - - #include "apple.h" - #include <curses.h> - #define REF_DELAY 2000 -! #define ROMFILE "apple.rom" - - extern char prodosroot[]; - ---- 9,21 ---- - - #include "apple.h" - #include <curses.h> -+ - #define REF_DELAY 2000 -! -! /* Where is the default rom file?? */ -! #ifndef ROMFILE -! #define ROMFILE "%%PREFIX%%/libdata/apple2/prodos-2e.rom" -! #endif - - extern char prodosroot[]; - +--- main.c.orig Tue Jan 9 13:00:03 1996 ++++ main.c Tue Aug 15 20:41:41 2000 +@@ -10,7 +10,11 @@ + #include "apple.h" + #include <curses.h> + #define REF_DELAY 2000 ++ ++/* Where is the default rom file?? */ ++#ifndef ROMFILE + #define ROMFILE "apple.rom" ++#endif + + extern char prodosroot[]; + diff -urN /usr/ports/emulators/prodosemu/pkg/PLIST emulators/prodosemu/pkg/PLIST --- /usr/ports/emulators/prodosemu/pkg/PLIST Sat Jan 22 22:15:51 2000 +++ emulators/prodosemu/pkg/PLIST Tue Aug 15 08:33:45 2000 @@ -1,5 +1,5 @@ bin/prodos -libdata/apple2/prodos-2e.rom +share/apple2/prodos-2e.rom share/doc/prodosemu/README @dirrm share/doc/prodosemu -@dirrm libdata/apple2 +@dirrm share/apple2 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000821162240.D8A3737B43C>