6 files changed, 72 insertions, 1 deletions
diff --git a/misc/otter/Makefile b/misc/otter/Makefile
index eac9572c40c1..fbdb221138d4 100644
--- a/misc/otter/Makefile
+++ b/misc/otter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	otter
 PORTVERSION=	3.3f
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www-unix.mcs.anl.gov/AR/otter/dist33/
 
diff --git a/misc/otter/files/patch-mace2_Mace2.h b/misc/otter/files/patch-mace2_Mace2.h
new file mode 100644
index 000000000000..9d1fdacfa79c
--- /dev/null
+++ b/misc/otter/files/patch-mace2_Mace2.h
@@ -0,0 +1,11 @@
+--- mace2/Mace2.h.orig	2004-06-30 02:04:58 UTC
++++ mace2/Mace2.h
+@@ -3,7 +3,7 @@
+ 
+ /************ BASIC INCLUDES ************/
+ 
+-#define IN_MAIN   /* so that global vars in ../header.h will not be external */
++// #define IN_MAIN   /* so that global vars in ../header.h will not be external */
+ #include "../source/header.h"  /* Otter header */
+ 
+ #include "Opts.h"
diff --git a/misc/otter/files/patch-mace2_Makefile b/misc/otter/files/patch-mace2_Makefile
new file mode 100644
index 000000000000..19745846fb34
--- /dev/null
+++ b/misc/otter/files/patch-mace2_Makefile
@@ -0,0 +1,22 @@
+--- mace2/Makefile.orig	2004-02-09 20:30:15 UTC
++++ mace2/Makefile
+@@ -1,8 +1,8 @@
+ DFLAGS = -DTP_NAMES -DTP_SIGNAL -DTP_RUSAGE
+ 
+-CC = gcc
++CC ?= gcc
+ 
+-CFLAGS = -O $(DFLAGS)
++CFLAGS += $(DFLAGS)
+ 
+ # CFLAGS = -g $(DFLAGS)
+ 
+@@ -23,7 +23,7 @@ anldp: anldp.o $(OBJECTS)
+ mace2.o anldp.o $(OBJECTS): Mace2.h Clock.h Avail.h Opts.h Stats.h\
+ 	Miscellany.h Dp.h Generate.h Flatten.h Part.h
+ 
+-install:
++install: mace2 anldp mace2 anldp
+ 	/bin/mv mace2 anldp ../bin
+ 
+ clean:
diff --git a/misc/otter/files/patch-mace2_anldp.c b/misc/otter/files/patch-mace2_anldp.c
new file mode 100644
index 000000000000..ee28ac2201fc
--- /dev/null
+++ b/misc/otter/files/patch-mace2_anldp.c
@@ -0,0 +1,13 @@
+--- mace2/anldp.c.orig	2003-08-06 18:43:36 UTC
++++ mace2/anldp.c
+@@ -41,6 +41,10 @@
+ 
+ /************* END OF ALL GLOBAL CONSTANT DEFINITIONS ****************/
+ 
++#define IN_MAIN
++
++#include "../source/header.h"
++
+ #include "Opts.h"
+ #include "Stats.h"
+ #include "Avail.h"
diff --git a/misc/otter/files/patch-mace2_mace2.c b/misc/otter/files/patch-mace2_mace2.c
new file mode 100644
index 000000000000..c06beb41ef4d
--- /dev/null
+++ b/misc/otter/files/patch-mace2_mace2.c
@@ -0,0 +1,11 @@
+--- mace2/mace2.c.orig	2004-08-02 20:07:00 UTC
++++ mace2/mace2.c
+@@ -14,6 +14,8 @@
+ #define VERSION "2.2f"
+ #define VDATE "August 2004"
+ 
++#define IN_MAIN
++
+ #include "Mace2.h"
+ 
+ #include <unistd.h>  /* for getopt */
diff --git a/misc/otter/files/patch-mace2_stats.c b/misc/otter/files/patch-mace2_stats.c
new file mode 100644
index 000000000000..60599a7d5a76
--- /dev/null
+++ b/misc/otter/files/patch-mace2_stats.c
@@ -0,0 +1,14 @@
+--- mace2/stats.c.orig	2003-08-06 14:17:44 UTC
++++ mace2/stats.c
+@@ -1,8 +1,8 @@
+ #include "Mace2.h"
+ 
+- long MACE_Stats[MACE_MAX_STATS];
+- struct MACE_clock MACE_Clocks[MACE_MAX_CLOCKS];
+- int Internal_flags[MAX_INTERNAL_FLAGS];
++long MACE_Stats[MACE_MAX_STATS];
++extern struct MACE_clock MACE_Clocks[MACE_MAX_CLOCKS];
++extern int Internal_flags[MAX_INTERNAL_FLAGS];
+ 
+ extern int Domain_size;       /* owned by mace.c */
+ extern int Init_wall_seconds; /* owned by mace.c */