mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
Fix ELF brokenness caused by wrong assumptions of GNU configure, if an
"elf.h" header file is found (assumption was System V.4, which made later configure tests fail). Make myself maintainer of this port (as suggested by the previous maintainer: joerg).
This commit is contained in:
parent
8fce57e9db
commit
24786df1a2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=15158
@ -3,20 +3,16 @@
|
||||
# Date created: 5 March 1995
|
||||
# Whom: joerg
|
||||
#
|
||||
# $Id: Makefile,v 1.11 1997/07/10 01:43:01 asami Exp $
|
||||
# $Id: Makefile,v 1.12 1998/09/28 02:03:00 steve Exp $
|
||||
#
|
||||
|
||||
DISTNAME= acm-4.7
|
||||
DISTNAME= acm-4.8
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= ftp://ftp.warwick.ac.uk/pub/x11/
|
||||
MASTER_SITES= http://www.websimulations.com/download/
|
||||
|
||||
MAINTAINER= joerg@FreeBSD.org
|
||||
|
||||
BROKEN_ELF= build
|
||||
MAINTAINER= se@FreeBSD.org
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ENV= ${SH} -x # don't ask me why, will fail otherwise
|
||||
STRIP=
|
||||
MAN6= acm.6
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1 +1 @@
|
||||
MD5 (acm-4.7.tar.gz) = d8eba24ecfce358e9e0cee55ccf1b1b4
|
||||
MD5 (acm-4.8.tar.gz) = c39ff2dc75ead09179e04df7ae292e88
|
||||
|
@ -1,11 +1,9 @@
|
||||
--- src/Makefile.in.orig Fri Mar 4 13:35:07 1994
|
||||
+++ src/Makefile.in Fri Jan 3 02:18:38 1997
|
||||
@@ -15,7 +15,7 @@
|
||||
STD_INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../V/lib
|
||||
--- 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
|
||||
CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags
|
||||
- manext = 1
|
||||
+ manext = 6
|
||||
MAKEDEPEND = makedepend
|
||||
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
--- 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 "March 14, 1991"
|
||||
+.TH ACM 6 "March 14, 1991"
|
||||
-.TH ACM l "October 1, 1995"
|
||||
+.TH ACM 6 "October 1, 1995"
|
||||
.SH NAME
|
||||
acm \- an aerial combat simulator for X
|
||||
.SH SYNOPSIS
|
||||
|
16
games/acm/files/patch-03
Normal file
16
games/acm/files/patch-03
Normal file
@ -0,0 +1,16 @@
|
||||
--- 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
|
16
games/acm/files/patch-04
Normal file
16
games/acm/files/patch-04
Normal file
@ -0,0 +1,16 @@
|
||||
--- 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");
|
20
games/acm/files/patch-05
Normal file
20
games/acm/files/patch-05
Normal file
@ -0,0 +1,20 @@
|
||||
--- 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;
|
@ -1,10 +1,6 @@
|
||||
bin/acm
|
||||
bin/acms
|
||||
bin/kill-acms
|
||||
games/acm/default-scene
|
||||
games/acm/maui-scene
|
||||
games/acm/kauai-scene
|
||||
games/acm/oahu-scene
|
||||
games/acm/dallas-scene
|
||||
games/acm/inventory
|
||||
games/acm/f16.obj
|
||||
games/acm/f18.obj
|
||||
@ -22,15 +18,6 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user