10 files changed, 93 insertions, 220 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 6ca5f4873c0b..196110323de7 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -6,72 +6,58 @@
 #
 
 PORTNAME=	atari800
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.signus.demon.co.uk/Software/Portable/Atari800e/ \
-		http://cas3.zlin.vutbr.cz/~stehlik/a800/
-DISTNAME=	Atari800-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
+MASTER_SITES=	ftp://ftp.sophics.cz/pub/Atari800/src/ \
+		http://joy.sophics.cz/www/
+DISTFILES=	a800s${PORTVERSION:S/.//g}.zip xf25.zip
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	a800s${PORTVERSION:S/.//g}.zip
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
+NO_PACKAGE=	${RESTRICTED}
 
-DIST_SUBDIR=	atari
-EXTRA_FILES=	xf25.zip
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+WRKSRC=		${WRKDIR}/Atari800-${PORTVERSION}/src
+USE_ZIP=	yes
+USE_XLIB=	yes
+USE_GMAKE=	yes
 
-ALL_TARGET=	freebsd-x11
+.if defined(WITH_SHM)
+ALL_TARGET=	x11-shm
+.else
+ALL_TARGET=	x11
+.endif
 
-RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
-NO_PACKAGE=	${RESTRICTED}
+MAN1=		atari800.1
 
-ATARI_DOC=	${PREFIX}/share/doc/atari
+ATARI_LIB=	${PREFIX}/share/${PKGBASE}
 ATARI_XF=	ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
 		demos2.xfd dos25.xfd mydos45d.atr
-ATARI_LIB=	${PREFIX}/share/atari
-SED_CONFIG=	${ATARI_LIB:S/\//\\\//g}
-DOC_FILES=	BUGS CHANGES CREDITS INSTALL README TODO USAGE
-
-MAN1=		atari800.1
+ATARI_DOC=	${PREFIX}/share/doc/${PKGBASE}
+DOC_FILES=	BUGS CHANGES CREDITS FAQ INSTALL README TODO USAGE
 
 post-extract:
-	@${ECHO_MSG} "===>  Unzipping ROM files"
-	unzip -q -L -o ${_DISTDIR}/${EXTRA_FILES} ${ATARI_XF} -d ${WRKSRC}
-	@${ECHO_MSG} "===>  Processing configuration file"
-	${SED} "s/GUMBY/${SED_CONFIG}/g" < ${FILESDIR}/atari800.cfg \
-		> ${WRKSRC}/atari800.cfg
-
-	@${ECHO_MSG} "===>  Copying config.h to work directory"
-	${CP} ${FILESDIR}/config.h ${WRKSRC}
-
-	@${ECHO_MSG} "===>  Copying UNIX makefile"
-	${CP} ${WRKSRC}/Makefile.unix ${WRKSRC}/Makefile
+	@unzip -q -L -o ${_DISTDIR}/xf25.zip ${ATARI_XF} -d ${WRKSRC}
 
 post-patch:
-	@${ECHO_MSG} "===>  Processing another configuration file"
-	${CP} ${WRKSRC}/rt-config.c ${WRKSRC}/rt-config.c.temp
-	${SED} "s/GUMBY/${SED_CONFIG}/g" <${WRKSRC}/rt-config.c.temp \
-		> ${WRKSRC}/rt-config.c
+	@${LN} -sf Makefile.unix ${WRKSRC}/Makefile
+	@${CP} ${FILESDIR}/config.h ${WRKSRC}
+	@${TOUCH} ${WRKSRC}/.atari800
+	@${SED} -e 's:GUMBY:${ATARI_LIB}:g' \
+		${FILESDIR}/atari800.cfg > ${WRKSRC}/atari800.cfg
 
-# Install roms, extra docs and config file.
-#
 post-install:
-	@${ECHO_MSG} "===>  Installing files from xf25.zip"
-	-${MKDIR} ${ATARI_LIB}
+	@${MKDIR} ${ATARI_LIB}
+	${INSTALL_DATA} -m 664 ${WRKSRC}/atari800.cfg ${ATARI_LIB}
 .for file in ${ATARI_XF}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${ATARI_LIB}
 .endfor
-
-	@${ECHO_MSG} "===>  Installing configuration file"
-	${INSTALL_DATA} -m 664 ${WRKSRC}/atari800.cfg ${ATARI_LIB}
-
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===>  Installing distribution document files"
-	-${MKDIR} ${ATARI_DOC}
+	@${MKDIR} ${ATARI_DOC}
 .for file in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${ATARI_DOC}
+	${INSTALL_DATA} ${WRKSRC}/../DOC/${file} ${ATARI_DOC}
 .endfor
 	${INSTALL_DATA} ${DESCR} ${ATARI_DOC}/README.FreeBSD
 .endif
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index 76a5c4bf200c..c901147992ea 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,2 +1,2 @@
-MD5 (atari/Atari800-0.8.6.tar.gz) = 1e84ececd9b68684ebebf236647d6d68
-MD5 (atari/xf25.zip) = 4dc3b6b4313e9596c4d474785a37b94d
+MD5 (atari800/a800s107.zip) = 83dd41e8f2e90737627ac0c9484bd621
+MD5 (atari800/xf25.zip) = 4dc3b6b4313e9596c4d474785a37b94d
diff --git a/emulators/atari800/files/atari800.cfg b/emulators/atari800/files/atari800.cfg
index fb85692e7271..446241cc465a 100644
--- a/emulators/atari800/files/atari800.cfg
+++ b/emulators/atari800/files/atari800.cfg
@@ -1,4 +1,4 @@
-Atari 800 Emulator, Version 0.8.0
+Atari 800 Emulator
 OS/A_ROM=
 OS/B_ROM=GUMBY/atariosb.rom
 XL/XE_ROM=GUMBY/atarixl.rom
@@ -16,5 +16,5 @@ DEFAULT_SYSTEM=Atari XL
 DEFAULT_TV_MODE=PAL
 HOLD_OPTION=0
 ENABLE_C000_RAM=0
+ENABLE_ROM_PATCH=1
 ENABLE_SIO_PATCH=1
-ENABLE_XCOLPF1=0
diff --git a/emulators/atari800/files/patch-aa b/emulators/atari800/files/patch-aa
index d10b78b80558..afce41daf337 100644
--- a/emulators/atari800/files/patch-aa
+++ b/emulators/atari800/files/patch-aa
@@ -1,60 +1,44 @@
---- Makefile.unix	Sat Feb 21 10:39:13 1998
-+++ Makefile	Wed Nov  8 01:54:54 2000
-@@ -4,14 +4,14 @@
- #       if they cause a problem on your system.
- #
- 
--CC		= gcc
-+CC		?= gcc
- CPPFLAGS	= $(OTHER)
--CFLAGS		= -c -O6 -DGNU_C
--LD		= gcc
-+CFLAGS		+= -c -DGNU_C
-+LD		= $(CC)
- LDFLAGS		=
- LDLIBS		= -lm
+--- Makefile.unix.orig	Wed Apr  4 07:35:36 2001
++++ Makefile.unix	Wed May 23 23:29:50 2001
+@@ -1,11 +1,11 @@
+ # $Id: Makefile.unix,v 1.5 2001/04/04 05:35:36 knik Exp $
+ 
+-CC = gcc
++CC ?= gcc
+ EXE=
+-CFLAGS = -O2 -Wall
+-DEFS = 
++CFLAGS ?= -O2 -Wall
++DEFS = -DDEFAULT_CFG_PATH=\\"\"${PREFIX}/share/atari800/atari800.cfg\\"\"
  
 -PREFIX		= /usr/local
-+PREFIX?=	  /usr/local
++PREFIX		?= /usr/local
  BIN_PATH	= ${PREFIX}/bin
  LIB_PATH	= ${PREFIX}/lib
  MAN_PATH	= ${PREFIX}/man
-@@ -195,16 +195,16 @@
- 		OBJ="atari_curses.o"
- 
- freebsd-x11 :
--	make atari800 \
--		CPPFLAGS="-I/usr/X11R6/include" \
--		LDFLAGS="-L/usr/X11R6/lib" \
-+	$(MAKE) atari800 \
-+		CPPFLAGS="-I${X11BASE}/include" \
-+		LDFLAGS="-L${X11BASE}/lib" \
- 		LDLIBS="-lX11 -lm" \
- 		OBJ="atari_x11.o"
- 
- freebsd-x11-shm :
--	make atari800 \
--		CPPFLAGS="-I/usr/X11R6/include -DSHM" \
--		LDFLAGS="-L/usr/X11R6/lib" \
-+	$(MAKE) atari800 \
-+		CPPFLAGS="-I${X11BASE}/include -DSHM" \
-+		LDFLAGS="-L${X11BASE}/lib" \
- 		LDLIBS="-lX11 -lXext -lm" \
- 		OBJ="atari_x11.o"
- 
-@@ -246,7 +246,6 @@
- 			platform.h
- 
- config config.h	:	configure
--	./configure
- 
- configure	:	configure.o prompts.o
- 	$(LD) $(LDFLAGS) configure.o prompts.o $(LDLIBS) -o configure
-@@ -348,5 +347,5 @@
- 	chmod 4755 ${BIN_PATH}/atari800
+@@ -72,13 +72,13 @@
+ 
+ x11:
+ 	$(MAKE) $(TARGET) DEFS="$(DEFS) -DX11" OBJ="$(OBJ) $(XOBJ)" \
+-		INCLUDE="$(INCLUDE) -I/usr/X11R6/include" \
+-		LIBS="-L/usr/X11/lib -L/usr/X11R6/lib $(LIBS) -lX11"
++		INCLUDE="$(INCLUDE) -I${X11BASE}/include" \
++		LIBS="-L${X11BASE}/lib $(LIBS) -lX11"
+ 
+ x11-shm:
+ 	$(MAKE) $(TARGET) DEFS="$(DEFS) -DX11 -DSHM" OBJ="$(OBJ) $(XOBJ)" \
+-		INCLUDE="$(INCLUDE) -I/usr/X11R6/include" \
+-		LIBS="-L/usr/X11/lib -L/usr/X11R6/lib $(LIBS) -lX11 -lXext"
++		INCLUDE="$(INCLUDE) -I${X11BASE}/include" \
++		LIBS="-L${X11BASE}/lib $(LIBS) -lX11 -lXext"
+ 
+ hp9000-ansic-x11:
+ 	$(MAKE) $(TARGET) \
+@@ -113,5 +113,5 @@
+ 	chmod 4755 ${BIN_PATH}/$(TARGET)
  
  install :
--	cp atari800 ${BIN_PATH}/atari800
+-	cp atari800 ${BIN_PATH}/$(TARGET)
 -	cp atari800.man ${MAN_PATH}/man1/atari800.1
-+	${BSD_INSTALL_PROGRAM} atari800 ${BIN_PATH}/atari800
++	${BSD_INSTALL_PROGRAM} atari800 ${BIN_PATH}/$(TARGET)
 +	${BSD_INSTALL_MAN} atari800.man ${MAN_PATH}/man1/atari800.1
diff --git a/emulators/atari800/files/patch-ab b/emulators/atari800/files/patch-ab
deleted file mode 100644
index 12b39bf31bdf..000000000000
--- a/emulators/atari800/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- prompts.c.orig	Thu Jun 18 20:20:15 1998
-+++ prompts.c	Thu Jun 18 20:22:22 1998
-@@ -10,7 +10,7 @@
- 	char gash[128];
- 
- 	printf(message, string);
--	gets(gash);
-+	fgets(gash,128,stdin);
- 	if (strlen(gash) > 0)
- 		strcpy(string, gash);
- }
-@@ -20,7 +20,7 @@
- 	char gash[128];
- 
- 	printf(message, *num);
--	gets(gash);
-+	fgets(gash,128,stdin);
- 	if (strlen(gash) > 0)
- 		sscanf(gash, "\n%d", num);
- }
-@@ -32,7 +32,7 @@
- 
- 	do {
- 		printf(message, *yn);
--		gets(gash);
-+		fgets(gash,128,stdin);
- 
- 		if (strlen(gash) > 0)
- 			t_yn = gash[0];
diff --git a/emulators/atari800/files/patch-ac b/emulators/atari800/files/patch-ac
deleted file mode 100644
index e82785f41efc..000000000000
--- a/emulators/atari800/files/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
---- monitor.c.orig	Sun Feb 22 02:19:59 1998
-+++ monitor.c	Thu Jun 18 21:05:50 1998
-@@ -94,10 +94,13 @@
- 
- 		printf("> ");
- 		fflush(stdout);
--		if (gets(s) == NULL) {
-+		if (fgets(s,256,stdin) == NULL) {
- 			printf("\n> CONT\n");
- 			strcpy(s, "CONT");
- 		}
-+
-+		s[strlen(s)-1]='\0';                /* fgets provision */
-+
- 		t = get_token(s);
- 		if (t == NULL) {
- 			continue;
-@@ -179,7 +182,7 @@
- 					char gash[4];
- 
- 					printf("Press return to continue: ");
--					gets(gash);
-+					fgets(gash,4,stdin);
- 					nlines = 0;
- 				}
- 			}
diff --git a/emulators/atari800/files/patch-ad b/emulators/atari800/files/patch-ad
deleted file mode 100644
index cc8d4527a87f..000000000000
--- a/emulators/atari800/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** sound.c.orig	Thu Jun 18 21:57:09 1998
---- sound.c	Thu Jun 18 21:57:30 1998
-***************
-*** 5,11 ****
-  #ifdef VOXWARE
-  #include <fcntl.h>
-  #include <sys/ioctl.h>
-! #include <sys/soundcard.h>
-  
-  #include "pokey11.h"
-  
---- 5,11 ----
-  #ifdef VOXWARE
-  #include <fcntl.h>
-  #include <sys/ioctl.h>
-! #include <machine/soundcard.h>
-  
-  #include "pokey11.h"
-  
diff --git a/emulators/atari800/files/patch-ae b/emulators/atari800/files/patch-ae
deleted file mode 100644
index 4b8301709ead..000000000000
--- a/emulators/atari800/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-*** rt-config.c.orig	Wed Jul  1 19:55:57 1998
---- rt-config.c	Wed Jul  1 19:56:17 1998
-***************
-*** 32,38 ****
-  int enable_xcolpf1;
-  
-  static char *rtconfig_filename1 = "atari800.cfg";
-! static char *rtconfig_filename2 = "/etc/atari800.cfg";
-  
-  int RtConfigLoad(char *rtconfig_filename)
-  {
---- 32,38 ----
-  int enable_xcolpf1;
-  
-  static char *rtconfig_filename1 = "atari800.cfg";
-! static char *rtconfig_filename2 = "GUMBY/atari800.cfg";
-  
-  int RtConfigLoad(char *rtconfig_filename)
-  {
diff --git a/emulators/atari800/pkg-descr b/emulators/atari800/pkg-descr
index 208344253afe..b66c840baca9 100644
--- a/emulators/atari800/pkg-descr
+++ b/emulators/atari800/pkg-descr
@@ -1,22 +1,17 @@
 You've found David Firth's Atari 800 emulator which can emulate the
 8-bit Atari 800 and XL series of home computers. 
 
-Please refer to /usr/local/share/doc/atari (or equivalent on your
+Please refer to /usr/local/share/doc/atari800 (or equivalent on your
 system) for the distribution documents. A man page has also been
 installed. The system wide configuration file can be found at
-/usr/local/lib/atari/atari800.cfg (or similar) which you will probably
+/usr/local/share/atari800/atari800.cfg (or similar) which you will probably
 want to copy to your home directory, at some stage, to personalise the
 settings.
 
-If you're at all serious about your emulator then you SHOULD check out
-these URL's in the order they're written:
-
-  http://cas3.zlin.vutbr.cz/~stehlik/a800.htm
-  http://www.signus.demon.co.uk/index.html
-  comp.sys.atari.8bit
-
 The ROM's for the Atari computers are, unfortunately, copyright. This
 port will attempt to down-load another freeware Atari emulator for DOS
 called PC Xformer 2.5 which contains copies of these ROM files. If you
 would like to take a further look at XF2.5 you should find it in your
 distfiles directory (if it successfully down-loaded :->).
+
+WWW: http://joy.sophics.cz/a800/
diff --git a/emulators/atari800/pkg-plist b/emulators/atari800/pkg-plist
index 4a715ff3ff49..8e2960d3c144 100644
--- a/emulators/atari800/pkg-plist
+++ b/emulators/atari800/pkg-plist
@@ -1,19 +1,20 @@
 bin/atari800
-share/atari/atari800.cfg
-share/atari/ataribas.rom
-share/atari/atariosb.rom
-share/atari/atarixl.rom
-share/atari/demos1.xfd
-share/atari/demos2.xfd
-share/atari/dos25.xfd
-share/atari/mydos45d.atr
-share/doc/atari/BUGS
-share/doc/atari/CHANGES
-share/doc/atari/CREDITS
-share/doc/atari/INSTALL
-share/doc/atari/README
-share/doc/atari/README.FreeBSD
-share/doc/atari/TODO
-share/doc/atari/USAGE
-@dirrm share/doc/atari
-@dirrm share/atari
+share/atari800/atari800.cfg
+share/atari800/ataribas.rom
+share/atari800/atariosb.rom
+share/atari800/atarixl.rom
+share/atari800/demos1.xfd
+share/atari800/demos2.xfd
+share/atari800/dos25.xfd
+share/atari800/mydos45d.atr
+%%PORTDOCS%%share/doc/atari800/BUGS
+%%PORTDOCS%%share/doc/atari800/CHANGES
+%%PORTDOCS%%share/doc/atari800/CREDITS
+%%PORTDOCS%%share/doc/atari800/FAQ
+%%PORTDOCS%%share/doc/atari800/INSTALL
+%%PORTDOCS%%share/doc/atari800/README
+%%PORTDOCS%%share/doc/atari800/README.FreeBSD
+%%PORTDOCS%%share/doc/atari800/TODO
+%%PORTDOCS%%share/doc/atari800/USAGE
+%%PORTDOCS%%@dirrm share/doc/atari800
+@dirrm share/atari800