4 files changed, 186 insertions, 147 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index a29dda829d06..6758bff04133 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -7,27 +7,33 @@
 #
 
 PORTNAME=	aqsis
-PORTVERSION=	1.6.0
-PORTREVISION=	3
+PORTVERSION=	1.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
+DISTNAME=	Aqsis-${PORTVERSION}-Source
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A photorealistic rendering system
 
+LICENSE=	BSD GPLv2
+LICENSE_COMB=	multi
+
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
+		xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
     		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=	yes
+CMAKE_VERBOSE=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl qmake moc rcc uic
+PLIST_SUB+=	LIBVERS=${PORTVERSION:R}
 
 INSTALLS_ICONS=	yes
 
diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo
index 1286dbccba3c..e24463c27161 100644
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aqsis-1.6.0.tar.gz) = b9477c761bc887e4bbc6f3a1d2bca5e508c15cf66d77fc0d1cd430dbb9b92fa4
-SIZE (aqsis-1.6.0.tar.gz) = 2867634
+SHA256 (Aqsis-1.8.0-Source.tar.gz) = c3bd72550c84822342c8e19db42ca8412ebc84adacf241efba346eaf6193fc50
+SIZE (Aqsis-1.8.0-Source.tar.gz) = 5646113
diff --git a/graphics/aqsis/files/patch-distribution_CMakeLists.txt b/graphics/aqsis/files/patch-distribution_CMakeLists.txt
new file mode 100644
index 000000000000..5a672b3b34ad
--- /dev/null
+++ b/graphics/aqsis/files/patch-distribution_CMakeLists.txt
@@ -0,0 +1,22 @@
+--- distribution/CMakeLists.txt.orig	2012-03-05 13:59:34.000000000 +0100
++++ distribution/CMakeLists.txt	2012-03-05 13:59:57.000000000 +0100
+@@ -111,11 +111,11 @@
+ # By moving it here, we guarantee it happens after the files are installed, as this
+ # is add_subdirectory'd last, and I arbitrarily choose piqsl, as if QT is enabled,
+ # all QT apps are build anyway at the moment.
+-if(AQSIS_USE_QT)
+-  set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}")
+-  set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}")
+-  INSTALL(CODE "
+-    include(BundleUtilities)
+-    fixup_bundle(\"${APPS}\"   \"\"   \"${DIRS}\")
+-    " COMPONENT main)
+-endif()
++#if(AQSIS_USE_QT)
++#  set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}")
++#  set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}")
++#  INSTALL(CODE "
++#    include(BundleUtilities)
++#    fixup_bundle(\"${APPS}\"   \"\"   \"${DIRS}\")
++#    " COMPONENT main)
++#endif()
diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist
index 41e136b7b7a0..dff8980a18bb 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -2,6 +2,7 @@ bin/aqsl
 bin/aqsltell
 bin/aqsis
 bin/miqser
+bin/ptview
 bin/teqser
 bin/eqsl
 bin/piqsl
@@ -17,20 +18,16 @@ include/aqsis/ri/rif.h
 include/aqsis/ri/shadeop.h
 include/aqsis/ri/slo.h
 include/aqsis/ri/slx.h
-include/aqsis/ri/ri.inl
-lib/libaqsis_math.so.1.6
+lib/libaqsis_math.so.%%LIBVERS%%
 lib/libaqsis_math.so.1
 lib/libaqsis_math.so
-lib/libaqsis_util.so.1.6
+lib/libaqsis_util.so.%%LIBVERS%%
 lib/libaqsis_util.so.1
 lib/libaqsis_util.so
-lib/libaqsis_riutil.so.1.6
+lib/libaqsis_riutil.so.%%LIBVERS%%
 lib/libaqsis_riutil.so.1
 lib/libaqsis_riutil.so
-lib/libaqsis_ribparse.so.1.6
-lib/libaqsis_ribparse.so.1
-lib/libaqsis_ribparse.so
-lib/libaqsis_slcomp.so.1.6
+lib/libaqsis_slcomp.so.%%LIBVERS%%
 lib/libaqsis_slcomp.so.1
 lib/libaqsis_slcomp.so
 lib/aqsis/exr_dspy.so
@@ -39,19 +36,19 @@ lib/aqsis/piqsl_dspy.so
 lib/aqsis/bmp_dspy.so
 lib/aqsis/xpm_dspy.so
 lib/aqsis/hairgen.so
-lib/libaqsis_tex.so.1.6
+lib/libaqsis_tex.so.%%LIBVERS%%
 lib/libaqsis_tex.so.1
 lib/libaqsis_tex.so
-lib/libaqsis_shadervm.so.1.6
+lib/libaqsis_shadervm.so.%%LIBVERS%%
 lib/libaqsis_shadervm.so.1
 lib/libaqsis_shadervm.so
-lib/libaqsis_slxargs.so.1.6
+lib/libaqsis_slxargs.so.%%LIBVERS%%
 lib/libaqsis_slxargs.so.1
 lib/libaqsis_slxargs.so
-lib/libaqsis_ri2rib.so.1.6
+lib/libaqsis_ri2rib.so.%%LIBVERS%%
 lib/libaqsis_ri2rib.so.1
 lib/libaqsis_ri2rib.so
-lib/libaqsis_core.so.1.6
+lib/libaqsis_core.so.%%LIBVERS%%
 lib/libaqsis_core.so.1
 lib/libaqsis_core.so
 share/pixmaps/aqsis.png
@@ -62,167 +59,178 @@ share/applications/aqsl.desktop
 share/applications/aqsltell.desktop
 share/applications/eqsl.desktop
 share/applications/piqsl.desktop
-%%DATADIR%%/scripts/aqsis.sh
-%%DATADIR%%/scripts/aqsl.sh
-%%DATADIR%%/scripts/aqsltell.sh
+%%DATADIR%%/examples/features/archives/bike.rib
+%%DATADIR%%/examples/features/archives/bikeData.rib.gz
+%%DATADIR%%/examples/features/archives/render.sh
+%%DATADIR%%/examples/features/bake/bakesphere.rib
+%%DATADIR%%/examples/features/bake/render.sh
+%%DATADIR%%/examples/features/bake/sphere.rib
+%%DATADIR%%/examples/features/curves/bezier.rib
+%%DATADIR%%/examples/features/curves/render.sh
+%%DATADIR%%/examples/features/layeredshaders/grid.tif
+%%DATADIR%%/examples/features/layeredshaders/layered.rib
+%%DATADIR%%/examples/features/layeredshaders/render.sh
+%%DATADIR%%/examples/features/layeredshaders/texmap.sl
+%%DATADIR%%/examples/features/levelofdetail/detail.rib
+%%DATADIR%%/examples/features/levelofdetail/render.sh
+%%DATADIR%%/examples/features/motionblur/camera.rib
+%%DATADIR%%/examples/features/motionblur/deformation.rib
+%%DATADIR%%/examples/features/motionblur/render_camera.sh
+%%DATADIR%%/examples/features/motionblur/render_deformation.sh
+%%DATADIR%%/examples/features/multipass/aov.rib
+%%DATADIR%%/examples/features/multipass/myval.sl
+%%DATADIR%%/examples/features/multipass/render.sh
+%%DATADIR%%/examples/features/objectinstance/render.sh
+%%DATADIR%%/examples/features/objectinstance/singlepolygon.rib
+%%DATADIR%%/examples/features/occlusion/envlight.sl
+%%DATADIR%%/examples/features/occlusion/occlmap.py
+%%DATADIR%%/examples/features/occlusion/occlmap.rib
+%%DATADIR%%/examples/features/occlusion/render.sh
+%%DATADIR%%/examples/features/occlusion/simple.rib
+%%DATADIR%%/examples/features/occlusion/world.rib
+%%DATADIR%%/examples/features/shadows/autoshadow.rib
+%%DATADIR%%/examples/features/shadows/render_autoshadow.sh
+%%DATADIR%%/examples/features/shadows/render_softshadow.sh
+%%DATADIR%%/examples/features/shadows/softshadow.rib
+%%DATADIR%%/examples/features/solidmodeling/csg.rib
+%%DATADIR%%/examples/features/solidmodeling/render.sh
+%%DATADIR%%/examples/features/subdivision/creases.rib
+%%DATADIR%%/examples/features/subdivision/render.sh
+%%DATADIR%%/examples/features/textures/grid.tif
+%%DATADIR%%/examples/features/textures/render.sh
+%%DATADIR%%/examples/features/textures/sticky.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/all_passes.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/ao.sl
+%%DATADIR%%/examples/point_based_gi/cornellbox/bake_pass.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/bake_points.sl
+%%DATADIR%%/examples/point_based_gi/cornellbox/beauty_pass.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/beauty_pass_ao.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/beautycam.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/geometry.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/indirect.sl
+%%DATADIR%%/examples/point_based_gi/cornellbox/lights.rib
+%%DATADIR%%/examples/point_based_gi/cornellbox/shadow_pass.rib
+%%DATADIR%%/examples/procedurals/menger/README.txt
+%%DATADIR%%/examples/procedurals/menger/menger.cpp
+%%DATADIR%%/examples/procedurals/menger/menger.rib
+%%DATADIR%%/examples/procedurals/menger/render.sh
+%%DATADIR%%/examples/scenes/fisheye/README.txt
+%%DATADIR%%/examples/scenes/fisheye/envmap.rib
+%%DATADIR%%/examples/scenes/fisheye/fisheye.rib
+%%DATADIR%%/examples/scenes/fisheye/fisheye_projection.sl
+%%DATADIR%%/examples/scenes/fisheye/lights.rib
+%%DATADIR%%/examples/scenes/fisheye/render.sh
+%%DATADIR%%/examples/scenes/fisheye/scene.rib
+%%DATADIR%%/examples/scenes/fisheye/world.rib
+%%DATADIR%%/examples/scenes/microbe/microbe.rib
+%%DATADIR%%/examples/scenes/microbe/render.sh
+%%DATADIR%%/examples/scenes/vase/render.sh
+%%DATADIR%%/examples/scenes/vase/vase.rib
 %%DATADIR%%/plugins/houdini/README.txt
-%%DATADIR%%/plugins/houdini/scripts/out/targets/ribcreate_aqsis1.6.cmd
-%%DATADIR%%/plugins/houdini/soho/parameters/RIBaqsis1.6.ds
-%%DATADIR%%/plugins/houdini/soho/parameters/SOHOparameters
-%%DATADIR%%/plugins/houdini/soho/RIBaqsis1.6.py
+%%DATADIR%%/plugins/houdini/RIBtargets
 %%DATADIR%%/plugins/houdini/hshaders.otl
 %%DATADIR%%/plugins/houdini/post.sh
+%%DATADIR%%/plugins/houdini/scripts/out/targets/ribcreate_aqsis1.6.cmd
 %%DATADIR%%/plugins/houdini/slx2otl.py
-%%DATADIR%%/plugins/houdini/RIBtargets
+%%DATADIR%%/plugins/houdini/soho/RIBaqsis1.6.py
+%%DATADIR%%/plugins/houdini/soho/parameters/RIBaqsis1.6.ds
+%%DATADIR%%/plugins/houdini/soho/parameters/SOHOparameters
+%%DATADIR%%/scripts/aqsis.sh
+%%DATADIR%%/scripts/aqsl.sh
+%%DATADIR%%/scripts/aqsltell.sh
 %%DATADIR%%/shaders/displacement/AqDMap.sl
+%%DATADIR%%/shaders/displacement/AqDMap.slx
+%%DATADIR%%/shaders/displacement/asteroid.sl
+%%DATADIR%%/shaders/displacement/asteroid.slx
 %%DATADIR%%/shaders/displacement/borg_metal.sl
-%%DATADIR%%/shaders/displacement/micro_bumps.sl
+%%DATADIR%%/shaders/displacement/borg_metal.slx
 %%DATADIR%%/shaders/displacement/bumpy.sl
-%%DATADIR%%/shaders/displacement/wavy.sl
+%%DATADIR%%/shaders/displacement/bumpy.slx
 %%DATADIR%%/shaders/displacement/dented.sl
-%%DATADIR%%/shaders/displacement/AqDMap.slx
-%%DATADIR%%/shaders/displacement/borg_metal.slx
+%%DATADIR%%/shaders/displacement/dented.slx
+%%DATADIR%%/shaders/displacement/micro_bumps.sl
 %%DATADIR%%/shaders/displacement/micro_bumps.slx
-%%DATADIR%%/shaders/displacement/bumpy.slx
+%%DATADIR%%/shaders/displacement/wavy.sl
 %%DATADIR%%/shaders/displacement/wavy.slx
-%%DATADIR%%/shaders/displacement/dented.slx
 %%DATADIR%%/shaders/imager/background.sl
-%%DATADIR%%/shaders/imager/fakesky.sl
-%%DATADIR%%/shaders/imager/filmgrain.sl
+%%DATADIR%%/shaders/imager/background.slx
 %%DATADIR%%/shaders/imager/bluescreen.sl
+%%DATADIR%%/shaders/imager/bluescreen.slx
 %%DATADIR%%/shaders/imager/exposure.sl
-%%DATADIR%%/shaders/imager/gradient.sl
-%%DATADIR%%/shaders/imager/iramp.sl
-%%DATADIR%%/shaders/imager/background.slx
+%%DATADIR%%/shaders/imager/exposure.slx
+%%DATADIR%%/shaders/imager/fakesky.sl
 %%DATADIR%%/shaders/imager/fakesky.slx
+%%DATADIR%%/shaders/imager/filmgrain.sl
 %%DATADIR%%/shaders/imager/filmgrain.slx
-%%DATADIR%%/shaders/imager/bluescreen.slx
-%%DATADIR%%/shaders/imager/exposure.slx
+%%DATADIR%%/shaders/imager/gradient.sl
 %%DATADIR%%/shaders/imager/gradient.slx
+%%DATADIR%%/shaders/imager/iramp.sl
 %%DATADIR%%/shaders/imager/iramp.slx
+%%DATADIR%%/shaders/include/patterns.sl
 %%DATADIR%%/shaders/light/ambientlight.sl
-%%DATADIR%%/shaders/light/shadowpoint.sl
-%%DATADIR%%/shaders/light/shadowdistant.sl
-%%DATADIR%%/shaders/light/pointlight.sl
-%%DATADIR%%/shaders/light/distantlight.sl
-%%DATADIR%%/shaders/light/spotlight.sl
-%%DATADIR%%/shaders/light/shadowspot.sl
 %%DATADIR%%/shaders/light/ambientlight.slx
-%%DATADIR%%/shaders/light/shadowpoint.slx
-%%DATADIR%%/shaders/light/shadowdistant.slx
-%%DATADIR%%/shaders/light/pointlight.slx
+%%DATADIR%%/shaders/light/distantlight.sl
 %%DATADIR%%/shaders/light/distantlight.slx
-%%DATADIR%%/shaders/light/spotlight.slx
+%%DATADIR%%/shaders/light/pointlight.sl
+%%DATADIR%%/shaders/light/pointlight.slx
+%%DATADIR%%/shaders/light/shadowdistant.sl
+%%DATADIR%%/shaders/light/shadowdistant.slx
+%%DATADIR%%/shaders/light/shadowpoint.sl
+%%DATADIR%%/shaders/light/shadowpoint.slx
+%%DATADIR%%/shaders/light/shadowspot.sl
 %%DATADIR%%/shaders/light/shadowspot.slx
-%%DATADIR%%/shaders/surface/SpaceTest.sl
-%%DATADIR%%/shaders/surface/show_st.sl
-%%DATADIR%%/shaders/surface/matte.sl
-%%DATADIR%%/shaders/surface/expensive.sl
-%%DATADIR%%/shaders/surface/curvetube.sl
-%%DATADIR%%/shaders/surface/pinkGranite.sl
-%%DATADIR%%/shaders/surface/debug.sl
-%%DATADIR%%/shaders/surface/metal.sl
-%%DATADIR%%/shaders/surface/cddiffract.h
-%%DATADIR%%/shaders/surface/randgrid.sl
-%%DATADIR%%/shaders/surface/show_N.sl
-%%DATADIR%%/shaders/surface/uvtest.sl
+%%DATADIR%%/shaders/light/spotlight.sl
+%%DATADIR%%/shaders/light/spotlight.slx
 %%DATADIR%%/shaders/surface/AqSMap.sl
-%%DATADIR%%/shaders/surface/microscope.sl
-%%DATADIR%%/shaders/surface/sticky_texture.sl
-%%DATADIR%%/shaders/surface/DPProctext.h
-%%DATADIR%%/shaders/surface/paintedplastic.sl
-%%DATADIR%%/shaders/surface/plastic.sl
-%%DATADIR%%/shaders/surface/shinymetal.sl
-%%DATADIR%%/shaders/surface/showuser.sl
-%%DATADIR%%/shaders/surface/constant.sl
-%%DATADIR%%/shaders/surface/cd.sl
-%%DATADIR%%/shaders/surface/cellnoisetest.sl
-%%DATADIR%%/shaders/surface/face_plastic.sl
+%%DATADIR%%/shaders/surface/AqSMap.slx
 %%DATADIR%%/shaders/surface/DPBlueMarble.sl
+%%DATADIR%%/shaders/surface/DPBlueMarble.slx
+%%DATADIR%%/shaders/surface/SpaceTest.sl
 %%DATADIR%%/shaders/surface/SpaceTest.slx
-%%DATADIR%%/shaders/surface/show_st.slx
-%%DATADIR%%/shaders/surface/matte.slx
-%%DATADIR%%/shaders/surface/expensive.slx
+%%DATADIR%%/shaders/surface/cd.sl
+%%DATADIR%%/shaders/surface/cd.slx
+%%DATADIR%%/shaders/surface/cellnoisetest.sl
+%%DATADIR%%/shaders/surface/cellnoisetest.slx
+%%DATADIR%%/shaders/surface/constant.sl
+%%DATADIR%%/shaders/surface/constant.slx
+%%DATADIR%%/shaders/surface/curvetube.sl
 %%DATADIR%%/shaders/surface/curvetube.slx
-%%DATADIR%%/shaders/surface/pinkGranite.slx
+%%DATADIR%%/shaders/surface/debug.sl
 %%DATADIR%%/shaders/surface/debug.slx
+%%DATADIR%%/shaders/surface/expensive.sl
+%%DATADIR%%/shaders/surface/expensive.slx
+%%DATADIR%%/shaders/surface/face_plastic.sl
+%%DATADIR%%/shaders/surface/face_plastic.slx
+%%DATADIR%%/shaders/surface/matte.sl
+%%DATADIR%%/shaders/surface/matte.slx
+%%DATADIR%%/shaders/surface/metal.sl
 %%DATADIR%%/shaders/surface/metal.slx
-%%DATADIR%%/shaders/surface/randgrid.slx
-%%DATADIR%%/shaders/surface/show_N.slx
-%%DATADIR%%/shaders/surface/uvtest.slx
-%%DATADIR%%/shaders/surface/AqSMap.slx
+%%DATADIR%%/shaders/surface/microscope.sl
 %%DATADIR%%/shaders/surface/microscope.slx
-%%DATADIR%%/shaders/surface/sticky_texture.slx
+%%DATADIR%%/shaders/surface/paintedplastic.sl
 %%DATADIR%%/shaders/surface/paintedplastic.slx
+%%DATADIR%%/shaders/surface/pinkGranite.sl
+%%DATADIR%%/shaders/surface/pinkGranite.slx
+%%DATADIR%%/shaders/surface/plastic.sl
 %%DATADIR%%/shaders/surface/plastic.slx
+%%DATADIR%%/shaders/surface/randgrid.sl
+%%DATADIR%%/shaders/surface/randgrid.slx
+%%DATADIR%%/shaders/surface/shinymetal.sl
 %%DATADIR%%/shaders/surface/shinymetal.slx
+%%DATADIR%%/shaders/surface/show_N.sl
+%%DATADIR%%/shaders/surface/show_N.slx
+%%DATADIR%%/shaders/surface/show_st.sl
+%%DATADIR%%/shaders/surface/show_st.slx
+%%DATADIR%%/shaders/surface/showuser.sl
 %%DATADIR%%/shaders/surface/showuser.slx
-%%DATADIR%%/shaders/surface/constant.slx
-%%DATADIR%%/shaders/surface/cd.slx
-%%DATADIR%%/shaders/surface/cellnoisetest.slx
-%%DATADIR%%/shaders/surface/face_plastic.slx
-%%DATADIR%%/shaders/surface/DPBlueMarble.slx
-%%DATADIR%%/shaders/volume/fog.sl
+%%DATADIR%%/shaders/surface/sticky_texture.sl
+%%DATADIR%%/shaders/surface/sticky_texture.slx
+%%DATADIR%%/shaders/surface/uvtest.sl
+%%DATADIR%%/shaders/surface/uvtest.slx
 %%DATADIR%%/shaders/volume/depthcue.sl
-%%DATADIR%%/shaders/volume/fog.slx
 %%DATADIR%%/shaders/volume/depthcue.slx
-%%DATADIR%%/shaders/include/patterns.sl
-%%DATADIR%%/examples/features/bake/bakesphere.rib
-%%DATADIR%%/examples/features/bake/render.sh
-%%DATADIR%%/examples/features/bake/sphere.rib
-%%DATADIR%%/examples/features/curves/render.sh
-%%DATADIR%%/examples/features/curves/bezier.rib
-%%DATADIR%%/examples/features/objectinstance/singlepolygon.rib
-%%DATADIR%%/examples/features/objectinstance/render.sh
-%%DATADIR%%/examples/features/motionblur/camera.rib
-%%DATADIR%%/examples/features/motionblur/render_deformation.sh
-%%DATADIR%%/examples/features/motionblur/render_camera.sh
-%%DATADIR%%/examples/features/motionblur/deformation.rib
-%%DATADIR%%/examples/features/shadows/autoshadow.rib
-%%DATADIR%%/examples/features/shadows/render_autoshadow.sh
-%%DATADIR%%/examples/features/shadows/softshadow.rib
-%%DATADIR%%/examples/features/shadows/render_softshadow.sh
-%%DATADIR%%/examples/features/levelofdetail/render.sh
-%%DATADIR%%/examples/features/levelofdetail/detail.rib
-%%DATADIR%%/examples/features/layeredshaders/grid.tif
-%%DATADIR%%/examples/features/layeredshaders/render.sh
-%%DATADIR%%/examples/features/layeredshaders/texmap.sl
-%%DATADIR%%/examples/features/layeredshaders/layered.rib
-%%DATADIR%%/examples/features/subdivision/render.sh
-%%DATADIR%%/examples/features/subdivision/creases.rib
-%%DATADIR%%/examples/features/occlusion/simple.rib
-%%DATADIR%%/examples/features/occlusion/occlmap.py
-%%DATADIR%%/examples/features/occlusion/render.sh
-%%DATADIR%%/examples/features/occlusion/occlmap.rib
-%%DATADIR%%/examples/features/occlusion/envlight.sl
-%%DATADIR%%/examples/features/occlusion/world.rib
-%%DATADIR%%/examples/features/textures/grid.tif
-%%DATADIR%%/examples/features/textures/render.sh
-%%DATADIR%%/examples/features/textures/sticky.rib
-%%DATADIR%%/examples/features/archives/bike.rib
-%%DATADIR%%/examples/features/archives/bikeData.rib.gz
-%%DATADIR%%/examples/features/archives/render.sh
-%%DATADIR%%/examples/features/multipass/myval.sl
-%%DATADIR%%/examples/features/multipass/render.sh
-%%DATADIR%%/examples/features/multipass/aov.rib
-%%DATADIR%%/examples/features/solidmodeling/csg.rib
-%%DATADIR%%/examples/features/solidmodeling/render.sh
-%%DATADIR%%/examples/procedurals/menger/menger.rib
-%%DATADIR%%/examples/procedurals/menger/README.txt
-%%DATADIR%%/examples/procedurals/menger/menger.cpp
-%%DATADIR%%/examples/procedurals/menger/render.sh
-%%DATADIR%%/examples/scenes/fisheye/README.txt
-%%DATADIR%%/examples/scenes/fisheye/fisheye_projection.sl
-%%DATADIR%%/examples/scenes/fisheye/lights.rib
-%%DATADIR%%/examples/scenes/fisheye/scene.rib
-%%DATADIR%%/examples/scenes/fisheye/render.sh
-%%DATADIR%%/examples/scenes/fisheye/envmap.rib
-%%DATADIR%%/examples/scenes/fisheye/fisheye.rib
-%%DATADIR%%/examples/scenes/fisheye/world.rib
-%%DATADIR%%/examples/scenes/vase/vase.rib
-%%DATADIR%%/examples/scenes/vase/render.sh
-%%DATADIR%%/examples/scenes/microbe/microbe.rib
-%%DATADIR%%/examples/scenes/microbe/render.sh
+%%DATADIR%%/shaders/volume/fog.sl
+%%DATADIR%%/shaders/volume/fog.slx
 @dirrm %%DATADIR%%/shaders/volume
 @dirrm %%DATADIR%%/shaders/surface
 @dirrm %%DATADIR%%/shaders/light
@@ -244,6 +252,8 @@ share/applications/piqsl.desktop
 @dirrm %%DATADIR%%/examples/scenes
 @dirrm %%DATADIR%%/examples/procedurals/menger
 @dirrm %%DATADIR%%/examples/procedurals
+@dirrm %%DATADIR%%/examples/point_based_gi/cornellbox
+@dirrm %%DATADIR%%/examples/point_based_gi
 @dirrm %%DATADIR%%/examples/features/textures
 @dirrm %%DATADIR%%/examples/features/subdivision
 @dirrm %%DATADIR%%/examples/features/solidmodeling
@@ -259,6 +269,7 @@ share/applications/piqsl.desktop
 @dirrm %%DATADIR%%/examples/features/archives
 @dirrm %%DATADIR%%/examples/features
 @dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
 @dirrm lib/aqsis
 @dirrm include/aqsis/ri