5 files changed, 159 insertions, 51 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index cb1c5cfd1393..4fae03974ed7 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	aqsis
-PORTVERSION=	0.9.1
-PORTREVISION=	0
+PORTVERSION=	0.9.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,25 +16,21 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A photorealistic rendering system
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-USE_GL=		yes
+USE_GCC=	3.3
+USE_GNOME=	gnometarget lthack
+USE_BISON=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-
-.include <bsd.port.pre.mk>
-
-.if ( ${OSVERSION} < 500000 )
-USE_GCC=	3.3
-.endif
-
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-static --enable-Mesa=no
 INSTALLS_SHLIB=	yes
 
+MAN1=		aqsis.1
+
+CFLAGS+=	-O0
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
@@ -44,12 +39,4 @@ post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
-post-install:
-.for dir in ${PREFIX}/include/aqsis ${PREFIX}/lib/aqsis ${PREFIX}/share/aqsis
-	@${FIND} ${dir} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${dir} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.endfor
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo
index b9c4f9ee1813..8acb820b4c43 100644
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1,2 +1,2 @@
-MD5 (aqsis-0.9.1.tar.gz) = 25ff47648aee39d0be4294628d143a7e
-SIZE (aqsis-0.9.1.tar.gz) = 2574709
+MD5 (aqsis-0.9.2.tar.gz) = db643748ebfbf7e14aa7f3b0fa2c143a
+SIZE (aqsis-0.9.2.tar.gz) = 2708467
diff --git a/graphics/aqsis/files/patch-libaqsistypes::plugins.cpp b/graphics/aqsis/files/patch-libaqsistypes::plugins.cpp
new file mode 100644
index 000000000000..8c2b4a9c5203
--- /dev/null
+++ b/graphics/aqsis/files/patch-libaqsistypes::plugins.cpp
@@ -0,0 +1,11 @@
+--- libaqsistypes/plugins.cpp.orig	Fri Jul 23 23:50:39 2004
++++ libaqsistypes/plugins.cpp	Tue Aug 17 14:10:36 2004
+@@ -150,7 +150,7 @@
+     // Free the buffer.
+     LocalFree( lpMsgBuf );
+ #elif not defined AQSIS_SYSTEM_MACOSX
+-    char* error = dlerror();
++    const char* error = dlerror();
+     if( dlerror )
+ 	    errorlog = error;
+ #endif
diff --git a/graphics/aqsis/files/patch-libdd::dd.cpp b/graphics/aqsis/files/patch-libdd::dd.cpp
deleted file mode 100644
index 1026f2a65bee..000000000000
--- a/graphics/aqsis/files/patch-libdd::dd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdd/dd.cpp.orig	Mon Apr 12 16:13:20 2004
-+++ libdd/dd.cpp	Mon Apr 12 16:02:24 2004
-@@ -26,6 +26,8 @@
- 
- #include <iostream>
- #include <memory>
-+#include <string>
-+#include <errno.h>
- 
- #include "aqsis.h"
- #include <logging.h>
diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist
index 434783f2cec4..0eeaafdb182b 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -1,12 +1,53 @@
 bin/aqsis
-bin/aqsis_framebuffer_glut
-bin/aqsis_framebuffer_glut_z
 bin/aqsl
 bin/aqsltell
-bin/filebuffer
-bin/shadowmap
 bin/teqser
-etc/ddmsock.ini
+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/random.h
+include/aqsis/refcount.h
+include/aqsis/ri.h
+include/aqsis/ri.inl
+include/aqsis/shadeop.h
+include/aqsis/slx.h
+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.so
+lib/aqsis/libbake2tif.so.0
+lib/aqsis/libdisplay.a
+lib/aqsis/libdisplay.so
+lib/aqsis/libdisplay.so.0
+lib/aqsis/libgif2tif.a
+lib/aqsis/libgif2tif.so
+lib/aqsis/libgif2tif.so.0
+lib/aqsis/libjpg2tif.a
+lib/aqsis/libjpg2tif.so
+lib/aqsis/libjpg2tif.so.0
+lib/aqsis/libpcx2tif.a
+lib/aqsis/libpcx2tif.so
+lib/aqsis/libpcx2tif.so.0
+lib/aqsis/libppm2tif.a
+lib/aqsis/libppm2tif.so
+lib/aqsis/libppm2tif.so.0
+lib/aqsis/libtga2tif.a
+lib/aqsis/libtga2tif.so
+lib/aqsis/libtga2tif.so.0
 lib/libaqsis.a
 lib/libaqsis.so
 lib/libaqsis.so.0
@@ -19,15 +60,9 @@ lib/libargparse.so.0
 lib/libcodegenvm.a
 lib/libcodegenvm.so
 lib/libcodegenvm.so.0
-lib/libdd.a
-lib/libdd.so
-lib/libdd.so.0
-lib/libddmsimple.a
-lib/libddmsimple.so
-lib/libddmsimple.so.0
-lib/libddmsock.a
-lib/libddmsock.so
-lib/libddmsock.so.0
+lib/libddmanager.a
+lib/libddmanager.so
+lib/libddmanager.so.0
 lib/libraytrace.a
 lib/libraytrace.so
 lib/libraytrace.so.0
@@ -58,3 +93,89 @@ lib/libslpp.so.0
 lib/libslxargs.a
 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
+@dirrm include/aqsis