- Update to version 1.5.1

PR:		61707
Submitted by:	maintainer

8 files changed, 74 insertions, 176 deletions

diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index 2fdef5c6c94a..c0722526f971 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=		openrm
-PORTVERSION=		1.5.0
+PORTVERSION=		1.5.1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		${PORTNAME}-devel-${PORTVERSION}
 .ifdef (WITH_DEMOS)
-DISTFILES=		${PORTNAME}-devel-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	tiamat@comset.net
 COMMENT=	Development environment used to build 2D/3D/stereo graphics
 
-LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 WRKSRC=		${WRKDIR}/rm${PORTVERSION:S/.//g}
 .ifdef (WITH_DEMOS)
@@ -28,7 +28,7 @@ EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff
 .endif
 
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
 USE_REINPLACE=	yes
 ALL_TARGET=	freebsd docs
 MAKE_ARGS=	AR=${AR} \
@@ -53,9 +53,8 @@ pre-everything::
 	@${ECHO_MSG} "You can define WITH_DEMOS=yes to fetch and install available demos"
 .endif
 
-post-patch:
-	@${CHMOD} 0755 ${WRKSRC}/bin/mklib.freebsd
 .ifdef (WITH_DEMOS)
+post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
 			      s|%%X11BASE%%|${X11BASE}|g; \
 			      s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
diff --git a/graphics/openrm/distinfo b/graphics/openrm/distinfo
index 1c4da0247778..c18465cc51d4 100644
--- a/graphics/openrm/distinfo
+++ b/graphics/openrm/distinfo
@@ -1,2 +1,2 @@
-MD5 (openrm-devel-1.5.0.tar.gz) = 99cdd0e72bf187f359104ba4b596ee3d
-MD5 (openrm-demo-1.5.0.tar.gz) = d0cd62e8fd264657830d71047c1790c2
+MD5 (openrm-devel-1.5.1.tar.gz) = f12359cfafb5e83e947b0961a5351110
+MD5 (openrm-demo-1.5.1.tar.gz) = 35e022241c5ca9cb8f8813109b016c80
diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff
index 81206f02ab49..aab3f16ac625 100644
--- a/graphics/openrm/files/makeinclude.diff
+++ b/graphics/openrm/files/makeinclude.diff
@@ -1,12 +1,12 @@
---- ../rmdemo/makeinclude.orig	Sun Apr 13 01:03:18 2003
-+++ ../rmdemo/makeinclude	Fri Sep 19 01:06:08 2003
+--- ../rmdemo/makeinclude.orig	Thu Jan 22 07:24:15 2004
++++ ../rmdemo/makeinclude	Thu Jan 22 07:27:09 2004
 @@ -2,21 +2,21 @@
  # autogenerated by configure
- # on Sat Apr 12 14:03:02 PDT 2003
+ # on Fri Jan 16 19:52:16 PST 2004
  # 
--RMHOME=/usr/local/rm150
--RMLIBS=-L/usr/local/rm150/lib -lrm -lrmaux -lrmv -lrmi
--RMCFLAGS=-DRM_X -I/usr/local/rm150/include
+-RMHOME=/usr/local/rm151
+-RMLIBS=-L/usr/local/rm151/lib -lrm -lrmaux -lrmv -lrmi
+-RMCFLAGS=-DRM_X -I/usr/local/rm151/include
 +RMHOME=%%PREFIX%%
 +RMLIBS=-L%%PREFIX%%/lib -lrm -lrmaux -lrmv -lrmi
 +RMCFLAGS=-DRM_X -I%%PREFIX%%/include
diff --git a/graphics/openrm/files/patch-Makefile b/graphics/openrm/files/patch-Makefile
deleted file mode 100644
index 4e46d1df148a..000000000000
--- a/graphics/openrm/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index e05c94eff00d..000000000000
--- a/graphics/openrm/files/patch-bin-mklib.freebsd
+++ /dev/null
@@ -1,62 +0,0 @@
---- /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-make.cfg b/graphics/openrm/files/patch-make.cfg
deleted file mode 100644
index 08e75c1ce091..000000000000
--- a/graphics/openrm/files/patch-make.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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" \
diff --git a/graphics/openrm/pkg-descr b/graphics/openrm/pkg-descr
index 6564db5e4338..2ce42c09d36c 100644
--- a/graphics/openrm/pkg-descr
+++ b/graphics/openrm/pkg-descr
@@ -7,6 +7,7 @@ built and tested on:
    x86 Linux (s/w via Mesa, h/w using vendor drivers, e.g., nVidia)
    Irix
    Solaris
+   FreeBSD
    Win32 (95/98/NT/2K/ME).
 
 OpenRM is a derivative work of RM Scene Graph (tm), a commercial
@@ -19,4 +20,4 @@ present in OpenRM.
 WWW:	http://openrm.sourceforge.net
 
 - Igor Pokrovsky
-tiamat@telegraph.spb.ru
+tiamat@comset.net
diff --git a/graphics/openrm/pkg-plist b/graphics/openrm/pkg-plist
index 327d74c2f14f..57b8a93f1439 100644
--- a/graphics/openrm/pkg-plist
+++ b/graphics/openrm/pkg-plist
@@ -74,6 +74,7 @@ lib/librmv.so.1
 %%WITH_DEMOS%%share/examples/openrm/elev.c
 %%WITH_DEMOS%%share/examples/openrm/elevImage.c
 %%WITH_DEMOS%%share/examples/openrm/fogtest.c
+%%WITH_DEMOS%%share/examples/openrm/fpsVis3d.c
 %%WITH_DEMOS%%share/examples/openrm/glxinfo.c
 %%WITH_DEMOS%%share/examples/openrm/imgMirror.c
 %%WITH_DEMOS%%share/examples/openrm/isodrv-mt.c
@@ -111,60 +112,61 @@ lib/librmv.so.1
 %%WITH_DEMOS%%share/examples/openrm/vrend.c
 %%WITH_DEMOS%%share/examples/openrm/vslicer.c
 %%WITH_DEMOS%%@dirrm share/examples/openrm
-%%PORTDOCS%%share/doc/openrm/FUTUREPLANS
-%%PORTDOCS%%share/doc/openrm/README
-%%PORTDOCS%%share/doc/openrm/RELEASENOTES
-%%PORTDOCS%%share/doc/openrm/images/ormsg.gif
-%%PORTDOCS%%@dirrm share/doc/openrm/images
-%%PORTDOCS%%share/doc/openrm/index.html
-%%PORTDOCS%%share/doc/openrm/librm.html
-%%PORTDOCS%%share/doc/openrm/librmaux.html
-%%PORTDOCS%%share/doc/openrm/librmi.html
-%%PORTDOCS%%share/doc/openrm/librmv.html
-%%PORTDOCS%%share/doc/openrm/rmarcball.c.html
-%%PORTDOCS%%share/doc/openrm/rmbfuncs.c.html
-%%PORTDOCS%%share/doc/openrm/rmbitmap.c.html
-%%PORTDOCS%%share/doc/openrm/rmcamera.c.html
-%%PORTDOCS%%share/doc/openrm/rmclip.c.html
-%%PORTDOCS%%share/doc/openrm/rmcmpmgr.c.html
-%%PORTDOCS%%share/doc/openrm/rmcmpmgr.h.html
-%%PORTDOCS%%share/doc/openrm/rmcr.c.html
-%%PORTDOCS%%share/doc/openrm/rmcreatw.c.html
-%%PORTDOCS%%share/doc/openrm/rmerror.c.html
-%%PORTDOCS%%share/doc/openrm/rmflyui.c.html
-%%PORTDOCS%%share/doc/openrm/rmfog.c.html
-%%PORTDOCS%%share/doc/openrm/rmframe.c.html
-%%PORTDOCS%%share/doc/openrm/rmimage.c.html
-%%PORTDOCS%%share/doc/openrm/rminit.c.html
-%%PORTDOCS%%share/doc/openrm/rmjpeg.c.html
-%%PORTDOCS%%share/doc/openrm/rmlites.c.html
-%%PORTDOCS%%share/doc/openrm/rmmalloc.c.html
-%%PORTDOCS%%share/doc/openrm/rmmatrix.c.html
-%%PORTDOCS%%share/doc/openrm/rmnode.c.html
-%%PORTDOCS%%share/doc/openrm/rmpick.c.html
-%%PORTDOCS%%share/doc/openrm/rmpipe.c.html
-%%PORTDOCS%%share/doc/openrm/rmppm.c.html
-%%PORTDOCS%%share/doc/openrm/rmprim.c.html
-%%PORTDOCS%%share/doc/openrm/rmrstate.c.html
-%%PORTDOCS%%share/doc/openrm/rmscene.c.html
-%%PORTDOCS%%share/doc/openrm/rmstats.h.html
-%%PORTDOCS%%share/doc/openrm/rmtext.c.html
-%%PORTDOCS%%share/doc/openrm/rmthread.c.html
-%%PORTDOCS%%share/doc/openrm/rmthread.h.html
-%%PORTDOCS%%share/doc/openrm/rmtxture.c.html
-%%PORTDOCS%%share/doc/openrm/rmtypes.h.html
-%%PORTDOCS%%share/doc/openrm/rmutil.c.html
-%%PORTDOCS%%share/doc/openrm/rmvcontour.c.html
-%%PORTDOCS%%share/doc/openrm/rmverrplot.c.html
-%%PORTDOCS%%share/doc/openrm/rmvgrid2d.c.html
-%%PORTDOCS%%share/doc/openrm/rmviso.c.html
-%%PORTDOCS%%share/doc/openrm/rmvmap.c.html
-%%PORTDOCS%%share/doc/openrm/rmvmesh.c.html
-%%PORTDOCS%%share/doc/openrm/rmvmeshv.c.html
-%%PORTDOCS%%share/doc/openrm/rmvsignal.c.html
-%%PORTDOCS%%share/doc/openrm/rmvutil.c.html
-%%PORTDOCS%%share/doc/openrm/rmwin.c.html
-%%PORTDOCS%%share/doc/openrm/rmx.c.html
-%%PORTDOCS%%share/doc/openrm/rmx.h.html
-%%PORTDOCS%%share/doc/openrm/rmxtext.c.html
-%%PORTDOCS%%@dirrm share/doc/openrm
+%%PORTDOCS%%%%DOCSDIR%%/FUTUREPLANS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES
+%%PORTDOCS%%%%DOCSDIR%%/images/ormsg.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/librm.html
+%%PORTDOCS%%%%DOCSDIR%%/librmaux.html
+%%PORTDOCS%%%%DOCSDIR%%/librmi.html
+%%PORTDOCS%%%%DOCSDIR%%/librmv.html
+%%PORTDOCS%%%%DOCSDIR%%/rmarcball.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmbfuncs.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmbitmap.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmcamera.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmclip.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmcmpmgr.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmcmpmgr.h.html
+%%PORTDOCS%%%%DOCSDIR%%/rmcr.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmcreatw.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmerror.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmflyui.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmfog.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmframe.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmimage.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rminit.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmjpeg.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmlites.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmmalloc.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmmatrix.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmnode.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmpick.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmpipe.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmppm.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmprim.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmrstate.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmscene.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmstats.h.html
+%%PORTDOCS%%%%DOCSDIR%%/rmtext.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmthread.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmthread.h.html
+%%PORTDOCS%%%%DOCSDIR%%/rmtime.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmtxture.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmtypes.h.html
+%%PORTDOCS%%%%DOCSDIR%%/rmutil.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvcontour.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmverrplot.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvgrid2d.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmviso.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvmap.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvmesh.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvmeshv.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvsignal.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmvutil.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmwin.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmx.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmx.h.html
+%%PORTDOCS%%%%DOCSDIR%%/rmxtext.c.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%