4 files changed, 42 insertions, 107 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 91257afb1bfe..e1a1873dbead 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -3,31 +3,44 @@
 
 PORTNAME=	aqsis
 PORTVERSION=	1.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	A photorealistic rendering system
+COMMENT=	Photorealistic rendering system
 
 LICENSE=	BSD GPLv2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
-    		boost_filesystem:${PORTSDIR}/devel/boost-libs \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource desktop-file-utils shared-mime-info
 USE_QT4=	opengl qmake_build moc_build rcc_build uic_build
 PLIST_SUB+=	LIBVERS=${PORTVERSION:R}
 
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	EXAMPLES
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|examples_install_dir $${EXAMPLESDIR}|examples_install_dir ${PREFIX}/share/examples/${PORTNAME}|' \
+		${WRKSRC}/examples/CMakeLists.txt
+
+.if !${PORT_OPTIONS:MEXAMPLES}
+	@${REINPLACE_CMD} -i '' -e '/add_subdirectory(examples)/d' \
+		${WRKSRC}/CMakeLists.txt
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h b/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h
new file mode 100644
index 000000000000..5a9169bbee04
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h
@@ -0,0 +1,18 @@
+--- ./libs/tex/io/exrinputfile.h.orig	2012-08-24 14:26:50.000000000 +0200
++++ ./libs/tex/io/exrinputfile.h	2013-10-29 13:16:03.000000000 +0100
+@@ -48,10 +48,12 @@
+ 
+ #include <aqsis/tex/io/itexinputfile.h>
+ 
++#include <OpenEXR/ImfInputFile.h>
++
+ //------------------------------------------------------------------------------
+-namespace Imf {
+-	class InputFile;
+-}
++//namespace Imf {
++//	class InputFile;
++//}
+ 
+ namespace Aqsis {
+ 
diff --git a/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt b/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt
index e75a6b837d59..d42133cfb47d 100644
--- a/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt
+++ b/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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 @@
+--- ./libs/util/CMakeLists.txt.orig	2012-08-24 14:26:50.000000000 +0200
++++ ./libs/util/CMakeLists.txt	2013-10-29 13:12:48.000000000 +0100
+@@ -37,7 +37,7 @@
  
  set(linklibs ${Boost_FILESYSTEM_LIBRARY})
  if(UNIX)
diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist
index fb126c58d879..dddf39bdcfde 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -59,73 +59,6 @@ share/applications/aqsl.desktop
 share/applications/aqsltell.desktop
 share/applications/eqsl.desktop
 share/applications/piqsl.desktop
-%%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/RIBtargets
 %%DATADIR%%/plugins/houdini/hshaders.otl
@@ -246,37 +179,8 @@ share/applications/piqsl.desktop
 @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/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
-@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/icons/hicolor/192x192/mimetypes
-@dirrmtry share/icons/hicolor/192x192
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/mime/packages
-@dirrmtry share/mime