aboutsummaryrefslogtreecommitdiffstats
path: root/games/acm
diff options
context:
space:
mode:
authorse <se@FreeBSD.org>2007-05-20 20:13:23 +0800
committerse <se@FreeBSD.org>2007-05-20 20:13:23 +0800
commita2a50b69793a5869f84f842282ae88cdaff504b5 (patch)
tree1c738769777c0113d92224401223173c850bd85a /games/acm
parentd770a3a3fdefec453a4aed5b1053ebcc6e6081ed (diff)
downloadfreebsd-ports-gnome-a2a50b69793a5869f84f842282ae88cdaff504b5.tar.gz
freebsd-ports-gnome-a2a50b69793a5869f84f842282ae88cdaff504b5.tar.zst
freebsd-ports-gnome-a2a50b69793a5869f84f842282ae88cdaff504b5.zip
The move of X11 to /usr/local broke the compilation of acm if netpbm
is installed (pm.h from netpbm was used instead of the port's unrelated local pm.h). If this port does not compile with gcc-4, this is due to conflicting declarations of the RPC server interface generated by rpcgen (statis vs. non-static). This breakage must be fixed in rpcgen. Approved by: portmgr
Diffstat (limited to 'games/acm')
-rw-r--r--games/acm/files/patch-0132
1 files changed, 17 insertions, 15 deletions
diff --git a/games/acm/files/patch-01 b/games/acm/files/patch-01
index e5f5b3e6c2e2..0e8b044c5d70 100644
--- a/games/acm/files/patch-01
+++ b/games/acm/files/patch-01
@@ -1,15 +1,17 @@
-*** 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
-
+--- src/Makefile.in~ Wed Dec 9 21:53:42 1998
++++ src/Makefile.in Sun May 20 10:32:43 2007
+@@ -17,12 +17,12 @@
+ -I../dis
+ TOPDIR = ..
+ CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags
+- manext = 1
++ manext = 6
+ MAKEDEPEND = makedepend
+
+ PROGRAMS = acm
+ DEFINES = -DSRCDIR=\"$(srcdir)\" -DACM_LIBRARY=\"@OBVDIR@\"
+- CFLAGS = $(DEFINES) @CFLAGS@ @DEFS@ $(STD_INCLUDES)
++ CFLAGS = $(STD_INCLUDES) $(DEFINES) @CFLAGS@ @DEFS@
+ LDFLAGS = @LDFLAGS@
+ SRCS = main.c pm.c gear.c flaps.c drone.c init.c aim9m.c box.c \
+ aim120.c ccip.c \