summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>1999-02-01 23:32:47 +0000
committerStefan Eßer <se@FreeBSD.org>1999-02-01 23:32:47 +0000
commit3ff5c6d36e5660c351c6d376b8cf4937e8eafb36 (patch)
tree46031b64f4b7b597cfb713e58c4d79ed81d65999 /games
parentUpgrade to 990131 version of Wine. (diff)
Upgrade to version 5.0 of ACM.
Notes
Notes: svn path=/head/; revision=16472
Diffstat (limited to 'games')
-rw-r--r--games/acm/Makefile6
-rw-r--r--games/acm/distinfo2
-rw-r--r--games/acm/files/patch-0124
-rw-r--r--games/acm/files/patch-0219
-rw-r--r--games/acm/files/patch-0376
-rw-r--r--games/acm/files/patch-0444
-rw-r--r--games/acm/files/patch-0538
-rw-r--r--games/acm/pkg-plist75
8 files changed, 175 insertions, 109 deletions
diff --git a/games/acm/Makefile b/games/acm/Makefile
index 66265ad10086..b1c013941e23 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -3,17 +3,15 @@
# Date created: 5 March 1995
# Whom: joerg
#
-# $Id: Makefile,v 1.13 1998/12/06 21:09:26 se Exp $
+# $Id: Makefile,v 1.14 1999/02/01 00:56:38 obrien Exp $
#
-DISTNAME= acm-4.8
+DISTNAME= acm-5.0
CATEGORIES= games
MASTER_SITES= http://www.websimulations.com/download/
MAINTAINER= se@FreeBSD.org
-BROKEN='acm-5.0.tar.gz is all that is available'
-
GNU_CONFIGURE= yes
MAN6= acm.6
diff --git a/games/acm/distinfo b/games/acm/distinfo
index ff765170e561..0811a21e4103 100644
--- a/games/acm/distinfo
+++ b/games/acm/distinfo
@@ -1 +1 @@
-MD5 (acm-4.8.tar.gz) = c39ff2dc75ead09179e04df7ae292e88
+MD5 (acm-5.0.tar.gz) = 8d27051a3aa0d85b90f66a86f746e827
diff --git a/games/acm/files/patch-01 b/games/acm/files/patch-01
index 6115ee093424..e5f5b3e6c2e2 100644
--- a/games/acm/files/patch-01
+++ b/games/acm/files/patch-01
@@ -1,9 +1,15 @@
---- src/Makefile.in.orig Fri Aug 30 19:38:52 1996
-+++ src/Makefile.in Fri Dec 4 19:45:15 1998
-@@ -17,5 +17,5 @@
- TOPDIR = ..
- CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags
-- manext = 1
-+ manext = 6
- MAKEDEPEND = makedepend
-
+*** src/Makefile.in~ Wed Dec 9 22:53:42 1998
+--- src/Makefile.in Mon Feb 1 18:05:00 1999
+***************
+*** 18,22 ****
+ TOPDIR = ..
+ CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags
+! manext = 1
+ MAKEDEPEND = makedepend
+
+--- 18,22 ----
+ TOPDIR = ..
+ CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags
+! manext = 6
+ MAKEDEPEND = makedepend
+
diff --git a/games/acm/files/patch-02 b/games/acm/files/patch-02
index d74808763f63..46cc7899add5 100644
--- a/games/acm/files/patch-02
+++ b/games/acm/files/patch-02
@@ -1,8 +1,11 @@
---- src/acm.man.orig Fri Apr 15 13:12:10 1994
-+++ src/acm.man Fri Jan 3 02:19:19 1997
-@@ -1,4 +1,4 @@
--.TH ACM l "October 1, 1995"
-+.TH ACM 6 "October 1, 1995"
- .SH NAME
- acm \- an aerial combat simulator for X
- .SH SYNOPSIS
+*** src/acm.man~ Fri Aug 14 16:58:20 1998
+--- src/acm.man Mon Feb 1 18:05:28 1999
+***************
+*** 1,3 ****
+! .TH ACM l "August 1, 1998"
+ .SH NAME
+ acm \- an aerial combat simulator for X
+--- 1,3 ----
+! .TH ACM 6 "October 1, 1995"
+ .SH NAME
+ acm \- an aerial combat simulator for X
diff --git a/games/acm/files/patch-03 b/games/acm/files/patch-03
index 073a2d754996..79dd7dd1dce7 100644
--- a/games/acm/files/patch-03
+++ b/games/acm/files/patch-03
@@ -1,16 +1,60 @@
---- configure.orig Tue Sep 24 01:02:28 1996
-+++ configure Fri Dec 4 20:39:15 1998
-@@ -872,4 +872,5 @@
- done
-
-+if test $ac_cv_lib_elf = yes; then
- ac_safe=`echo "elf.h" | tr './\055' '___'`
- echo $ac_n "checking for elf.h""... $ac_c" 1>&6
-@@ -893,4 +894,7 @@
- fi
- rm -f conftest*
-+fi
-+else
-+ eval "ac_cv_header_$ac_safe=no"
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+*** configure~ Mon Aug 17 20:15:13 1998
+--- configure Mon Feb 1 18:42:53 1999
+***************
+*** 529,535 ****
+
+ if test -d /usr/lib/games ; then
+! OBVDIR="/usr/lib/games/acm"
+ else
+! OBVDIR=\$\(prefix\)/games/acm
+ fi
+
+--- 529,535 ----
+
+ if test -d /usr/lib/games ; then
+! OBVDIR="/usr/lib/games/acm/"
+ else
+! OBVDIR=\$\(prefix\)/games/acm/
+ fi
+
+***************
+*** 557,560 ****
+--- 557,567 ----
+ fi
+
++ # *BSD
++ BSD=0
++ if uname -s | grep BSD > /dev/null ; then
++ BSD=1
++ OBVDIR=${prefix}/share/acm/
++ fi
++
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+***************
+*** 769,773 ****
+
+
+! if test "$LINUX" = "0" ; then
+ echo $ac_n "checking for elf_end in -lelf""... $ac_c" 1>&6
+ echo "configure:774: checking for elf_end in -lelf" >&5
+--- 776,780 ----
+
+
+! if test "$LINUX" = "0" -a "$BSD" = "0"; then
+ echo $ac_n "checking for elf_end in -lelf""... $ac_c" 1>&6
+ echo "configure:774: checking for elf_end in -lelf" >&5
+***************
+*** 1129,1133 ****
+ done
+
+! if test "$LINUX" = "0" ; then
+ ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for elf.h""... $ac_c" 1>&6
+--- 1136,1141 ----
+ done
+
+!
+! if test "$LINUX" = "0" -a "$BSD" = "0" ; then
+ ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for elf.h""... $ac_c" 1>&6
diff --git a/games/acm/files/patch-04 b/games/acm/files/patch-04
index 6ddc150aca17..229d8a82d1ba 100644
--- a/games/acm/files/patch-04
+++ b/games/acm/files/patch-04
@@ -1,16 +1,28 @@
---- src/pm.c.orig Sun Mar 2 01:43:27 1997
-+++ src/pm.c Fri Dec 4 20:43:58 1998
-@@ -174,4 +174,4 @@
- *newv = exp (s * x) * c1 * (s * cos (t * x) - t * sin (t * x));
-
-- if (_isnan(*newy) || _isnan (*newv)) {
-+ if (isnan(*newy) || isnan (*newv)) {
- printf ("Gotcha\n");
---- src/interpolate.c.orig Sun Mar 2 01:43:26 1997
-+++ src/interpolate.c Fri Dec 4 20:45:23 1998
-@@ -52,4 +52,4 @@
- if (x <= table->entry[i].x) {
- result = table->entry[i].m * x + table->entry[i].b;
-- if (_isnan (result)) {
-+ if (isnan (result)) {
- fprintf (stderr, "interpolate: internal error\n");
+*** dis/test/Makefile.in~ Fri Aug 14 23:20:24 1998
+--- dis/test/Makefile.in Mon Feb 1 18:48:38 1999
+***************
+*** 1,5 ****
+ srcdir = @srcdir@
+! VPATH = @srcdir@
+! CFLAGS = -I$(srcdir)/.. -I.. -I../lib -I$(srcdir)/../../V/lib @CFLAGS@
+ CC = @CC@
+ SRCS = disscope.c simxtest.c tglobe.c
+--- 1,5 ----
+ srcdir = @srcdir@
+! VPATH = @srcdir@
+! CFLAGS = -I$(srcdir)/.. -I.. -I../lib -I$(srcdir)/../../V/lib @CFLAGS@
+ CC = @CC@
+ SRCS = disscope.c simxtest.c tglobe.c
+***************
+*** 7,11 ****
+ SIMXTEST_OBJS = simxtest.o
+ TGLOBE_OBJS = tglobe.o
+! DECOY_OBJS = decoy.o
+ LIBS = -L../lib -ldis -L../../V/lib -lV @LIBS@
+
+--- 7,11 ----
+ SIMXTEST_OBJS = simxtest.o
+ TGLOBE_OBJS = tglobe.o
+! DECOY_OBJS = decoy.o
+ LIBS = -L../lib -ldis -L../../V/lib -lV @LIBS@
+
diff --git a/games/acm/files/patch-05 b/games/acm/files/patch-05
index d49f2e360430..580ff93780bf 100644
--- a/games/acm/files/patch-05
+++ b/games/acm/files/patch-05
@@ -1,20 +1,18 @@
---- dis/server/dis_relay.c.orig Thu Dec 21 20:48:02 1995
-+++ dis/server/dis_relay.c Sun Dec 6 14:26:12 1998
-@@ -62,6 +62,6 @@
- msg.msg_iov = &vec;
- msg.msg_iovlen = 1;
-- msg.msg_accrights = (caddr_t) NULL;
-- msg.msg_accrightslen = 0;
-+ msg.msg_control = (caddr_t) NULL;
-+ msg.msg_controllen = 0;
- vec.iov_base = (caddr_t) pdu;
- vec.iov_len = pdu_max;
-@@ -84,6 +84,6 @@
- msg.msg_iov = &vec;
- msg.msg_iovlen = 1;
-- msg.msg_accrights = (caddr_t) NULL;
-- msg.msg_accrightslen = 0;
-+ msg.msg_control = (caddr_t) NULL;
-+ msg.msg_controllen = 0;
- vec.iov_base = (caddr_t) & buffer;
- vec.iov_len = len;
+*** src/main.c~ Wed Dec 23 23:29:00 1998
+--- src/main.c Mon Feb 1 19:14:05 1999
+***************
+*** 444,448 ****
+ #endif
+
+! init(".");
+
+ dpy = XOpenDisplay(display);
+--- 444,451 ----
+ #endif
+
+! #ifndef ACM_LIBRARY
+! #define ACM_LIBRARY "."
+! #endif
+! init(ACM_LIBRARY "/");
+
+ dpy = XOpenDisplay(display);
diff --git a/games/acm/pkg-plist b/games/acm/pkg-plist
index 0acd06c79801..ca85dc6aa2b9 100644
--- a/games/acm/pkg-plist
+++ b/games/acm/pkg-plist
@@ -1,36 +1,41 @@
bin/acm
-games/acm/default-scene
-games/acm/dallas-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/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
-@dirrm games/acm
+share/acm/acmlogo-unix.xwd
+share/acm/aconnon.au
+share/acm/aim9.obv
+share/acm/apglock.au
+share/acm/c172.obv
+share/acm/cannon.au
+share/acm/crash.au
+share/acm/dallas-scene
+share/acm/default-scene
+share/acm/engine.au
+share/acm/f117.dxf
+share/acm/f16.obv
+share/acm/f18.obv
+share/acm/gear_dn.au
+share/acm/gear_up.au
+share/acm/hangar.obv
+share/acm/il78.obv
+share/acm/imarker.au
+share/acm/inventory
+share/acm/kc135.obv
+share/acm/mig23.obv
+share/acm/mig25.obv
+share/acm/mig29.obv
+share/acm/missile.au
+share/acm/mmarker.au
+share/acm/munition-map.txt
+share/acm/object-map.txt
+share/acm/omarker.au
+share/acm/rwr.au
+share/acm/sa10.obv
+share/acm/sa11.obv
+share/acm/sa2.obv
+share/acm/screetch.au
+share/acm/stall.au
+share/acm/su30.obv
+share/acm/surface.obv
+share/acm/telar1.obv
+share/acm/tower.obv
+share/acm/tracer.obv
+@dirrm share/acm