7 files changed, 110 insertions, 100 deletions

diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff
index 41af73b5371d..81206f02ab49 100644
--- a/graphics/openrm/files/makeinclude.diff
+++ b/graphics/openrm/files/makeinclude.diff
@@ -1,15 +1,15 @@
---- ../rmdemo/makeinclude~	Mon Jun 17 02:50:21 2002
-+++ ../rmdemo/makeinclude	Tue Apr  8 20:54:52 2003
+--- ../rmdemo/makeinclude.orig	Sun Apr 13 01:03:18 2003
++++ ../rmdemo/makeinclude	Fri Sep 19 01:06:08 2003
 @@ -2,21 +2,21 @@
  # autogenerated by configure
- # on Sun Jun 16 17:50:09 PDT 2002
+ # on Sat Apr 12 14:03:02 PDT 2003
  # 
--RMHOME=/usr/local/rm143
--RMLIBS=-L/usr/local/rm143/lib -lrm -lrmaux -lrmv -lrmi
--RMCFLAGS=-DRM_X -I/usr/local/rm143/include
-+RMHOME=%%X11BASE%%
-+RMLIBS=-L%%X11BASE%%/lib -lrm -lrmaux -lrmv -lrmi
-+RMCFLAGS=-DRM_X -I%%X11BASE%%/include
+-RMHOME=/usr/local/rm150
+-RMLIBS=-L/usr/local/rm150/lib -lrm -lrmaux -lrmv -lrmi
+-RMCFLAGS=-DRM_X -I/usr/local/rm150/include
++RMHOME=%%PREFIX%%
++RMLIBS=-L%%PREFIX%%/lib -lrm -lrmaux -lrmv -lrmi
++RMCFLAGS=-DRM_X -I%%PREFIX%%/include
  #  
 -OPENGLHOME=/usr
 -OPENGLLIBS=-L/usr/lib -lGL -lGLU
diff --git a/graphics/openrm/files/patch-Makefile b/graphics/openrm/files/patch-Makefile
new file mode 100644
index 000000000000..4e46d1df148a
--- /dev/null
+++ b/graphics/openrm/files/patch-Makefile
@@ -0,0 +1,18 @@
+--- Makefile.orig	Fri Sep 19 10:02:02 2003
++++ Makefile	Fri Sep 19 10:02:58 2003
+@@ -73,6 +73,7 @@
+ 
+ default:
+ 	@echo "Specify an architecture:"
++	@echo "  freebsd"
+ 	@echo "  irix6-32"
+ 	@echo "  irix6-32-debug"
+ 	@echo "  irix6-n32"
+@@ -93,6 +94,7 @@
+ subdirs = rm rmaux rmi rmv
+ 
+ # unix targets
++freebsd \
+ linux \
+ linux-debug \
+ linux-cr-debug \
diff --git a/graphics/openrm/files/patch-bin-mklib.freebsd b/graphics/openrm/files/patch-bin-mklib.freebsd
new file mode 100644
index 000000000000..e05c94eff00d
--- /dev/null
+++ b/graphics/openrm/files/patch-bin-mklib.freebsd
@@ -0,0 +1,62 @@
+--- /dev/null	Fri Sep 19 10:51:17 2003
++++ bin/mklib.freebsd	Fri Sep 19 10:51:54 2003
+@@ -0,0 +1,59 @@
++#!/bin/sh
++
++# Make a FreeBSD ELF shared library
++
++# $Id$
++
++#--common--------------------------------------------------------------
++
++# Usage:  mklib <archflags> <libname> <major> <minor> <file.o ... >
++#
++# <archflags> are arcitecture specific build flags
++# <libname> is name of output library (LIBRARY)
++# <major> is major version number (MAJOR)
++# <minor> is minor version number (MINOR)
++# <file.o ... > remaining arguments are object files (OBJECTS)
++# 
++# added local installation target prefix (RM_INSTALL)
++# tidied up the build
++#
++# 04/23/01  jdb
++#
++
++ARCHFLAGS=$1
++shift 1
++
++LIBRARY=$1
++shift 1
++
++MAJOR=$1
++shift 1
++
++MINOR=$1
++shift 1
++
++# we don't care about ${MINOR} here
++VERSION=$MAJOR
++
++OBJECTS=$*
++
++DEPLIBS="-lGL -lGLU -L${X11BASE}/lib -lXmu"
++
++#--platform------------------------------------------------------------
++
++# build library objects
++${ECHO_CMD} "Building shared object $LIBRARY.so.$VERSION and the archive library $LIBRARY.a"
++${RM} -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION}
++${AR} qv ${LIBRARY}.a ${OBJECTS}
++
++# FreeBSD specific build
++${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${DEPLIBS}
++if [ ${ARCHFLAGS##*-} != "debug" ]; then
++    ${STRIP_CMD} ${LIBRARY}.so.${VERSION}
++    ${ECHO_CMD} "library has been stripped (non-debug build)."
++fi 
++
++# code tree
++${CP} ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib
++${RM} -f ../lib/${LIBRARY}.so
++${LN} -s ${LIBRARY}.so.${VERSION} ${LIBRARY}.so
diff --git a/graphics/openrm/files/patch-bin-mklib.linux b/graphics/openrm/files/patch-bin-mklib.linux
deleted file mode 100644
index 1b6fa06fcf0e..000000000000
--- a/graphics/openrm/files/patch-bin-mklib.linux
+++ /dev/null
@@ -1,29 +0,0 @@
---- bin/mklib.linux.orig	Sun Jun  3 13:56:31 2001
-+++ bin/mklib.linux	Sun Apr  6 15:26:58 2003
-@@ -58,7 +58,7 @@
- MINOR=$1
- shift 1
- 
--VERSION=$MAJOR.$MINOR
-+VERSION=$MAJOR
- 
- OBJECTS=$*
- 
-@@ -71,7 +71,7 @@
- 
- # Linux specific build
- gcc -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS}
--if [[ ${ARCHFLAGS##*-} != "debug" ]]; then
-+if [ ${ARCHFLAGS##*-} != "debug" ]; then
-     strip ${LIBRARY}.so.${VERSION}
-     echo "library has been stripped (non-debug build)."
- fi 
-@@ -83,7 +83,7 @@
- 
- 
- # local install
--if [[ -n ${RM_INSTALL} ]]; then
-+if [ -n ${RM_INSTALL} ]; then
-     echo "Installing ${LIBRARY} librairies locally in ${RM_INSTALL}/lib..."
-     \cp -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ${RM_INSTALL}/lib
-     \rm -f ${RM_INSTALL}/lib/${LIBRARY}.so
diff --git a/graphics/openrm/files/patch-make.cfg b/graphics/openrm/files/patch-make.cfg
index 577dcc285b7a..08e75c1ce091 100644
--- a/graphics/openrm/files/patch-make.cfg
+++ b/graphics/openrm/files/patch-make.cfg
@@ -1,41 +1,24 @@
---- make.cfg.orig	Sun Oct 14 16:37:11 2001
-+++ make.cfg	Sun Apr  6 15:23:36 2003
-@@ -74,8 +74,9 @@
+--- make.cfg.orig	Sun Jul 20 18:11:32 2003
++++ make.cfg	Fri Sep 19 09:54:52 2003
+@@ -102,6 +102,21 @@
+ MINOR=5
+ VERSION=$MAJOR.$MINOR
+ 
++freebsd:
++	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
++	"XINC = -I${X11BASE}/include" \
++	"GLINC = -I${X11BASE}/include" \
++	"JPEGINC = -I${LOCALBASE}/include" \
++	"RMINC = ../include" \
++	"CFLAGS = ${CFLAGS} -c -finline-functions -fomit-frame-pointer -DRM_X" \
++	"RMLIB = librm" \
++	"RMVLIB = librmv" \
++	"RMAUXLIB = librmaux" \
++	"RMILIB = librmi" \
++	"LIBDIR = ../lib" \
++	"MAKELIB = ../bin/mklib.freebsd" \
++	"ARCHFLAGS = none"
++
  linux:
  	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
  	"CC = gcc" \
--	"XINC = /usr/X11R6/include" \
--	"GLINC = /usr/include"\
-+	"XINC = ${X11BASE}/include" \
-+	"GLINC = ${X11BASE}/include" \
-+	"JPEGINC = ${LOCALBASE}/include" \
- 	"RMINC = ../include" \
- 	"CFLAGS = -c -O2 -m486 -finline-functions -fomit-frame-pointer -DRM_X" \
- 	"RMLIB = librm" \
-@@ -89,7 +90,7 @@
- linux-debug:
- 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
- 	"CC = gcc" \
--	"XINC = /usr/X11R6/include" \
-+	"XINC = ${X11BASE}/include" \
- 	"GLINC = /usr/include"\
- 	"RMINC = ../include" \
- 	"CFLAGS = -c -g -ansi -Wall -Winline -m486 -finline-functions -DRM_X" \
-@@ -114,7 +115,7 @@
- 	"XINC = /usr/openwin/include" \
- 	"GLINC = /usr/openwin/include" \
- 	"RMINC = ../include" \
--	"JPEGINC = /usr/local/include" \
-+	"JPEGINC = ${LOCALBASE}/include" \
- 	"CFLAGS = -O -c -Xc -Kpic -v -I/usr/openwin/include -DSOLARIS -DRM_X" \
- 	"RMLIB = librm" \
- 	"RMVLIB = librmv" \
-@@ -130,7 +131,7 @@
- 	"XINC = /usr/openwin/include" \
- 	"GLINC = /usr/openwin/include" \
- 	"RMINC = ../include" \
--	"JPEGINC = /usr/local/include" \
-+	"JPEGINC = ${LOCALBASE}/include" \
- 	"CFLAGS = -g -c -Xc -Kpic -v -I/usr/openwin/include -DSOLARIS -DRM_X" \
- 	"RMLIB = librm" \
- 	"RMVLIB = librmv" \
diff --git a/graphics/openrm/files/patch-rm-rminit.c b/graphics/openrm/files/patch-rm-rminit.c
deleted file mode 100644
index 2e8dfed43f63..000000000000
--- a/graphics/openrm/files/patch-rm-rminit.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- rm/rminit.c~	Mon Jul  8 12:53:37 2002
-+++ rm/rminit.c		Mon Jul  8 12:54:51 2002
-@@ -91,7 +91,9 @@
- #ifdef SOLARIS
-     glXInitThreadsSUN();
- #else
-+#ifndef __FreeBSD__
-     pthread_setconcurrency(12);
-+#endif    
- #endif
- #endif
- 
diff --git a/graphics/openrm/files/rm2screen.c.diff b/graphics/openrm/files/rm2screen.c.diff
deleted file mode 100644
index e5f02d2656b6..000000000000
--- a/graphics/openrm/files/rm2screen.c.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../rmdemo/rm2screen.c.~	Sat Apr 19 11:10:56 2003
-+++ ../rmdemo/rm2screen.c	Sat Apr 19 11:12:21 2003
-@@ -411,7 +411,9 @@
- #ifdef SOLARIS
-     glXInitThreadsSUN();
- #else
-+#ifndef __FreeBSD__
-     pthread_setconcurrency(12);
-+#endif
- #endif
-     
-     rmInit();