8 files changed, 289 insertions, 320 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 3ac1de64e0e7..04d11f025fb7 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -7,67 +7,37 @@
 #
 
 PORTNAME=	aqsis
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A photorealistic rendering system
 
-BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
-		bison:${PORTSDIR}/devel/bison \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		fltk-threads>=0:${PORTSDIR}/x11-toolkits/fltk-threads
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		aprutil-1.3:${PORTSDIR}/devel/apr \
-		db-4.2.2:${PORTSDIR}/databases/db42
+
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		fltk-threads>=0:${PORTSDIR}/x11-toolkits/fltk-threads
 
 LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS=	-DAQSIS_BOOST_FILESYSTEM_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_filesystem.so \
-		-DAQSIS_BOOST_REGEX_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_regex.so \
-		-DAQSIS_BOOST_THREAD_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_thread.so \
-		-DAQSIS_BOOST_WAVE_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_wave.so \
-		-DAQSIS_FLTK_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libfltk.so
-#		-DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME:STRING=boost_filesystem \
-#		-DAQSIS_BOOST_REGEX_LIBRARY_NAME:STRING=boost_regex \
-#		-DAQSIS_BOOST_THREAD_LIBRARY_NAME:STRING=boost_thread \
-#		-DAQSIS_BOOST_WAVE_LIBRARY_NAME:STRING=boost_wave \
-#		-DAQSIS_FLTK_INCLUDE_DIR:PATH=${LOCALBASE}/include \
-#		-DAQSIS_FLTK_LIBRARIES_DIR:PATH=${LOCALBSAE}/lib
-CMAKE_USE_PTHREAD=	yes
 
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
+CMAKE_USE_PTHREAD=	yes
+
+INSTALLS_ICONS=	yes
 
 # Required for off-source building
 CMAKE_BUILD_PATH=	${WRKSRC}/build
 CMAKE_SOURCE_PATH=	${WRKSRC}/
 CONFIGURE_WRKSRC=	${CMAKE_BUILD_PATH}
+BUILD_WRKSRC=		${CMAKE_BUILD_PATH}
+INSTALL_WRKSRC=		${CMAKE_BUILD_PATH}
 
 post-extract:
 	${MKDIR} ${CMAKE_BUILD_PATH}
 
-post-patch:
-	${REINPLACE_CMD} -e '47s/$$/ || defined(__sparc64__)/' \
-	    ${WRKSRC}/renderer/ddmanager/ndspy.h
-
-post-configure:
-	${FIND} ${WRKSRC} -name "relink.txt" -o -name "link.txt" \
-	    | ${XARGS} ${REINPLACE_CMD} -i "" -e 's|\-ldl||g'
-
-do-build:
-	cd ${CMAKE_BUILD_PATH} && ${MAKE}
-
-do-install:
-	cd ${CMAKE_BUILD_PATH} && ${MAKE} install
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo
index 803e721c4c50..ec4399d390ac 100644
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1,3 +1,3 @@
-MD5 (aqsis-1.4.2.tar.gz) = 6194c3af3ddc80999351565f2b2e2f55
-SHA256 (aqsis-1.4.2.tar.gz) = 40a3672ef749b1c3e179c6acbdd7398704c190ecc912e5607c792de1ca70c2de
-SIZE (aqsis-1.4.2.tar.gz) = 2483901
+MD5 (aqsis-1.6.0.tar.gz) = 31ca940b7894ba536f107c42e480541d
+SHA256 (aqsis-1.6.0.tar.gz) = b9477c761bc887e4bbc6f3a1d2bca5e508c15cf66d77fc0d1cd430dbb9b92fa4
+SIZE (aqsis-1.6.0.tar.gz) = 2867634
diff --git a/graphics/aqsis/files/patch-CMakeLists.txt b/graphics/aqsis/files/patch-CMakeLists.txt
deleted file mode 100644
index ad3da46036b6..000000000000
--- a/graphics/aqsis/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- CMakeLists.txt.orig	2009-01-21 22:12:32.000000000 +0100
-+++ CMakeLists.txt	2009-04-01 23:23:39.000000000 +0200
-@@ -2,6 +2,12 @@
- 
- CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
- 
-+if(COMMAND cmake_policy)
-+    cmake_policy(SET CMP0003 NEW)
-+    cmake_policy(SET CMP0005 OLD)
-+endif(COMMAND cmake_policy)
-+SET(CMAKE_DL_LIBS "")
-+
- # Set some variables used within various resources, including installer scripts.
- SET(AQSIS_PROJECT_NAME "Aqsis Renderer")
- SET(AQSIS_PROJECT_NAME_SHORT "Aqsis")
-@@ -17,7 +23,6 @@
- 
- INCLUDE(macros)
- 
--INCLUDE(FirstCMakeRun)
- INCLUDE(OutOfSourceBuild)
- 
- # Find path to precompiled libs on windows.
-@@ -270,9 +275,6 @@
- SET(PROCEDURALPATH "${PROCEDURALPATH}" CACHE STRING "Aqsis procedural searchpath")
- SET(RESOURCEPATH "${RESOURCEPATH}" CACHE STRING "Aqsis resource searchpath")
- CONFIGURE_FILE(aqsisrc.in.cmake ${PROJECT_BINARY_DIR}/aqsisrc)
--ADD_CUSTOM_TARGET(aqsisrc ALL echo
--	DEPENDS  ${PROJECT_BINARY_DIR}/aqsisrc
--	)
- INSTALL(FILES ${PROJECT_BINARY_DIR}/aqsisrc DESTINATION ${SYSCONFDIR})
- 
- 
diff --git a/graphics/aqsis/files/patch-aqsistypes_plugins.cpp b/graphics/aqsis/files/patch-aqsistypes_plugins.cpp
deleted file mode 100644
index a7b440f15a8a..000000000000
--- a/graphics/aqsis/files/patch-aqsistypes_plugins.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- aqsistypes/plugins.cpp.orig	2007-12-13 22:54:31.000000000 +0100
-+++ aqsistypes/plugins.cpp	2007-12-13 22:55:24.000000000 +0100
-@@ -170,7 +170,7 @@
- 	LocalFree( lpMsgBuf );
- #elif not defined AQSIS_SYSTEM_MACOSX
- 
--	char* error = dlerror();
-+	const char* error = dlerror();
- 	if( error )
- 		errorlog = error;
- #endif
diff --git a/graphics/aqsis/files/patch-displays-piqsl_piqsl.cpp b/graphics/aqsis/files/patch-displays-piqsl_piqsl.cpp
deleted file mode 100644
index 65f1acc62a32..000000000000
--- a/graphics/aqsis/files/patch-displays-piqsl_piqsl.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- displays/piqsl/piqsl.cpp.orig	2009-01-22 00:12:32.000000000 +0300
-+++ displays/piqsl/piqsl.cpp	2009-11-23 05:15:05.000000000 +0300
-@@ -29,6 +29,7 @@
- #define WIN32_LEAN_AND_MEAN
- #endif
- 
-+#include	<iostream.h>
- #include	<tiffio.h>
- #include	<string>
- #include	<list>
-@@ -39,7 +40,7 @@
- #include	<boost/archive/iterators/transform_width.hpp>
- #include	<boost/archive/iterators/remove_whitespace.hpp>
- 
--#include	<boost/pfto.hpp>
-+#include	<boost/serialization/pfto.hpp>
- #ifndef	AQSIS_SYSTEM_WIN32
- #include	<sys/types.h>
- #include	<sys/socket.h>
diff --git a/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt b/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt
new file mode 100644
index 000000000000..e75a6b837d59
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- libs/util/CMakeLists.txt.orig	2009-12-31 13:34:07.000000000 +0100
++++ libs/util/CMakeLists.txt	2009-12-31 13:34:12.000000000 +0100
+@@ -33,7 +33,7 @@
+ 
+ set(linklibs ${Boost_FILESYSTEM_LIBRARY})
+ if(UNIX)
+-	list(APPEND linklibs dl)
++	list(APPEND linklibs)
+ elseif(WIN32)
+ 	list(APPEND linklibs ws2_32)
+ endif()
diff --git a/graphics/aqsis/files/patch-libs-utils_plugins.cpp b/graphics/aqsis/files/patch-libs-utils_plugins.cpp
new file mode 100644
index 000000000000..ddc9be101b45
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-utils_plugins.cpp
@@ -0,0 +1,11 @@
+--- libs/util/plugins.cpp.orig	2009-12-31 13:32:11.000000000 +0100
++++ libs/util/plugins.cpp	2009-12-31 13:32:32.000000000 +0100
+@@ -170,7 +170,7 @@
+ 	LocalFree( lpMsgBuf );
+ #else //not defined AQSIS_SYSTEM_MACOSX
+ 
+-	char* error = dlerror();
++	const char* error = dlerror();
+ 	if( error )
+ 		errorlog = error;
+ #endif
diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist
index d4af3736a811..41e136b7b7a0 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -1,233 +1,273 @@
-bin/aqsis
 bin/aqsl
 bin/aqsltell
-bin/eqsl
+bin/aqsis
 bin/miqser
-bin/piqsl
 bin/teqser
+bin/eqsl
+bin/piqsl
 etc/aqsis/aqsisrc
 include/aqsis/aqsis.h
-include/aqsis/aqsis_compiler.h
-include/aqsis/aqsis_config.h
-include/aqsis/aqsis_types.h
-include/aqsis/aqsismath.h
-include/aqsis/bitvector.h
-include/aqsis/cellnoise.h
-include/aqsis/color.h
-include/aqsis/exception.h
-include/aqsis/execute.h
-include/aqsis/file.h
-include/aqsis/list.h
-include/aqsis/logging.h
-include/aqsis/logging_streambufs.h
-include/aqsis/lowdiscrep.h
-include/aqsis/matrix.h
-include/aqsis/matrix2d.h
-include/aqsis/memorysentry.h
-include/aqsis/multitimer.h
-include/aqsis/multitimer_system.h
-include/aqsis/ndspy.h
-include/aqsis/noise.h
-include/aqsis/noise1234.h
-include/aqsis/plugins.h
-include/aqsis/pool.h
-include/aqsis/random.h
-include/aqsis/refcount.h
-include/aqsis/ri.h
-include/aqsis/ri.inl
-include/aqsis/ri_types.h
-include/aqsis/riparamlist.h
-include/aqsis/shadeop.h
-include/aqsis/slo.h
-include/aqsis/slx.h
-include/aqsis/smartptr.h
-include/aqsis/socket.h
-include/aqsis/socket_system.h
-include/aqsis/spline.h
-include/aqsis/sstring.h
-include/aqsis/vector2d.h
-include/aqsis/vector3d.h
-include/aqsis/vector4d.h
-lib/aqsis/libd_bmp.so
-lib/aqsis/libd_exr.so
-lib/aqsis/libd_xpm.so
-lib/aqsis/libdisplay.so
-lib/aqsis/libpiqsldisplay.so
-lib/libaqsis.so
-lib/libaqsis.so.1
-lib/libaqsis.so.1.4
-lib/libaqsisargparse.so
-lib/libaqsisargparse.so.1
-lib/libaqsisargparse.so.1.4
-lib/libaqsistex.so
-lib/libaqsistex.so.1
-lib/libaqsistex.so.1.4
-lib/libaqsistypes.so
-lib/libaqsistypes.so.1
-lib/libaqsistypes.so.1.4
-lib/libri2rib.so
-lib/libri2rib.so.1
-lib/libri2rib.so.1.4
-lib/libshadervm.so
-lib/libshadervm.so.1
-lib/libshadervm.so.1.4
-lib/libslxargs.so
-lib/libslxargs.so.1
-lib/libslxargs.so.1.4
+include/aqsis/inttype.h
+include/aqsis/config.h
+include/aqsis/version.h
+include/aqsis/ri/ndspy.h
+include/aqsis/ri/ri.h
+include/aqsis/ri/ritypes.h
+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.1
+lib/libaqsis_math.so
+lib/libaqsis_util.so.1.6
+lib/libaqsis_util.so.1
+lib/libaqsis_util.so
+lib/libaqsis_riutil.so.1.6
+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.1
+lib/libaqsis_slcomp.so
+lib/aqsis/exr_dspy.so
+lib/aqsis/file_dspy.so
+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.1
+lib/libaqsis_tex.so
+lib/libaqsis_shadervm.so.1.6
+lib/libaqsis_shadervm.so.1
+lib/libaqsis_shadervm.so
+lib/libaqsis_slxargs.so.1.6
+lib/libaqsis_slxargs.so.1
+lib/libaqsis_slxargs.so
+lib/libaqsis_ri2rib.so.1.6
+lib/libaqsis_ri2rib.so.1
+lib/libaqsis_ri2rib.so
+lib/libaqsis_core.so.1.6
+lib/libaqsis_core.so.1
+lib/libaqsis_core.so
+share/pixmaps/aqsis.png
+share/icons/hicolor/192x192/mimetypes/aqsis-doc.png
+share/mime/packages/aqsis.xml
 share/applications/aqsis.desktop
 share/applications/aqsl.desktop
 share/applications/aqsltell.desktop
 share/applications/eqsl.desktop
 share/applications/piqsl.desktop
-share/mime/packages/aqsis.xml
-share/pixmaps/aqsis-doc.png
-share/pixmaps/aqsis.png
 %%DATADIR%%/scripts/aqsis.sh
 %%DATADIR%%/scripts/aqsl.sh
 %%DATADIR%%/scripts/aqsltell.sh
-%%DATADIR%%/scripts/mpanalyse.py
-%%DATADIR%%/shaders/matte.sl
-%%DATADIR%%/shaders/ambientlight.sl
-%%DATADIR%%/shaders/background.sl
-%%DATADIR%%/shaders/metal.sl
-%%DATADIR%%/shaders/pointlight.sl
-%%DATADIR%%/shaders/bumpy.sl
-%%DATADIR%%/shaders/distantlight.sl
-%%DATADIR%%/shaders/spotlight.sl
-%%DATADIR%%/shaders/paintedplastic.sl
-%%DATADIR%%/shaders/plastic.sl
-%%DATADIR%%/shaders/shinymetal.sl
-%%DATADIR%%/shaders/fog.sl
-%%DATADIR%%/shaders/constant.sl
-%%DATADIR%%/shaders/depthcue.sl
-%%DATADIR%%/shaders/matte.slx
-%%DATADIR%%/shaders/ambientlight.slx
-%%DATADIR%%/shaders/background.slx
-%%DATADIR%%/shaders/metal.slx
-%%DATADIR%%/shaders/pointlight.slx
-%%DATADIR%%/shaders/bumpy.slx
-%%DATADIR%%/shaders/distantlight.slx
-%%DATADIR%%/shaders/fog.slx
-%%DATADIR%%/shaders/spotlight.slx
-%%DATADIR%%/shaders/paintedplastic.slx
-%%DATADIR%%/shaders/plastic.slx
-%%DATADIR%%/shaders/shinymetal.slx
-%%DATADIR%%/shaders/constant.slx
-%%DATADIR%%/shaders/depthcue.slx
-%%DATADIR%%/content/ribs/features/bake/bakesphere.rib
-%%DATADIR%%/content/ribs/features/bake/render.sh
-%%DATADIR%%/content/ribs/features/bake/sphere.rib
-%%DATADIR%%/content/ribs/features/curves/render.sh
-%%DATADIR%%/content/ribs/features/curves/bezier.rib
-%%DATADIR%%/content/ribs/features/objectinstance/singlepolygon.rib
-%%DATADIR%%/content/ribs/features/objectinstance/render.sh
-%%DATADIR%%/content/ribs/features/motionblur/camera.rib
-%%DATADIR%%/content/ribs/features/motionblur/render_deformation.sh
-%%DATADIR%%/content/ribs/features/motionblur/render_camera.sh
-%%DATADIR%%/content/ribs/features/motionblur/deformation.rib
-%%DATADIR%%/content/ribs/features/shadows/autoshadow.rib
-%%DATADIR%%/content/ribs/features/shadows/render_autoshadow.sh
-%%DATADIR%%/content/ribs/features/shadows/softshadow.rib
-%%DATADIR%%/content/ribs/features/shadows/render_softshadow.sh
-%%DATADIR%%/content/ribs/features/levelofdetail/render.sh
-%%DATADIR%%/content/ribs/features/levelofdetail/detail.rib
-%%DATADIR%%/content/ribs/features/layeredshaders/grid.tif
-%%DATADIR%%/content/ribs/features/layeredshaders/render.sh
-%%DATADIR%%/content/ribs/features/layeredshaders/texmap.sl
-%%DATADIR%%/content/ribs/features/layeredshaders/layered.rib
-%%DATADIR%%/content/ribs/features/subdivision/render.sh
-%%DATADIR%%/content/ribs/features/subdivision/creases.rib
-%%DATADIR%%/content/ribs/features/occlusion/simple.rib
-%%DATADIR%%/content/ribs/features/occlusion/occlmap.py
-%%DATADIR%%/content/ribs/features/occlusion/render.sh
-%%DATADIR%%/content/ribs/features/occlusion/occlmap.rib
-%%DATADIR%%/content/ribs/features/occlusion/envlight.sl
-%%DATADIR%%/content/ribs/features/occlusion/world.rib
-%%DATADIR%%/content/ribs/features/textures/grid.tif
-%%DATADIR%%/content/ribs/features/textures/render.sh
-%%DATADIR%%/content/ribs/features/textures/sticky.rib
-%%DATADIR%%/content/ribs/features/multipass/myval.sl
-%%DATADIR%%/content/ribs/features/multipass/render.sh
-%%DATADIR%%/content/ribs/features/multipass/aov.rib
-%%DATADIR%%/content/ribs/features/solidmodeling/csg.rib
-%%DATADIR%%/content/ribs/features/solidmodeling/render.sh
-%%DATADIR%%/content/ribs/scenes/fisheye/README.txt
-%%DATADIR%%/content/ribs/scenes/fisheye/fisheye_projection.sl
-%%DATADIR%%/content/ribs/scenes/fisheye/lights.rib
-%%DATADIR%%/content/ribs/scenes/fisheye/scene.rib
-%%DATADIR%%/content/ribs/scenes/fisheye/render.sh
-%%DATADIR%%/content/ribs/scenes/fisheye/envmap.rib
-%%DATADIR%%/content/ribs/scenes/fisheye/fisheye.rib
-%%DATADIR%%/content/ribs/scenes/fisheye/world.rib
-%%DATADIR%%/content/ribs/scenes/vase/vase.rib
-%%DATADIR%%/content/ribs/scenes/vase/render.sh
-%%DATADIR%%/content/ribs/scenes/microbe/microbe.rib
-%%DATADIR%%/content/ribs/scenes/microbe/render.sh
-%%DATADIR%%/content/shaders/displacement/AqDMap.sl
-%%DATADIR%%/content/shaders/displacement/borg_metal.sl
-%%DATADIR%%/content/shaders/displacement/micro_bumps.sl
-%%DATADIR%%/content/shaders/displacement/wavy.sl
-%%DATADIR%%/content/shaders/displacement/dented.sl
-%%DATADIR%%/content/shaders/include/patterns.sl
-%%DATADIR%%/content/shaders/surface/SpaceTest.sl
-%%DATADIR%%/content/shaders/surface/show_st.sl
-%%DATADIR%%/content/shaders/surface/expensive.sl
-%%DATADIR%%/content/shaders/surface/curvetube.sl
-%%DATADIR%%/content/shaders/surface/pinkGranite.sl
-%%DATADIR%%/content/shaders/surface/debug.sl
-%%DATADIR%%/content/shaders/surface/cddiffract.h
-%%DATADIR%%/content/shaders/surface/randgrid.sl
-%%DATADIR%%/content/shaders/surface/show_N.sl
-%%DATADIR%%/content/shaders/surface/uvtest.sl
-%%DATADIR%%/content/shaders/surface/AqSMap.sl
-%%DATADIR%%/content/shaders/surface/microscope.sl
-%%DATADIR%%/content/shaders/surface/sticky_texture.sl
-%%DATADIR%%/content/shaders/surface/DPProctext.h
-%%DATADIR%%/content/shaders/surface/showuser.sl
-%%DATADIR%%/content/shaders/surface/cellnoisetest.sl
-%%DATADIR%%/content/shaders/surface/cd.sl
-%%DATADIR%%/content/shaders/surface/face_plastic.sl
-%%DATADIR%%/content/shaders/surface/DPBlueMarble.sl
-%%DATADIR%%/content/shaders/light/shadowpoint.sl
-%%DATADIR%%/content/shaders/light/shadowdistant.sl
-%%DATADIR%%/content/shaders/light/shadowspot.sl
-%%DATADIR%%/content/shaders/imager/fakesky.sl
-%%DATADIR%%/content/shaders/imager/filmgrain.sl
-%%DATADIR%%/content/shaders/imager/bluescreen.sl
-%%DATADIR%%/content/shaders/imager/exposure.sl
-%%DATADIR%%/content/shaders/imager/gradient.sl
-%%DATADIR%%/content/shaders/imager/iramp.sl
-@dirrm etc/aqsis
-@dirrm include/aqsis
-@dirrm lib/aqsis
+%%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/hshaders.otl
+%%DATADIR%%/plugins/houdini/post.sh
+%%DATADIR%%/plugins/houdini/slx2otl.py
+%%DATADIR%%/plugins/houdini/RIBtargets
+%%DATADIR%%/shaders/displacement/AqDMap.sl
+%%DATADIR%%/shaders/displacement/borg_metal.sl
+%%DATADIR%%/shaders/displacement/micro_bumps.sl
+%%DATADIR%%/shaders/displacement/bumpy.sl
+%%DATADIR%%/shaders/displacement/wavy.sl
+%%DATADIR%%/shaders/displacement/dented.sl
+%%DATADIR%%/shaders/displacement/AqDMap.slx
+%%DATADIR%%/shaders/displacement/borg_metal.slx
+%%DATADIR%%/shaders/displacement/micro_bumps.slx
+%%DATADIR%%/shaders/displacement/bumpy.slx
+%%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/bluescreen.sl
+%%DATADIR%%/shaders/imager/exposure.sl
+%%DATADIR%%/shaders/imager/gradient.sl
+%%DATADIR%%/shaders/imager/iramp.sl
+%%DATADIR%%/shaders/imager/background.slx
+%%DATADIR%%/shaders/imager/fakesky.slx
+%%DATADIR%%/shaders/imager/filmgrain.slx
+%%DATADIR%%/shaders/imager/bluescreen.slx
+%%DATADIR%%/shaders/imager/exposure.slx
+%%DATADIR%%/shaders/imager/gradient.slx
+%%DATADIR%%/shaders/imager/iramp.slx
+%%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.slx
+%%DATADIR%%/shaders/light/spotlight.slx
+%%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/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/DPBlueMarble.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/curvetube.slx
+%%DATADIR%%/shaders/surface/pinkGranite.slx
+%%DATADIR%%/shaders/surface/debug.slx
+%%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.slx
+%%DATADIR%%/shaders/surface/sticky_texture.slx
+%%DATADIR%%/shaders/surface/paintedplastic.slx
+%%DATADIR%%/shaders/surface/plastic.slx
+%%DATADIR%%/shaders/surface/shinymetal.slx
+%%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/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
+@dirrm %%DATADIR%%/shaders/volume
+@dirrm %%DATADIR%%/shaders/surface
+@dirrm %%DATADIR%%/shaders/light
+@dirrm %%DATADIR%%/shaders/include
+@dirrm %%DATADIR%%/shaders/imager
+@dirrm %%DATADIR%%/shaders/displacement
 @dirrm %%DATADIR%%/shaders
-@dirrm %%DATADIR%%/content/shaders/surface
-@dirrm %%DATADIR%%/content/shaders/light
-@dirrm %%DATADIR%%/content/shaders/include
-@dirrm %%DATADIR%%/content/shaders/imager
-@dirrm %%DATADIR%%/content/shaders/displacement
-@dirrm %%DATADIR%%/content/shaders
-@dirrm %%DATADIR%%/content/ribs/scenes/vase
-@dirrm %%DATADIR%%/content/ribs/scenes/microbe
-@dirrm %%DATADIR%%/content/ribs/scenes/fisheye
-@dirrm %%DATADIR%%/content/ribs/scenes
-@dirrm %%DATADIR%%/content/ribs/features/textures
-@dirrm %%DATADIR%%/content/ribs/features/subdivision
-@dirrm %%DATADIR%%/content/ribs/features/solidmodeling
-@dirrm %%DATADIR%%/content/ribs/features/shadows
-@dirrm %%DATADIR%%/content/ribs/features/occlusion
-@dirrm %%DATADIR%%/content/ribs/features/objectinstance
-@dirrm %%DATADIR%%/content/ribs/features/multipass
-@dirrm %%DATADIR%%/content/ribs/features/motionblur
-@dirrm %%DATADIR%%/content/ribs/features/levelofdetail
-@dirrm %%DATADIR%%/content/ribs/features/layeredshaders
-@dirrm %%DATADIR%%/content/ribs/features/curves
-@dirrm %%DATADIR%%/content/ribs/features/bake
-@dirrm %%DATADIR%%/content/ribs/features
-@dirrm %%DATADIR%%/content/ribs
-@dirrm %%DATADIR%%/content
 @dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/plugins/houdini/soho/parameters
+@dirrm %%DATADIR%%/plugins/houdini/soho
+@dirrm %%DATADIR%%/plugins/houdini/scripts/out/targets
+@dirrm %%DATADIR%%/plugins/houdini/scripts/out
+@dirrm %%DATADIR%%/plugins/houdini/scripts
+@dirrm %%DATADIR%%/plugins/houdini
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/examples/scenes/vase
+@dirrm %%DATADIR%%/examples/scenes/microbe
+@dirrm %%DATADIR%%/examples/scenes/fisheye
+@dirrm %%DATADIR%%/examples/scenes
+@dirrm %%DATADIR%%/examples/procedurals/menger
+@dirrm %%DATADIR%%/examples/procedurals
+@dirrm %%DATADIR%%/examples/features/textures
+@dirrm %%DATADIR%%/examples/features/subdivision
+@dirrm %%DATADIR%%/examples/features/solidmodeling
+@dirrm %%DATADIR%%/examples/features/shadows
+@dirrm %%DATADIR%%/examples/features/occlusion
+@dirrm %%DATADIR%%/examples/features/objectinstance
+@dirrm %%DATADIR%%/examples/features/multipass
+@dirrm %%DATADIR%%/examples/features/motionblur
+@dirrm %%DATADIR%%/examples/features/levelofdetail
+@dirrm %%DATADIR%%/examples/features/layeredshaders
+@dirrm %%DATADIR%%/examples/features/curves
+@dirrm %%DATADIR%%/examples/features/bake
+@dirrm %%DATADIR%%/examples/features/archives
+@dirrm %%DATADIR%%/examples/features
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
+@dirrm lib/aqsis
+@dirrm include/aqsis/ri
+@dirrm include/aqsis
+@dirrm etc/aqsis
 @dirrmtry share/applications
+@dirrmtry share/icons/hicolor/192x192/mimetypes
+@dirrmtry share/icons/hicolor/192x192
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrmtry share/mime/packages
 @dirrmtry share/mime