6 files changed, 124 insertions, 228 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index a0ee858bb43c..ef2998e09a14 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -7,41 +7,42 @@
 #
 
 PORTNAME=	aqsis
-PORTVERSION=	1.0.1
+PORTVERSION=	1.2.0
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@gahr.ch
 COMMENT=	A photorealistic rendering system
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk
-
-USE_GCC=	3.4+
-USE_GNOME=	gnometarget
-USE_BISON=	build
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-static
-USE_LDCONFIG=	yes
+BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons \
+   		bjam:${PORTSDIR}/devel/boost \
+		bison:${PORTSDIR}/devel/bison \
+		xsltproc:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
+   		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
-MAN1=		aqsis.1
+USE_LDCONFIG=	yes
 
-CFLAGS+=	-fPIC
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+SCONS_FLAGS=	boost_include_path='${LOCALBASE}/include' \
+		install_prefix='${PREFIX}'
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|PLUGIN_FLAGS=|#PLUGIN_FLAGS=|g' ${WRKSRC}/configure
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700029
-BROKEN=		Incorrect pkg-plist (bad objformat handling)
-.endif
-
-.include <bsd.port.post.mk>
+	${REINPLACE_CMD} \
+	   -e 's|/usr/lib|${LOCALBASE}/lib|g' \
+	   -e 's|/usr/include|${LOCALBASE}/include|g' \
+	   -e 's|dl|c|g' \
+	   ${WRKSRC}/platform/default/SConscript
+	${REINPLACE_CMD} \
+	   -e 's|/usr/bin/bison|${LOCALBASE}/bin/bison|g' \
+	   ${WRKSRC}/platform/default/Options.py
+
+do-build:
+	cd ${WRKSRC} && scons ${SCONS_FLAGS} build
+
+do-install:
+	cd ${WRKSRC} && scons ${SCONS_FLAGS} install
+
+.include <bsd.port.mk>
diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo
index 7ab90d0fa7a9..f7a44a0e3362 100644
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1,3 +1,3 @@
-MD5 (aqsis-1.0.1.tar.gz) = 17e58818ab647f002c642c8abe591e35
-SHA256 (aqsis-1.0.1.tar.gz) = 89dfafb5eeaa4cd39a4e09508aae42d669372e3a817262c7a60e8bc65275f09b
-SIZE (aqsis-1.0.1.tar.gz) = 2788459
+MD5 (aqsis-1.2.0.tar.gz) = ae9bb1c4b22e396fd7ce84ee3e13cb86
+SHA256 (aqsis-1.2.0.tar.gz) = 1c34522620dbedef1a1cd3fce73a409179addf4afc5d8da80b32e6e5fd2e6317
+SIZE (aqsis-1.2.0.tar.gz) = 1013399
diff --git a/graphics/aqsis/files/patch-aqsis::aqsis.cpp b/graphics/aqsis/files/patch-aqsis::aqsis.cpp
deleted file mode 100644
index 71113a973afb..000000000000
--- a/graphics/aqsis/files/patch-aqsis::aqsis.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- aqsis/aqsis.cpp.orig	Mon Apr 12 13:45:33 2004
-+++ aqsis/aqsis.cpp	Mon Apr 12 13:46:02 2004
-@@ -113,8 +113,8 @@
-         return ;
-     }
- 
--    static long tick = 0;
--    long now;
-+    static time_t tick = 0;
-+    time_t now;
- 
-     if ( tick == 0 )
-         time( &tick );
diff --git a/graphics/aqsis/files/patch-aqsistypes::plugins.cpp b/graphics/aqsis/files/patch-aqsistypes::plugins.cpp
new file mode 100644
index 000000000000..2413032ed0e2
--- /dev/null
+++ b/graphics/aqsis/files/patch-aqsistypes::plugins.cpp
@@ -0,0 +1,11 @@
+--- aqsistypes/plugins.cpp.orig	2007-12-13 22:54:31.000000000 +0100
++++ aqsistypes/plugins.cpp	2007-12-13 22:55:24.000000000 +0100
+@@ -164,7 +164,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-libaqsistypes::plugins.cpp b/graphics/aqsis/files/patch-libaqsistypes::plugins.cpp
deleted file mode 100644
index 28363c941770..000000000000
--- a/graphics/aqsis/files/patch-libaqsistypes::plugins.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libaqsistypes/plugins.cpp.orig	Sun Apr 10 08:35:35 2005
-+++ libaqsistypes/plugins.cpp	Sun Apr 10 08:35:58 2005
-@@ -153,7 +153,7 @@
-     // Free the buffer.
-     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/pkg-plist b/graphics/aqsis/pkg-plist
index f0b6dd5a9821..b3020c4469d7 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -1,21 +1,18 @@
 bin/aqsis
 bin/aqsl
 bin/aqsltell
+bin/miqser
 bin/teqser
+etc/aqsis/aqsisrc
 include/aqsis/aqsis.h
 include/aqsis/aqsis_types.h
-include/aqsis/argparse.h
 include/aqsis/bitvector.h
 include/aqsis/color.h
 include/aqsis/exception.h
 include/aqsis/file.h
-include/aqsis/librib.h
-include/aqsis/librib2ri.h
-include/aqsis/librib2stream.h
 include/aqsis/list.h
 include/aqsis/matrix.h
-include/aqsis/memorypool.h
-include/aqsis/parserstate.h
+include/aqsis/ndspy.h
 include/aqsis/random.h
 include/aqsis/refcount.h
 include/aqsis/ri.h
@@ -26,178 +23,89 @@ include/aqsis/sstring.h
 include/aqsis/vector2d.h
 include/aqsis/vector3d.h
 include/aqsis/vector4d.h
-lib/aqsis/displays.ini
-lib/aqsis/libbake2tif.a
-lib/aqsis/libbake2tif.la
-lib/aqsis/libbake2tif.so
-lib/aqsis/libbake2tif.so.0
-lib/aqsis/libdisplay.a
-lib/aqsis/libdisplay.la
+lib/aqsis/libd_bmp.so
+lib/aqsis/libd_exr.so
+lib/aqsis/libd_xpm.so
 lib/aqsis/libdisplay.so
-lib/aqsis/libdisplay.so.0
-lib/aqsis/libgif2tif.a
-lib/aqsis/libgif2tif.la
-lib/aqsis/libgif2tif.so
-lib/aqsis/libgif2tif.so.0
-lib/aqsis/libjpg2tif.a
-lib/aqsis/libjpg2tif.la
-lib/aqsis/libjpg2tif.so
-lib/aqsis/libjpg2tif.so.0
-lib/aqsis/libpcx2tif.a
-lib/aqsis/libpcx2tif.la
-lib/aqsis/libpcx2tif.so
-lib/aqsis/libpcx2tif.so.0
-lib/aqsis/libppm2tif.a
-lib/aqsis/libppm2tif.la
-lib/aqsis/libppm2tif.so
-lib/aqsis/libppm2tif.so.0
-lib/aqsis/libtga2tif.a
-lib/aqsis/libtga2tif.la
-lib/aqsis/libtga2tif.so
-lib/aqsis/libtga2tif.so.0
-lib/libaqsis.a
-lib/libaqsis.la
+lib/aqsis/plugins/libbake2tif.so
+lib/aqsis/plugins/libbmp2tif.so
+lib/aqsis/plugins/libdbo_plane.so
+lib/aqsis/plugins/libexr2tif.so
+lib/aqsis/plugins/libgif2tif.so
+lib/aqsis/plugins/libjpg2tif.so
+lib/aqsis/plugins/libpcx2tif.so
+lib/aqsis/plugins/libpng2tif.so
+lib/aqsis/plugins/libppm2tif.so
+lib/aqsis/plugins/libtga2tif.so
+lib/libaqsis.so.1.2
 lib/libaqsis.so
-lib/libaqsis.so.0
-lib/libaqsistypes.a
-lib/libaqsistypes.la
+lib/libaqsis.so.1
+lib/libaqsistypes.so.1.2
 lib/libaqsistypes.so
-lib/libaqsistypes.so.0
-lib/libargparse.a
-lib/libargparse.la
-lib/libargparse.so
-lib/libargparse.so.0
-lib/libcodegenvm.a
-lib/libcodegenvm.la
-lib/libcodegenvm.so
-lib/libcodegenvm.so.0
-lib/libddmanager.a
-lib/libddmanager.la
-lib/libddmanager.so
-lib/libddmanager.so.0
-lib/libraytrace.a
-lib/libraytrace.la
-lib/libraytrace.so
-lib/libraytrace.so.0
-lib/libri2rib.a
-lib/libri2rib.la
+lib/libaqsistypes.so.1
+lib/libri2rib.so.1.2
 lib/libri2rib.so
-lib/libri2rib.so.0
-lib/librib2.a
-lib/librib2.la
-lib/librib2.so
-lib/librib2.so.0
-lib/librib2ri.a
-lib/librib2ri.la
-lib/librib2ri.so
-lib/librib2ri.so.0
-lib/librib2stream.a
-lib/librib2stream.la
-lib/librib2stream.so
-lib/librib2stream.so.0
-lib/libshaderexecenv.a
-lib/libshaderexecenv.la
-lib/libshaderexecenv.so
-lib/libshaderexecenv.so.0
-lib/libshadervm.a
-lib/libshadervm.la
+lib/libri2rib.so.1
+lib/libshadervm.so.1.2
 lib/libshadervm.so
-lib/libshadervm.so.0
-lib/libslparse.a
-lib/libslparse.la
-lib/libslparse.so
-lib/libslparse.so.0
-lib/libslpp.a
-lib/libslpp.la
-lib/libslpp.so
-lib/libslpp.so.0
-lib/libslxargs.a
-lib/libslxargs.la
+lib/libshadervm.so.1
+lib/libslxargs.so.1.2
 lib/libslxargs.so
-lib/libslxargs.so.0
-%%DATADIR%%/shaders/DPProctext.h
-%%DATADIR%%/shaders/ambientlight.sl
-%%DATADIR%%/shaders/ambientlight.slx
-%%DATADIR%%/shaders/background.sl
-%%DATADIR%%/shaders/background.slx
-%%DATADIR%%/shaders/bake.h
-%%DATADIR%%/shaders/bluescreen.sl
-%%DATADIR%%/shaders/bluescreen.slx
-%%DATADIR%%/shaders/borg_metal.sl
-%%DATADIR%%/shaders/borg_metal.slx
-%%DATADIR%%/shaders/brickbump.sl
-%%DATADIR%%/shaders/brickbump.slx
-%%DATADIR%%/shaders/bumpy.sl
-%%DATADIR%%/shaders/bumpy.slx
-%%DATADIR%%/shaders/cellnoisetest.sl
-%%DATADIR%%/shaders/cellnoisetest.slx
-%%DATADIR%%/shaders/constant.sl
-%%DATADIR%%/shaders/constant.slx
-%%DATADIR%%/shaders/curvetube.sl
-%%DATADIR%%/shaders/curvetube.slx
-%%DATADIR%%/shaders/debug.sl
-%%DATADIR%%/shaders/debug.slx
-%%DATADIR%%/shaders/dented.sl
-%%DATADIR%%/shaders/dented.slx
-%%DATADIR%%/shaders/depthcue.sl
-%%DATADIR%%/shaders/depthcue.slx
-%%DATADIR%%/shaders/distantlight.sl
-%%DATADIR%%/shaders/distantlight.slx
-%%DATADIR%%/shaders/dpbluemarble.sl
-%%DATADIR%%/shaders/dpbluemarble.slx
-%%DATADIR%%/shaders/expensive.sl
-%%DATADIR%%/shaders/expensive.slx
-%%DATADIR%%/shaders/exposure.sl
-%%DATADIR%%/shaders/exposure.slx
-%%DATADIR%%/shaders/face_plastic.sl
-%%DATADIR%%/shaders/face_plastic.slx
-%%DATADIR%%/shaders/fakesky.sl
-%%DATADIR%%/shaders/fakesky.slx
-%%DATADIR%%/shaders/fog.sl
-%%DATADIR%%/shaders/fog.slx
-%%DATADIR%%/shaders/gradient.sl
-%%DATADIR%%/shaders/gradient.slx
-%%DATADIR%%/shaders/iramp.sl
-%%DATADIR%%/shaders/iramp.slx
-%%DATADIR%%/shaders/matte.sl
-%%DATADIR%%/shaders/matte.slx
-%%DATADIR%%/shaders/metal.sl
-%%DATADIR%%/shaders/metal.slx
-%%DATADIR%%/shaders/noises.h
-%%DATADIR%%/shaders/paintedplastic.sl
-%%DATADIR%%/shaders/paintedplastic.slx
-%%DATADIR%%/shaders/patterns.h
-%%DATADIR%%/shaders/plastic.sl
-%%DATADIR%%/shaders/plastic.slx
-%%DATADIR%%/shaders/pointlight.sl
-%%DATADIR%%/shaders/pointlight.slx
-%%DATADIR%%/shaders/randgrid.sl
-%%DATADIR%%/shaders/randgrid.slx
-%%DATADIR%%/shaders/shadowdistant.sl
-%%DATADIR%%/shaders/shadowdistant.slx
-%%DATADIR%%/shaders/shadowpoint.sl
-%%DATADIR%%/shaders/shadowpoint.slx
-%%DATADIR%%/shaders/shadowspot.sl
-%%DATADIR%%/shaders/shadowspot.slx
-%%DATADIR%%/shaders/shinymetal.sl
-%%DATADIR%%/shaders/shinymetal.slx
-%%DATADIR%%/shaders/show_N.sl
-%%DATADIR%%/shaders/show_N.slx
-%%DATADIR%%/shaders/show_st.sl
-%%DATADIR%%/shaders/show_st.slx
-%%DATADIR%%/shaders/showuser.sl
-%%DATADIR%%/shaders/showuser.slx
-%%DATADIR%%/shaders/spacetest.sl
-%%DATADIR%%/shaders/spacetest.slx
-%%DATADIR%%/shaders/spotlight.sl
-%%DATADIR%%/shaders/spotlight.slx
-%%DATADIR%%/shaders/sticky_texture.sl
-%%DATADIR%%/shaders/sticky_texture.slx
-%%DATADIR%%/shaders/uvtest.sl
-%%DATADIR%%/shaders/uvtest.slx
-%%DATADIR%%/shaders/wavy.sl
-%%DATADIR%%/shaders/wavy.slx
-@dirrm %%DATADIR%%/shaders
-@dirrm %%DATADIR%%
-@dirrm lib/aqsis
+lib/libslxargs.so.1
+share/aqsis/shaders/ambientlight.sl
+share/aqsis/shaders/ambientlight.slx
+share/aqsis/shaders/background.sl
+share/aqsis/shaders/background.slx
+share/aqsis/shaders/bumpy.sl
+share/aqsis/shaders/bumpy.slx
+share/aqsis/shaders/constant.sl
+share/aqsis/shaders/constant.slx
+share/aqsis/shaders/depthcue.sl
+share/aqsis/shaders/depthcue.slx
+share/aqsis/shaders/distantlight.sl
+share/aqsis/shaders/distantlight.slx
+share/aqsis/shaders/fog.sl
+share/aqsis/shaders/fog.slx
+share/aqsis/shaders/matte.sl
+share/aqsis/shaders/matte.slx
+share/aqsis/shaders/metal.sl
+share/aqsis/shaders/metal.slx
+share/aqsis/shaders/paintedplastic.sl
+share/aqsis/shaders/paintedplastic.slx
+share/aqsis/shaders/plastic.sl
+share/aqsis/shaders/plastic.slx
+share/aqsis/shaders/pointlight.sl
+share/aqsis/shaders/pointlight.slx
+share/aqsis/shaders/shinymetal.sl
+share/aqsis/shaders/shinymetal.slx
+share/aqsis/shaders/spotlight.sl
+share/aqsis/shaders/spotlight.slx
+share/aqsis/content/ribs/features/layeredshaders/grid.tif
+share/aqsis/content/ribs/features/layeredshaders/layered.rib
+share/aqsis/content/ribs/features/layeredshaders/render.bat
+share/aqsis/content/ribs/features/layeredshaders/render.sh
+share/aqsis/content/ribs/features/layeredshaders/texmap.sl
+share/aqsis/content/ribs/scenes/vase/render.bat
+share/aqsis/content/ribs/scenes/vase/render.sh
+share/aqsis/content/ribs/scenes/vase/vase.rib
+share/aqsis/content/shaders/displacement/dented.sl
+share/aqsis/content/shaders/displacement/dented.slx
+share/aqsis/content/shaders/light/shadowspot.sl
+share/aqsis/content/shaders/light/shadowspot.slx
+share/aqsis/scripts/mpanalyse.py
+@dirrm etc/aqsis
 @dirrm include/aqsis
+@dirrm lib/aqsis/plugins
+@dirrm lib/aqsis
+@dirrm share/aqsis/content/ribs/features/layeredshaders
+@dirrm share/aqsis/content/ribs/features
+@dirrm share/aqsis/content/ribs/scenes/vase
+@dirrm share/aqsis/content/ribs/scenes
+@dirrm share/aqsis/content/ribs
+@dirrm share/aqsis/content/shaders/displacement
+@dirrm share/aqsis/content/shaders/light
+@dirrm share/aqsis/content/shaders
+@dirrm share/aqsis/content
+@dirrm share/aqsis/shaders
+@dirrm share/aqsis/scripts
+@dirrm share/aqsis