- Update to 1.5.2

PR:		ports/70732
Submitted by:	Igor Pokrovsky <ip@doom.homeunix.org> (maintainer)

4 files changed, 104 insertions, 101 deletions

diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index d8f81bf56342..02ebbeb6c7a8 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=		openrm
-PORTVERSION=		1.5.1
+PORTVERSION=		1.5.2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}-devel-${PORTVERSION}
+DISTNAME=		${PORTNAME}-devel-${PORTVERSION}-3
 .ifdef (WITH_DEMOS)
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/graphics/openrm/distinfo b/graphics/openrm/distinfo
index 39d850b94152..ab043cd85593 100644
--- a/graphics/openrm/distinfo
+++ b/graphics/openrm/distinfo
@@ -1,4 +1,4 @@
-MD5 (openrm-devel-1.5.1.tar.gz) = f12359cfafb5e83e947b0961a5351110
-SIZE (openrm-devel-1.5.1.tar.gz) = 628213
-MD5 (openrm-demo-1.5.1.tar.gz) = 35e022241c5ca9cb8f8813109b016c80
-SIZE (openrm-demo-1.5.1.tar.gz) = 3259722
+MD5 (openrm-devel-1.5.2-3.tar.gz) = b2a9ccab742932364696225c1ffc7dac
+SIZE (openrm-devel-1.5.2-3.tar.gz) = 634358
+MD5 (openrm-demo-1.5.2.tar.gz) = 1369e21b284f73a20586f2234612798d
+SIZE (openrm-demo-1.5.2.tar.gz) = 3904930
diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff
index aab3f16ac625..244a80543f7a 100644
--- a/graphics/openrm/files/makeinclude.diff
+++ b/graphics/openrm/files/makeinclude.diff
@@ -1,35 +1,35 @@
---- ../rmdemo/makeinclude.orig	Thu Jan 22 07:24:15 2004
-+++ ../rmdemo/makeinclude	Thu Jan 22 07:27:09 2004
+--- ../rmdemo/makeinclude.orig	Sun Apr 18 23:59:51 2004
++++ ../rmdemo/makeinclude	Fri Aug 20 20:46:52 2004
 @@ -2,21 +2,21 @@
  # autogenerated by configure
- # on Fri Jan 16 19:52:16 PST 2004
+ # on Sun Apr 18 12:59:51 PDT 2004
  # 
--RMHOME=/usr/local/rm151
--RMLIBS=-L/usr/local/rm151/lib -lrm -lrmaux -lrmv -lrmi
--RMCFLAGS=-DRM_X -I/usr/local/rm151/include
+-RMHOME=/usr/local/rm152
+-RMLIBS=-L/usr/local/rm152/lib -lrm -lrmaux -lrmv -lrmi
+-RMCFLAGS=-DRM_X -I/usr/local/rm152/include
 +RMHOME=%%PREFIX%%
-+RMLIBS=-L%%PREFIX%%/lib -lrm -lrmaux -lrmv -lrmi
-+RMCFLAGS=-DRM_X -I%%PREFIX%%/include
++RMLIBS=-L${RMHOME}/lib -lrm -lrmaux -lrmv -lrmi
++RMCFLAGS=-DRM_X -I${RMHOME}/include
  #  
 -OPENGLHOME=/usr
 -OPENGLLIBS=-L/usr/lib -lGL -lGLU
 -OPENGLCFLAGS=-I/usr/include
 +OPENGLHOME=%%X11BASE%%
-+OPENGLLIBS=-L%%X11BASE%%/lib -lGL -lGLU
-+OPENGLCFLAGS=-I%%X11BASE%%/include
++OPENGLLIBS=-L${OPENGLHOME}/lib -lGL -lGLU
++OPENGLCFLAGS=-I${OPENGLHOME}/include
  #  
 -X11HOME=/usr/X11R6
 -X11LIBS=-L/usr/X11R6/lib -lXmu -lX11 -lpthread -lm
 -X11CFLAGS=-I/usr/X11R6/include
 +X11HOME=%%X11BASE%%
-+X11LIBS=-L%%X11BASE%%/lib -lXmu -lX11 %%PTHREAD_LIBS%% -lm
-+X11CFLAGS=-I%%X11BASE%%/include
++X11LIBS=-L${X11HOME}/lib -lXmu -lX11 %%PTHREAD_LIBS%% -lm
++X11CFLAGS=-I${X11HOME}/include
  #  
  OPTFLAGS=-g
- ARCHFLAGS=-DLINUX
+ ARCHFLAGS=-m32
  #  
  # Location of JPEG stuff on your machine 
--JPEGLIB=-ljpeg
--JPEGINC=
+-JPEGLIB=-L/usr/lib -ljpeg
+-JPEGINC=-I/usr/include
 +JPEGLIB=-L%%LOCALBASE%%/lib -ljpeg
 +JPEGINC=-I%%LOCALBASE%%/include
diff --git a/graphics/openrm/pkg-plist b/graphics/openrm/pkg-plist
index 57b8a93f1439..53887e9fdd77 100644
--- a/graphics/openrm/pkg-plist
+++ b/graphics/openrm/pkg-plist
@@ -32,86 +32,89 @@ lib/librmv.a
 lib/librmv.so
 lib/librmv.so.1
 
-%%WITH_DEMOS%%share/examples/openrm/data/1a30.pdb
-%%WITH_DEMOS%%share/examples/openrm/data/README
-%%WITH_DEMOS%%share/examples/openrm/data/back.x
-%%WITH_DEMOS%%share/examples/openrm/data/bigsky.x
-%%WITH_DEMOS%%share/examples/openrm/data/clouds.x
-%%WITH_DEMOS%%share/examples/openrm/data/cos-yoffset.dio
-%%WITH_DEMOS%%share/examples/openrm/data/cos.dio
-%%WITH_DEMOS%%share/examples/openrm/data/doghead.jpg
-%%WITH_DEMOS%%share/examples/openrm/data/doghead.x
-%%WITH_DEMOS%%share/examples/openrm/data/elev.dio
-%%WITH_DEMOS%%share/examples/openrm/data/elevData.txt
-%%WITH_DEMOS%%share/examples/openrm/data/floor.x
-%%WITH_DEMOS%%share/examples/openrm/data/front.x
-%%WITH_DEMOS%%share/examples/openrm/data/func10-xoffset.dio
-%%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
-%%WITH_DEMOS%%share/examples/openrm/data/right.x
-%%WITH_DEMOS%%share/examples/openrm/data/topo256.dio
-%%WITH_DEMOS%%share/examples/openrm/data/volume.dat
-%%WITH_DEMOS%%share/examples/openrm/data/volume.dio
-%%WITH_DEMOS%%share/examples/openrm/data/waves.dio
-%%WITH_DEMOS%%share/examples/openrm/data/wu.x
-%%WITH_DEMOS%%@dirrm share/examples/openrm/data
-%%WITH_DEMOS%%share/examples/openrm/Makefile.x11
-%%WITH_DEMOS%%share/examples/openrm/README
-%%WITH_DEMOS%%share/examples/openrm/barrier.c
-%%WITH_DEMOS%%share/examples/openrm/barrier.h
-%%WITH_DEMOS%%share/examples/openrm/clipper.c
-%%WITH_DEMOS%%share/examples/openrm/clrball.c
-%%WITH_DEMOS%%share/examples/openrm/cones.c
-%%WITH_DEMOS%%share/examples/openrm/configure
-%%WITH_DEMOS%%share/examples/openrm/dyntmap.c
-%%WITH_DEMOS%%share/examples/openrm/elev-2vu.c
-%%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
-%%WITH_DEMOS%%share/examples/openrm/isodrv.c
-%%WITH_DEMOS%%share/examples/openrm/jack.c
-%%WITH_DEMOS%%share/examples/openrm/jballs.c
-%%WITH_DEMOS%%share/examples/openrm/keyfunc.c
-%%WITH_DEMOS%%share/examples/openrm/libdio.c
-%%WITH_DEMOS%%share/examples/openrm/libdio.h
-%%WITH_DEMOS%%share/examples/openrm/lines2d.c
-%%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
-%%WITH_DEMOS%%share/examples/openrm/pickTest.c
-%%WITH_DEMOS%%share/examples/openrm/pntcld.c
-%%WITH_DEMOS%%share/examples/openrm/procmode.h
-%%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
-%%WITH_DEMOS%%share/examples/openrm/vector3d.c
-%%WITH_DEMOS%%share/examples/openrm/vis2d.c
-%%WITH_DEMOS%%share/examples/openrm/vis3d.c
-%%WITH_DEMOS%%share/examples/openrm/vrend.c
-%%WITH_DEMOS%%share/examples/openrm/vslicer.c
-%%WITH_DEMOS%%@dirrm share/examples/openrm
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/1a30.pdb
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/README
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/back.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/bigsky.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/cassio.jpg
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/clouds.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/cos-yoffset.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/cos.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/doghead.jpg
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/doghead.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/elev.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/elevData.txt
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/floor.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/front.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/func10-xoffset.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/func10-yoffset.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/func10.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/greenpaper.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/hydro.dat
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/hydro.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/left.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/op.small.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/orangegrid.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/prairie.jpg
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/right.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/topo256.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/volume.dat
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/volume.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/waves.dio
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/wu.x
+%%WITH_DEMOS%%@dirrm %%EXAMPLESDIR%%/data
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/Makefile.x11
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/README
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/barrier.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/barrier.h
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/clipper.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/clrball.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/cones.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/configure
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/dyntmap.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/elev-2vu.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/elev.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/elevImage.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/fogtest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/fpsVis3d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/glxinfo.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/imgMirror.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/indexedPrims2D.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/isodrv-mt.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/isodrv.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/jack.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/jballs.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/keyfunc.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/libdio.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/libdio.h
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/lines2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/makeinclude
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/markers2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/offscreen.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/orderTest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/pdb.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/pdbwork.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/pickListTest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/pickTest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/pntcld.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/procmode.h
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/rm2screen.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/skeleton.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/spotlight.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/spriteTest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/switchtest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/tcube.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/text2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/textureTest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/tfly.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/tmap2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/trans2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/vector3d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/vis2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/vis3d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/vrend.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/vslicer.c
+%%WITH_DEMOS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/FUTUREPLANS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES