5 files changed, 93 insertions, 144 deletions

diff --git a/emulators/prodosemu/Makefile b/emulators/prodosemu/Makefile
index 12a576a54b00..7a564640d19e 100644
--- a/emulators/prodosemu/Makefile
+++ b/emulators/prodosemu/Makefile
@@ -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 --git a/emulators/prodosemu/files/patch-aa b/emulators/prodosemu/files/patch-aa
index d87f838b0e40..d5d0d1ffa7d0 100644
--- a/emulators/prodosemu/files/patch-aa
+++ b/emulators/prodosemu/files/patch-aa
@@ -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 --git a/emulators/prodosemu/files/patch-ab b/emulators/prodosemu/files/patch-ab
index 6ddbc455b235..fa7e24e8d6e6 100644
--- a/emulators/prodosemu/files/patch-ab
+++ b/emulators/prodosemu/files/patch-ab
@@ -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 --git a/emulators/prodosemu/files/patch-ac b/emulators/prodosemu/files/patch-ac
index 33770c325d83..ad709da0ae7f 100644
--- a/emulators/prodosemu/files/patch-ac
+++ b/emulators/prodosemu/files/patch-ac
@@ -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 --git a/emulators/prodosemu/pkg-plist b/emulators/prodosemu/pkg-plist
index 629ba76fa0d6..d11c8bdf6075 100644
--- a/emulators/prodosemu/pkg-plist
+++ b/emulators/prodosemu/pkg-plist
@@ -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