- Update to 1.6.0

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

4 files changed, 24 insertions, 15 deletions

diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index 2c2158fc3714..02bfd776670b 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=		openrm
-PORTVERSION=		1.5.2
+PORTVERSION=		1.6.0
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}-devel-${PORTVERSION}-3
+DISTNAME=		${PORTNAME}-devel-${PORTVERSION}-1
 .ifdef (WITH_DEMOS)
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
-			${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX}
+			${PORTNAME}-demo-${PORTVERSION}-1${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	ip@doom.homeunix.org
diff --git a/graphics/openrm/distinfo b/graphics/openrm/distinfo
index ab043cd85593..e8d96b57cb25 100644
--- a/graphics/openrm/distinfo
+++ b/graphics/openrm/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (openrm-devel-1.6.0-1.tar.gz) = 0975208e2434196d79c6e85b72183ce1
+SIZE (openrm-devel-1.6.0-1.tar.gz) = 1597347
+MD5 (openrm-demo-1.6.0-1.tar.gz) = c2d1f6a30a58b7cd21eaba9ccefb479e
+SIZE (openrm-demo-1.6.0-1.tar.gz) = 3953888
diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff
index 244a80543f7a..1ba5236b68e0 100644
--- a/graphics/openrm/files/makeinclude.diff
+++ b/graphics/openrm/files/makeinclude.diff
@@ -1,12 +1,12 @@
---- ../rmdemo/makeinclude.orig	Sun Apr 18 23:59:51 2004
-+++ ../rmdemo/makeinclude	Fri Aug 20 20:46:52 2004
+--- ../rmdemo/makeinclude.orig	Sun Aug 28 21:44:18 2005
++++ ../rmdemo/makeinclude	Sun Aug 28 21:43:53 2005
 @@ -2,21 +2,21 @@
  # autogenerated by configure
- # on Sun Apr 18 12:59:51 PDT 2004
+ # on Sun Aug  7 18:16:40 PDT 2005
  # 
--RMHOME=/usr/local/rm152
--RMLIBS=-L/usr/local/rm152/lib -lrm -lrmaux -lrmv -lrmi
--RMCFLAGS=-DRM_X -I/usr/local/rm152/include
+-RMHOME=/usr/local/rm160
+-RMLIBS=-L/usr/local/rm160/lib -lrm -lrmaux -lrmv -lrmi
+-RMCFLAGS=-DRM_X -I/usr/local/rm160/include
 +RMHOME=%%PREFIX%%
 +RMLIBS=-L${RMHOME}/lib -lrm -lrmaux -lrmv -lrmi
 +RMCFLAGS=-DRM_X -I${RMHOME}/include
diff --git a/graphics/openrm/pkg-plist b/graphics/openrm/pkg-plist
index 53887e9fdd77..c873035eeab8 100644
--- a/graphics/openrm/pkg-plist
+++ b/graphics/openrm/pkg-plist
@@ -8,6 +8,7 @@ include/rm/rmi.h
 include/rm/rmjpeg.h
 include/rm/rmpipe.h
 include/rm/rmppm.h
+include/rm/rmps.h
 include/rm/rmpublic.h
 include/rm/rmthread.h
 include/rm/rmtypes.h
@@ -57,14 +58,18 @@ lib/librmv.so.1
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/data/orangegrid.x
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/data/prairie.jpg
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/data/right.x
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/data/seaSurfaceTemperature.jpg
 %%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/weather.jpg
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/data/wu.x
 %%WITH_DEMOS%%@dirrm %%EXAMPLESDIR%%/data
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/Makefile.x11
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/README
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/appTexturedPrims.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/autoTmap.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/barrier.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/barrier.h
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/clipper.c
@@ -75,6 +80,7 @@ lib/librmv.so.1
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/elev-2vu.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/elev.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/elevImage.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/extensions.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/fogtest.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/fpsVis3d.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/glxinfo.c
@@ -90,6 +96,7 @@ lib/librmv.so.1
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/lines2d.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/makeinclude
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/markers2d.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/multiTexture2D.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/offscreen.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/orderTest.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/pdb.c
@@ -102,6 +109,7 @@ lib/librmv.so.1
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/skeleton.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/spotlight.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/spriteTest.c
+%%WITH_DEMOS%%%%EXAMPLESDIR%%/strands.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/switchtest.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/tcube.c
 %%WITH_DEMOS%%%%EXAMPLESDIR%%/text2d.c
@@ -134,6 +142,7 @@ lib/librmv.so.1
 %%PORTDOCS%%%%DOCSDIR%%/rmcmpmgr.h.html
 %%PORTDOCS%%%%DOCSDIR%%/rmcr.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmcreatw.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmdefaults.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmerror.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmflyui.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmfog.c.html
@@ -149,6 +158,8 @@ lib/librmv.so.1
 %%PORTDOCS%%%%DOCSDIR%%/rmpipe.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmppm.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmprim.c.html
+%%PORTDOCS%%%%DOCSDIR%%/rmprivat.h.html
+%%PORTDOCS%%%%DOCSDIR%%/rmps.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmrstate.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmscene.c.html
 %%PORTDOCS%%%%DOCSDIR%%/rmstats.h.html
@@ -167,9 +178,7 @@ lib/librmv.so.1
 %%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%%