Update this from 2.0 to 4.7 :-) and add optional NAS (audio) support

OK-ed by:	joerg

4 files changed, 69 insertions, 138 deletions

diff --git a/games/acm/Makefile b/games/acm/Makefile
index c034b78d3d3b..e2df58233873 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -3,18 +3,27 @@
 # Date created:		5 March 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.5 1995/04/02 13:14:09 joerg Exp $
+# $Id: Makefile,v 1.6 1995/04/11 00:20:05 asami Exp $
 #
 
-DISTNAME=	acm
-PKGNAME=	acm-2.0
+DISTNAME=	acm-4.7
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.informatik.tu-muenchen.de/pub/comp/usenet/comp.sources.x/acm/ \
-		ftp://ftp.physik.tu-muenchen.de/pub/comp/usenet/comp.sources.x/acm/
+MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
 
 MAINTAINER=	joerg@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/acm
-USE_IMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= --prefix=${PREFIX}
+STRIP=
 
 .include <bsd.port.mk>
+
+# Following stuff must be after <bsd.port.mk> to expand exists() properly
+
+# Include sound support (Use network audio server (nas))
+.if defined(USE_SOUND) && ${USE_SOUND} == YES || \
+    exists(${PREFIX}/lib/libaudio.a) && \
+    (!defined(USE_SOUND) || ${USE_SOUND} != NO)
+LIB_DEPENDS+=   audio\\.7\\.:${PORTSDIR}/audio/nas
+.endif
+
diff --git a/games/acm/distinfo b/games/acm/distinfo
index 7344c7c880a6..bc8749f528b1 100644
--- a/games/acm/distinfo
+++ b/games/acm/distinfo
@@ -1 +1 @@
-MD5 (acm.tar.gz) = a9c25db55f618794aa6796834a2a2a1b
+MD5 (acm-4.7.tar.gz) = d8eba24ecfce358e9e0cee55ccf1b1b4
diff --git a/games/acm/pkg-descr b/games/acm/pkg-descr
index d7f4bb2d32ae..70d713478358 100644
--- a/games/acm/pkg-descr
+++ b/games/acm/pkg-descr
@@ -1,11 +1,4 @@
-[This is Riley's original README file]
-
-acm Flight Simulator version 2.0
-
-What is acm?
-------------
-
-Acm is a LAN-oriented, multiplayer aerial combat simulation.  My main design
+ACM is a LAN-oriented, multiplayer aerial combat simulation.  My main design
 objective was to provide source code that could be easily compiled and
 executed on a wide variety of platforms.  To that end, acm is written entirely
 in C, exploiting the programming features of Unix, X11, and the BSD socket
@@ -14,118 +7,10 @@ interface.
 Players engage in air to air combat against one another using heat seeking
 missiles and cannons.
 
-Acm exists as two programs.  The first, named "acm", is a small program
-that, when invoked, starts a flight session on a given workstation.  The
-second component, named "acms", is a server process that manages the
+ACM is implemented as two programs.  The first, named "acm", is a small
+program that, when invoked, starts a flight session on a given workstation.
+The second component, named "acms", is a server process that manages the
 multiplayer environment.  It also manages the flight simulation and
 display management that is required.  Most players will prefer to run the
 acms process on a back-end server system on their local area network.  Players
 at client workstations can then invoke the acm program to begin play.
-
-I play acm using a server that is a Mips RC3240 (rated at roughly 18.5
-SPECmarks).  I get very adequate display performance using a Mips RS2030
-color workstation (10.0 SPECmarks) or an NCD monochrome X terminal.  My
-choice of servers is probably overkill.  I suspect that an 10+ SPECmark
-system could handle a typical mutiplayer load.
-
-This is the second release of acm.  The original version has been ported
-to a variety of Unix derivatives and system architectures.
-
-Riley Rainey
-riley@mips.com
-January 26, 1991
-
-
-
-What's different with revision 2.0:
------------------------------------
-
-The flight simulation model has been substantially revamped.
-
-Rudder controls have been added.
-
-Monochrome support has been added with the generous help of Glen Dudek
-(dudek@ksr.com).
-
-Filenames have been shortened, where required, to get along with System V
-conventions.
-
-Substantial corrections and enhancements to the portability of this code
-were provided by Johnathan Kamens (jik@Athena.MIT.EDU).  imake can now
-be used to build the entire product tree.
-
-Sun-specific changes were provided by Dave Safford (auvsaff@auvsun.tamu.edu).
-
-A bug that prevented acm from operating with certain window managers
-has been corrected.
-
-Lead Computing Optical Sight (LCOS) support has been added to the
-cannon weapon display.  A reticle (sight) is displayed on the HUD, showing
-a good aiming sight for the cannon.
-
-Cannons will now inflict damage on other aircraft.
-
-Aircraft can now be damaged, but remain airworthy.
-
-
-
-GENERAL NOTES
--------------
-
-This software is divided into two major parts: the 3-D graphics routines
-and the flight simulator itself.  The 3-D stuff is contained in the V
-directory.  V/lib holds the library itself.  V/test contains a program
-that can be used to test your port of the V library.
-
-Fsim contains the remainder of the flight simulator. imake and make files
-have been provided.  The code has a Berkeley tilt to it in many
-places, so people with hybrid OS's will probably want to lean that
-direction when selecting compiling and linking options.
-
-Acm binaries can be installed in your standard games directory.  In addition
-to running "make install" to install the executables, you must run the
-"install-objects" script.
-
-The acm server, acms, must currently be started manually.  It's intended
-that it will eventually be managed automatically by inetd, but that's
-not in the code yet.  I have access to a network that includes a 16+ SPECMark
-server and 12 to 18 SPECMark workstations (i.e. a MIPS 3240 along with
-MIPS 2030 and Magnum workstations) (translate SPECMarks into millions of
-instructions per second by whatever formula you like ..).  I generally 
-rlogin to the 3240 and start the acms process on it and leave that xterm
-window hanging around;  then, from another xterm window, I'll fire off
-the acm command that starts my flying session.  Other players enter the
-game by simply firing off an "acm servername" command.
-
-I'm not saying that acm is a particularly accurate flight simulator. I'm
-not an aero engineer, but I did spend a fair amount of time studying
-several college-level texts on the subject while I was designing this
-software.  This probably doesn't resemble real-time flight simulators
-too much but, again, that's not my line of work.  Comments and
-suggestions to improve this software are welcome.
-
-Several "features" in this revision of the software:
-
-	* landing gear is ignored.  Raise it, lower it; it's
-	  not handled by the software.
-
-	* flaps can be lowered at rediculously high speeds.
-
-	* you can fly through mountains.
-
-	* engines do not flame-out.  Fly really high (and fast enough)
-	  and you can just about get into orbit.  Non-afterburning
-	  engine performance does degrade as altitude increases, but
-	  afterburner performance gives the extra kick needed to fly
-	  much higher than you should be able to.
-
-
-CREDITS
-
-In the original release, I overlooked several important credits.  The
-input routine at the heart of the acm server is based on code from xtrek
-that was written by Dan A. Dickey, he has provided some valuable help in
-improving the robustness of this code.  The 3-D routines were written by
-me, but are based closely on two valuable articles from the March and
-April 1981 issues of Byte Magazine titled "Three-Dimensional Computer
-Graphics" by Franklin C. Crow.
diff --git a/games/acm/pkg-plist b/games/acm/pkg-plist
index ea6d6295d6ff..efd6a1fdf716 100644
--- a/games/acm/pkg-plist
+++ b/games/acm/pkg-plist
@@ -1,15 +1,52 @@
-@cd ${X11BASE}
-man/man1/acm.1.gz
 @owner games
 @mode 555
-bin/acms
 bin/acm
+bin/acms
+bin/kill-acms
+man/man1/acm.1
 @mode 444
-lib/X11/acm/aim-9
-lib/X11/acm/bullet
-lib/X11/acm/f16
-lib/X11/acm/mig23
-lib/X11/acm/mtn
-lib/X11/acm/rwy
-lib/X11/acm/rwy2
-lib/X11/acm/tower   
+games/acm/default-scene
+games/acm/maui-scene
+games/acm/kauai-scene
+games/acm/oahu-scene
+games/acm/inventory
+games/acm/f16.obj
+games/acm/f18.obj
+games/acm/mig23.obj
+games/acm/mig25.obj
+games/acm/mig29.obj
+games/acm/kc135.obj
+games/acm/c172.obj
+games/acm/aim9.obj
+games/acm/tracer.obj
+games/acm/tower.obj
+games/acm/rwy.obj
+games/acm/rwy2.obj
+games/acm/mtn.obj
+games/acm/lake.obj
+games/acm/hangar.obj
+games/acm/surface.obj
+games/acm/oahu.obj
+games/acm/maui_ne.obj
+games/acm/maui_nw.obj
+games/acm/maui_sw.obj
+games/acm/maui_se.obj
+games/acm/kauai_ne.obj
+games/acm/kauai_nw.obj
+games/acm/kauai_sw.obj
+games/acm/kauai_se.obj
+games/acm/aconnon.au
+games/acm/cannon.au
+games/acm/crash.au
+games/acm/engine.au
+games/acm/gear_up.au
+games/acm/gear_dn.au
+games/acm/imarker.au
+games/acm/jet1.au
+games/acm/jet2.au
+games/acm/missile.au
+games/acm/mmarker.au
+games/acm/omarker.au
+games/acm/rwr.au
+games/acm/screetch.au
+games/acm/stall.au