4 files changed, 61 insertions, 40 deletions

diff --git a/graphics/linux-bmrt/Makefile b/graphics/linux-bmrt/Makefile
index 81c8c069d601..354fb86f1f6f 100644
--- a/graphics/linux-bmrt/Makefile
+++ b/graphics/linux-bmrt/Makefile
@@ -6,30 +6,40 @@
 #
 
 PORTNAME=	linux-bmrt
-PORTVERSION=	2.5.0.8
+PORTVERSION=	2.6beta
 CATEGORIES=	graphics linux
-MASTER_SITES=	http://www.bmrt.org/BMRTdownload/
-DISTNAME=	BMRT2.5h.linux-glibc2
+MASTER_SITES=	#fetch manually
+DISTNAME=	BMRT${PORTVERSION}.linux-glibc2
 
 MAINTAINER=	rjoseph@mammalia.org
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \
+		/compat/linux/usr/X11R6/lib/libGL.so:${PORTSDIR}/graphics/linux_mesa3
 
-WRKSRC=		${WRKDIR}/BMRT2.5
+WRKSRC=		${WRKDIR}/BMRT2.6
 NO_BUILD=	yes
+ONLY_FOR_ARCHS=	i386
 NO_CDROM=	"See the License"
 
 # Linux binary should not be stripped by INSTALL_PROGRAM as it uses
 # /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
 STRIP=
 
-# Linux binary should not be stripped by INSTALL_PROGRAM as it uses
-# /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
-STRIP=
+.include <bsd.port.pre.mk>
 
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=        may not be automatically fetched due to licensing \
+               restrictions.  You must manually fetch the Linux version at \
+               http://www.exluna.com/bmrt/download/index.html. \
+               Once you have read and agreed to the license and \
+               ${DISTFILES} has been downloaded, move it to \
+               ${DISTDIR} and then restart this build.
+.endif
+
+INC_DIR=	${PREFIX}/include/bmrt
+LIB_DIR=	${PREFIX}/lib/bmrt
 DOC_DIR=	${PREFIX}/share/doc/bmrt
-FETCH_CMD=	/usr/bin/fetch -Ab
-PROGRAM=	composite mkmip mkmosaic rendrib rgl slc slctell
+PROGRAM=	composite iv mkmip mkmosaic rendrib rgl slc slctell
 SCRIPT=		farm frankenrender
 
 pre-install:
@@ -37,14 +47,17 @@ pre-install:
 	${SED} 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' ${WRKSRC}/bin/frankenrender.old > ${WRKSRC}/bin/frankenrender
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib
+	${MKDIR} ${LIB_DIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib/bmrt
 	${MKDIR} ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/bmrtdoc.pdf ${DOC_DIR}
+	${INSTALL_DATA} ${WRKSRC}/Changes ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/License ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOC_DIR}
 	${MKDIR} ${DOC_DIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOC_DIR}/html
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
+	${MKDIR} ${INC_DIR}
+	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/bmrt
 	${MKDIR} ${PREFIX}/share/examples/bmrt
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/bmrt
 	${MKDIR} ${PREFIX}/share/bmrt ${PREFIX}/share/bmrt/shaders
@@ -62,9 +75,6 @@ post-install:
 	@${ECHO} "";
 	@${ECHO} "************************************************************************";
 	@${ECHO} "";
-	@${ECHO} "      This is shareware that is free for non-commercial use.";
-	@${ECHO} "      Please read ${PREFIX}/share/doc/bmrt/License before proceeding.";
-	@${ECHO} "";
 	@${ECHO} "      Before using these programs, add the following";
 	@${ECHO} "      path to your shell environment:";
 	@${ECHO} "";
@@ -80,4 +90,4 @@ post-install:
 	@${ECHO} "************************************************************************";
 	@${ECHO} "";
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/linux-bmrt/distinfo b/graphics/linux-bmrt/distinfo
index aa71cc865831..a285adab8cdb 100644
--- a/graphics/linux-bmrt/distinfo
+++ b/graphics/linux-bmrt/distinfo
@@ -1 +1 @@
-MD5 (BMRT2.5h.linux-glibc2.tar.gz) = dfbe508d03b352a01949679809cd3e06
+MD5 (BMRT2.6beta.linux-glibc2.tar.gz) = 64467f3ad1e5bf2b9bfa6b4a73c592be
diff --git a/graphics/linux-bmrt/pkg-descr b/graphics/linux-bmrt/pkg-descr
index deb0def14d0d..895396a5a7eb 100644
--- a/graphics/linux-bmrt/pkg-descr
+++ b/graphics/linux-bmrt/pkg-descr
@@ -1,11 +1,5 @@
 Blue Moon Rendering Tools are a collection of rendering programs which adhere
 to the RenderMan(R) interface standard (RenderMan is a registered trademark
 of Pixar).
-This program is shareware that is free for non commercial use.  To use it commercially,
-it must be registered.  Read the license before using.  For more information, vist
-http://www.bmrt.org.
 
-_____
-
-R Joseph Wright
-rjoseph@mammalia.org
+WWW:http://www.exluna.com/bmrt
diff --git a/graphics/linux-bmrt/pkg-plist b/graphics/linux-bmrt/pkg-plist
index 3bdf107ec275..98c3f4777349 100644
--- a/graphics/linux-bmrt/pkg-plist
+++ b/graphics/linux-bmrt/pkg-plist
@@ -1,17 +1,18 @@
 bin/composite
 bin/farm
 bin/frankenrender
+bin/iv
 bin/mkmip
 bin/mkmosaic
 bin/rendrib
 bin/rgl
 bin/slc
 bin/slctell
-include/ri.h
-include/slc.h
-lib/libribout.a
-lib/libslcargs.a
-lib/rayserver.so
+include/bmrt/ri.h
+include/bmrt/slc.h
+lib/bmrt/libribout.a
+lib/bmrt/libslcargs.a
+lib/bmrt/rayserver.so
 share/bmrt/rendribrc.sample
 share/bmrt/shaders/Makefile
 share/bmrt/shaders/ambientlight.linux.slc
@@ -63,6 +64,9 @@ share/bmrt/shaders/displace.h
 share/bmrt/shaders/distantlight.linux.slc
 share/bmrt/shaders/distantlight.sl
 share/bmrt/shaders/distantlight.slc
+share/bmrt/shaders/fakesky.linux.slc
+share/bmrt/shaders/fakesky.sl
+share/bmrt/shaders/fakesky.slc
 share/bmrt/shaders/filterwidth.h
 share/bmrt/shaders/fog.linux.slc
 share/bmrt/shaders/fog.sl
@@ -171,23 +175,32 @@ share/bmrt/shaders/windowlight.slc
 share/bmrt/shaders/wood2.linux.slc
 share/bmrt/shaders/wood2.sl
 share/bmrt/shaders/wood2.slc
+share/doc/bmrt/Changes
 share/doc/bmrt/License
 share/doc/bmrt/README
 share/doc/bmrt/bmrtdoc.pdf
-share/doc/bmrt/html/About_this_document.html
-share/doc/bmrt/html/Bibliography.html
-share/doc/bmrt/html/Contents.html
-share/doc/bmrt/html/Detailed_Description_Render.html
-share/doc/bmrt/html/Introduction.html
-share/doc/bmrt/html/Miscellaneous_Tools.html
-share/doc/bmrt/html/Photo_realistic_rendering_w.html
-share/doc/bmrt/html/Previewing_RIB_files_with.html
-share/doc/bmrt/html/Shaders_Textures.html
-share/doc/bmrt/html/Using_BMRT_as_Ray.html
 share/doc/bmrt/html/bmrtdoc.css
 share/doc/bmrt/html/bmrtdoc.html
+share/doc/bmrt/html/contents.png
+share/doc/bmrt/html/crossref.png
+share/doc/bmrt/html/exluna-logo4.jpg
+share/doc/bmrt/html/exluna-logo5.jpg
 share/doc/bmrt/html/index.html
-share/examples/bmrt/Makefile
+share/doc/bmrt/html/next.png
+share/doc/bmrt/html/next_g.png
+share/doc/bmrt/html/node1.html
+share/doc/bmrt/html/node2.html
+share/doc/bmrt/html/node3.html
+share/doc/bmrt/html/node4.html
+share/doc/bmrt/html/node5.html
+share/doc/bmrt/html/node6.html
+share/doc/bmrt/html/node7.html
+share/doc/bmrt/html/node8.html
+share/doc/bmrt/html/node9.html
+share/doc/bmrt/html/prev.png
+share/doc/bmrt/html/prev_g.png
+share/doc/bmrt/html/up.png
+share/doc/bmrt/html/up_g.png
 share/examples/bmrt/README
 share/examples/bmrt/colorspheres.c
 share/examples/bmrt/cornell.rib
@@ -196,7 +209,9 @@ share/examples/bmrt/dresser.rib
 share/examples/bmrt/limbo.rib
 share/examples/bmrt/makemaps.rib
 share/examples/bmrt/shadtest.rib
+share/examples/bmrt/skylight.rib
 share/examples/bmrt/smokebox.rib
+share/examples/bmrt/snake.rib
 share/examples/bmrt/teapot.rib
 share/examples/bmrt/teapots.rib
 share/examples/bmrt/testmaps.rib
@@ -205,6 +220,8 @@ share/examples/bmrt/texbox1.rib
 share/examples/bmrt/tpdisp.rib
 share/examples/bmrt/vase.rib
 share/examples/bmrt/vasegallery1.rib
+@dirrm include/bmrt
+@dirrm lib/bmrt
 @dirrm share/bmrt/shaders
 @dirrm share/bmrt
 @dirrm share/doc/bmrt/html