5 files changed, 26 insertions, 8 deletions

diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index c23879252039..6f592d836f4b 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openrm
-PORTVERSION=		1.4.2
+PORTVERSION=		1.4.3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@ LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg
 WRKSRC=		${WRKDIR}/rm${PORTVERSION:S/.//g}
 .ifdef (WITH_DEMOS)
 WRKSRC2=	${WRKDIR}/rmdemo
-EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff
+EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff ${PATCHDIR}/rm2screen.c.diff
 .endif
 
 USE_X_PREFIX=	yes
@@ -33,7 +33,7 @@ USE_MESA=	yes
 USE_REINPLACE=	yes
 ALL_TARGET=	linux docs
 INSTALLS_SHLIB=	yes
-MAKE_ENV=	RM_INSTALL=${X11BASE}
+ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITH_DEMOS)
 PLIST_SUB=	WITH_DEMOS="@comment "
diff --git a/graphics/openrm/distinfo b/graphics/openrm/distinfo
index 2ac1e3cb85b5..256e7944d064 100644
--- a/graphics/openrm/distinfo
+++ b/graphics/openrm/distinfo
@@ -1,2 +1,2 @@
-MD5 (openrm-devel-1.4.2.tgz) = 15e882d50fdcb009ec1000a73441b40b
-MD5 (openrm-demo-1.4.2.tgz) = 465d7cfa9ab66b77e075b8c0ef099bc7
+MD5 (openrm-devel-1.4.3.tgz) = ab5f22d9e47ffdbe0dd51acdcbb0f45a
+MD5 (openrm-demo-1.4.3.tgz) = 92c09d6d22821a3797ee76ae6f6cf78b
diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff
index 2c7d9ef04c44..41af73b5371d 100644
--- a/graphics/openrm/files/makeinclude.diff
+++ b/graphics/openrm/files/makeinclude.diff
@@ -4,9 +4,9 @@
  # autogenerated by configure
  # on Sun Jun 16 17:50:09 PDT 2002
  # 
--RMHOME=/usr/local/rm142
--RMLIBS=-L/usr/local/rm142/lib -lrm -lrmaux -lrmv -lrmi
--RMCFLAGS=-DRM_X -I/usr/local/rm142/include
+-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
diff --git a/graphics/openrm/files/rm2screen.c.diff b/graphics/openrm/files/rm2screen.c.diff
new file mode 100644
index 000000000000..e5f02d2656b6
--- /dev/null
+++ b/graphics/openrm/files/rm2screen.c.diff
@@ -0,0 +1,12 @@
+--- ../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();
diff --git a/graphics/openrm/pkg-plist b/graphics/openrm/pkg-plist
index 4415baeaadec..44f5252303c6 100644
--- a/graphics/openrm/pkg-plist
+++ b/graphics/openrm/pkg-plist
@@ -52,6 +52,8 @@ lib/librmv.so.1
 %%WITH_DEMOS%%share/examples/openrm/data/func10-yoffset.dio
 %%WITH_DEMOS%%share/examples/openrm/data/func10.dio
 %%WITH_DEMOS%%share/examples/openrm/data/greenpaper.x
+%%WITH_DEMOS%%share/examples/openrm/data/hydro.dat
+%%WITH_DEMOS%%share/examples/openrm/data/hydro.dio
 %%WITH_DEMOS%%share/examples/openrm/data/left.x
 %%WITH_DEMOS%%share/examples/openrm/data/op.small.x
 %%WITH_DEMOS%%share/examples/openrm/data/orangegrid.x
@@ -88,6 +90,7 @@ lib/librmv.so.1
 %%WITH_DEMOS%%share/examples/openrm/makeinclude
 %%WITH_DEMOS%%share/examples/openrm/markers2d.c
 %%WITH_DEMOS%%share/examples/openrm/offscreen.c
+%%WITH_DEMOS%%share/examples/openrm/orderTest.c
 %%WITH_DEMOS%%share/examples/openrm/pdb.c
 %%WITH_DEMOS%%share/examples/openrm/pdbwork.c
 %%WITH_DEMOS%%share/examples/openrm/pickListTest.c
@@ -97,9 +100,11 @@ lib/librmv.so.1
 %%WITH_DEMOS%%share/examples/openrm/rm2screen.c
 %%WITH_DEMOS%%share/examples/openrm/skeleton.c
 %%WITH_DEMOS%%share/examples/openrm/spotlight.c
+%%WITH_DEMOS%%share/examples/openrm/spriteTest.c
 %%WITH_DEMOS%%share/examples/openrm/switchtest.c
 %%WITH_DEMOS%%share/examples/openrm/tcube.c
 %%WITH_DEMOS%%share/examples/openrm/text2d.c
+%%WITH_DEMOS%%share/examples/openrm/textureTest.c
 %%WITH_DEMOS%%share/examples/openrm/tfly.c
 %%WITH_DEMOS%%share/examples/openrm/tmap2d.c
 %%WITH_DEMOS%%share/examples/openrm/trans2d.c
@@ -124,6 +129,7 @@ lib/librmv.so.1
 %%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/rmcreatw.c.html
 %%PORTDOCS%%share/doc/openrm/rmerror.c.html