Unbreak the atari800 port:

* Removed xview dependancies to keep port simple.
* Sound doesn't function very well so I have disabled that also.
* Updated URL's and Maintainer's email address.

PR:		16509
Submitted by:	Maintainer

4 files changed, 23 insertions, 31 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index b7d92ea4f794..771858a1b2b3 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -13,19 +13,15 @@ MASTER_SITES=	http://www.signus.demon.co.uk/Software/Portable/Atari800e/ \
 		http://cas3.zlin.vutbr.cz/~stehlik/a800/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
 
-MAINTAINER=	jsutton@webnet.com.au
-
-BROKEN='MD5 checksum mismatch.  Also xf25.zip has an "End-of-central-directory signature not found" when unzipping problem.'
+MAINTAINER=	jsutton@bbcon.com.au
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-.if defined(ATARI) && (${ATARI} == "freebsd-xview")
-LIB_DEPENDS=	xview:${PORTSDIR}/x11-toolkits/xview
-.endif
+
 DIST_SUBDIR=	atari
 EXTRA_FILES=	xf25.zip
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-ALL_TARGET=	${ATARI}
+ALL_TARGET=	freebsd-x11
 
 RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
 NO_PACKAGE=	${RESTRICTED}
@@ -39,14 +35,6 @@ DOC_FILES= 	BUGS CHANGES COPYING CREDITS INSTALL README TODO USAGE
 
 MAN1=		atari800.1
 
-.if !defined(ATARI)
-pre-extract:
-	@${ECHO_MSG} "Please define the environment variable ATARI to"
-	@${ECHO_MSG} "determine how to build the emulator. Your choices are:"
-	@${ECHO_MSG} "   freebsd-ncurses, freebsd-x11, freebsd-xview. "
-	@${ECHO_MSG}
-	@${FALSE}
-.endif
 post-extract:
 	@${ECHO_MSG} "===>  Unzipping ROM files"
 	unzip -Lo ${DISTDIR}/${DIST_SUBDIR}/${EXTRA_FILES} ${ATARI_XF}\
diff --git a/emulators/atari800/files/config.h b/emulators/atari800/files/config.h
index 085cc7e34a4b..1c4f7ecbc5b9 100644
--- a/emulators/atari800/files/config.h
+++ b/emulators/atari800/files/config.h
@@ -1,5 +1,4 @@
 #ifndef __CONFIG__
 #define __CONFIG__
-#define VOXWARE
 #define UNALIGNED_LONG_OK
 #endif
diff --git a/emulators/atari800/files/patch-aa b/emulators/atari800/files/patch-aa
index 4f5a768baeed..4671df3467d9 100644
--- a/emulators/atari800/files/patch-aa
+++ b/emulators/atari800/files/patch-aa
@@ -1,5 +1,20 @@
---- Makefile.orig	Thu Jun 18 19:49:19 1998
-+++ Makefile	Thu Jun 18 20:00:02 1998
+--- Makefile.orig	Sun Feb  6 16:38:57 2000
++++ Makefile	Sun Feb  6 16:40:45 2000
+@@ -6,12 +6,12 @@
+ 
+ CC		= gcc
+ CPPFLAGS	= $(OTHER)
+-CFLAGS		= -c -O6 -DGNU_C
++CFLAGS+=	  -c -DGNU_C
+ LD		= gcc
+ LDFLAGS		=
+ LDLIBS		= -lm
+ 
+-PREFIX		= /usr/local
++PREFIX?=	  /usr/local
+ BIN_PATH	= ${PREFIX}/bin
+ LIB_PATH	= ${PREFIX}/lib
+ MAN_PATH	= ${PREFIX}/man
 @@ -246,7 +246,6 @@
  			platform.h
  
diff --git a/emulators/atari800/pkg-descr b/emulators/atari800/pkg-descr
index 9be8d91f985c..208344253afe 100644
--- a/emulators/atari800/pkg-descr
+++ b/emulators/atari800/pkg-descr
@@ -11,22 +11,12 @@ 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://www.signus.demon.co.uk/david/
-  http://zippy.sonoma.edu/~kendrick/nbs/new_and_emu.html
-  ftp://ftp.hackerz.com/hackerz/atari/web/index.html
+  http://cas3.zlin.vutbr.cz/~stehlik/a800.htm
+  http://www.signus.demon.co.uk/index.html
   comp.sys.atari.8bit
 
-This should get you started and provide you with numerous links to
-other web sites. 
-
 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 :->). For more info
-on this emulator check out "http://www.halcyon.com/brasoft/".
-
-Share and enjoy,
-
-Joel...
-jsutton@webnet.com.au
+distfiles directory (if it successfully down-loaded :->).