12 files changed, 192 insertions, 103 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index e37778fb8496..594e753dd3cf 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	aqsis
-PORTVERSION=	0.6.6
+PORTVERSION=	0.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,19 +15,33 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A photorealistic rendering system
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libargparse.a:${PORTSDIR}/devel/libargparse
-LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	log4cpp.4:${PORTSDIR}/devel/log4cpp \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
-USE_REINPLACE=	yes
 USE_MESA=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	\
-	CPPFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-	LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-static --datadir="${DATADIR}"
 INSTALLS_SHLIB=	yes
 
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+CFLAGS+=	-O0
+.endif
+
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|-ldl||g"
+	@${REINPLACE_CMD} -e 's|PLUGIN_FLAGS=|#PLUGIN_FLAGS=|g ; \
+		 s|^CPPFLAGS="-D|CPPFLAGS="\$$CPPFLAGS -D|g ; \
+		 s|^CFLAGS=|#CFLAGS=|g ; \
+		 s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure
+	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|malloc\.h|stdlib.h|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo
index f7ed88d6e880..93817309ecc2 100644
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1 +1 @@
-MD5 (aqsis-0.6.6.tar.gz) = f48c4c946cde532cc43f9f3a1c38caca
+MD5 (aqsis-0.8.0.tar.gz) = 2dbee9888aea39400a99afb37a287242
diff --git a/graphics/aqsis/files/patch-aqsis.cpp b/graphics/aqsis/files/patch-aqsis.cpp
deleted file mode 100644
index eb6dc1120c86..000000000000
--- a/graphics/aqsis/files/patch-aqsis.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- aqsis/aqsis.cpp.orig	Fri Sep 13 13:07:03 2002
-+++ aqsis/aqsis.cpp	Fri Sep 13 13:07:56 2002
-@@ -66,8 +66,8 @@
-  */
- RtVoid PrintProgress( RtFloat percent )
- {
--static long tick=0;
--long now;
-+static time_t tick=0;
-+time_t now;
-     
- 	if (tick == 0) 
-         {
diff --git a/graphics/aqsis/files/patch-aqsis::aqsis.cpp b/graphics/aqsis/files/patch-aqsis::aqsis.cpp
new file mode 100644
index 000000000000..50246cd58430
--- /dev/null
+++ b/graphics/aqsis/files/patch-aqsis::aqsis.cpp
@@ -0,0 +1,13 @@
+--- aqsis/aqsis.cpp.orig	Sun Feb 16 23:36:02 2003
++++ aqsis/aqsis.cpp	Sat Apr 19 22:56:01 2003
+@@ -82,8 +82,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-aqsltell::Makefile.in b/graphics/aqsis/files/patch-aqsltell::Makefile.in
new file mode 100644
index 000000000000..cef06b1ac5d5
--- /dev/null
+++ b/graphics/aqsis/files/patch-aqsltell::Makefile.in
@@ -0,0 +1,11 @@
+--- aqsltell/Makefile.in.orig	Sun Sep 21 05:17:44 2003
++++ aqsltell/Makefile.in	Sun Sep 28 23:19:14 2003
+@@ -103,7 +103,7 @@
+ bin_PROGRAMS = aqsltell 
+ 
+ aqsltell_SOURCES = aqsltell.cpp
+-aqsltell_LDADD = $(top_builddir)/libslxargs/libslxargs.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libargparse/libargparse.la
++aqsltell_LDADD = $(top_builddir)/render/libaqsis.la $(top_builddir)/libslxargs/libslxargs.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libargparse/libargparse.la
+ 
+ INCLUDES = -I$(top_srcdir)/libaqsistypes -I$(top_srcdir)/libaqsistypes/posix -I$(top_srcdir)/libshadervm -I$(top_srcdir)/libshaderexecenv -I$(top_srcdir)/libslxargs -I$(top_srcdir)/libargparse
+ 
diff --git a/graphics/aqsis/files/patch-libddmsock::ddmsock.cpp b/graphics/aqsis/files/patch-libddmsock::ddmsock.cpp
new file mode 100644
index 000000000000..8bb8b122836c
--- /dev/null
+++ b/graphics/aqsis/files/patch-libddmsock::ddmsock.cpp
@@ -0,0 +1,10 @@
+--- libddmsock/ddmsock.cpp.orig	Sat Sep  6 03:37:58 2003
++++ libddmsock/ddmsock.cpp	Sun Sep 28 22:22:06 2003
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ #include <netinet/in.h>
+ #include <sys/types.h>
++#include <sys/signal.h>
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ #include <errno.h>
diff --git a/graphics/aqsis/files/patch-libslparse::parsenode.cpp b/graphics/aqsis/files/patch-libslparse::parsenode.cpp
new file mode 100644
index 000000000000..319ed9bce0c6
--- /dev/null
+++ b/graphics/aqsis/files/patch-libslparse::parsenode.cpp
@@ -0,0 +1,11 @@
+--- libslparse/parsenode.cpp.orig	Tue May 14 12:53:14 2002
++++ libslparse/parsenode.cpp	Sat Oct 12 14:11:49 2002
+@@ -118,7 +118,7 @@
+ 	for ( i = 0; i < Type_Last; i++ )
+ 	{
+ 		if ( gVariableTypeIdentifiers[ i ][ 0 ] == Id ||
+-#if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS)
++#if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS) || defined(__FreeBSD__)
+ 		        gVariableTypeIdentifiers[ i ][ 0 ] == tolower( Id ) )
+ #else
+ 				gVariableTypeIdentifiers[ i ][ 0 ] == _tolower( Id ) )
diff --git a/graphics/aqsis/files/patch-ltmain.sh b/graphics/aqsis/files/patch-ltmain.sh
new file mode 100644
index 000000000000..83d7767c39ef
--- /dev/null
+++ b/graphics/aqsis/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Sun Sep 21 05:17:09 2003
++++ ltmain.sh	Sun Sep 28 23:27:28 2003
+@@ -1056,14 +1056,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2499,7 +2499,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4286,10 +4286,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/aqsis/files/patch-parsenode.cpp b/graphics/aqsis/files/patch-parsenode.cpp
deleted file mode 100644
index 5de3eac9c075..000000000000
--- a/graphics/aqsis/files/patch-parsenode.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libslparse/parsenode.cpp.orig	Thu Sep 12 23:56:09 2002
-+++ libslparse/parsenode.cpp	Thu Sep 12 23:58:41 2002
-@@ -121,7 +121,7 @@
- #if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS)
- 		        gVariableTypeIdentifiers[ i ][ 0 ] == tolower( Id ) )
- #else
--				gVariableTypeIdentifiers[ i ][ 0 ] == _tolower( Id ) )
-+				gVariableTypeIdentifiers[ i ][ 0 ] == tolower( Id ) )
- #endif
- 			return ( i );
- 	}
diff --git a/graphics/aqsis/files/patch-render::ri.cpp b/graphics/aqsis/files/patch-render::ri.cpp
new file mode 100644
index 000000000000..5e5948caef64
--- /dev/null
+++ b/graphics/aqsis/files/patch-render::ri.cpp
@@ -0,0 +1,11 @@
+--- render/ri.cpp.orig	Fri Sep 19 17:03:14 2003
++++ render/ri.cpp	Mon Sep 29 11:33:21 2003
+@@ -3271,7 +3271,7 @@
+ 				TqInt iElem;
+ 				for( iElem = 0; iElem < fvcount; iElem++ )
+ 				{
+-					const unsigned char* pval = static_cast<const unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
++					unsigned char* pval = static_cast<unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
+ 					memcpy( pNew, pval, elem_size );
+ 					pNew += elem_size;
+ 				}
diff --git a/graphics/aqsis/files/patch-shaders::Makefile.in b/graphics/aqsis/files/patch-shaders::Makefile.in
index cff9b79a470a..15f52ca6d78e 100644
--- a/graphics/aqsis/files/patch-shaders::Makefile.in
+++ b/graphics/aqsis/files/patch-shaders::Makefile.in
@@ -1,11 +1,11 @@
---- shaders/Makefile.in.orig	Fri Sep 13 14:27:12 2002
-+++ shaders/Makefile.in	Fri Sep 13 14:27:29 2002
-@@ -80,7 +80,7 @@
+--- shaders/Makefile.in.orig	Sun Sep 21 05:18:05 2003
++++ shaders/Makefile.in	Mon Sep 29 00:21:58 2003
+@@ -237,7 +237,7 @@
+ 	$(mkinstalldirs) $(shaderdir)
+ 	$(INSTALL_DATA) $(srcdir)/*.h $(shaderdir)
+ 	$(INSTALL_DATA) $(srcdir)/*.sl $(shaderdir)
+-	PATH=$$PATH:$(bindir); cd $(shaderdir); for file in $$(find . -name "*.sl"); do $(bindir)/aqsl $$file; done
++#	PATH=$$PATH:$(bindir); cd $(shaderdir); for file in $$(find . -name "*.sl"); do $(bindir)/aqsl $$file; done
  
- EXTRA_DIST = DPProctext.h ambientlight.sl borg_metal.sl bumpy.sl constant.sl debug.sl dented.sl depthcue.sl distantlight.sl dpbluemarble.sl fog.sl matte.sl metal.sl noises.h paintedplastic.sl patterns.h plastic.sl pointlight.sl randgrid.sl shaders.dsp shadowspot.sl shinymetal.sl spotlight.sl wavy.sl uvtest.sl spacetest.sl show_st.sl cellnoisetest.sl brickbump.sl
- 
--shaderdir = $(prefix)/shaders
-+shaderdir = $(prefix)/share/aqsis/shaders
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- DIST_COMMON =  Makefile.am Makefile.in
+ uninstall-local:
+ 	rm -f $(shaderdir)/*.h
diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist
index 180962b7ad54..2a52d5ca7a20 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -2,13 +2,12 @@ bin/aqsis
 bin/aqsis_framebuffer_glut
 bin/aqsis_framebuffer_glut_z
 bin/aqsl
-bin/aqslcomp
 bin/aqsltell
-bin/ddmsock.ini
 bin/filebuffer
 bin/ri2ribtest
 bin/shadowmap
 bin/teqser
+etc/ddmsock.ini
 include/aqsis.h
 include/aqsis_types.h
 include/bitvector.h
@@ -21,9 +20,13 @@ include/librib2stream.h
 include/list.h
 include/matrix.h
 include/memorypool.h
+include/parserstate.h
 include/random.h
 include/refcount.h
 include/ri.h
+include/shadeop.h
+include/share.h
+include/slx.h
 include/sstring.h
 include/vector2d.h
 include/vector3d.h
@@ -34,6 +37,12 @@ lib/libaqsis.so.0
 lib/libaqsistypes.a
 lib/libaqsistypes.so
 lib/libaqsistypes.so.0
+lib/libargparse.a
+lib/libargparse.so
+lib/libargparse.so.0
+lib/libbake2tif.a
+lib/libbake2tif.so
+lib/libbake2tif.so.0
 lib/libcodegenvm.a
 lib/libcodegenvm.so
 lib/libcodegenvm.so.0
@@ -46,6 +55,18 @@ lib/libddmsimple.so.0
 lib/libddmsock.a
 lib/libddmsock.so
 lib/libddmsock.so.0
+lib/libgif2tif.a
+lib/libgif2tif.so
+lib/libgif2tif.so.0
+lib/libjpg2tif.a
+lib/libjpg2tif.so
+lib/libjpg2tif.so.0
+lib/libpcx2tif.a
+lib/libpcx2tif.so
+lib/libpcx2tif.so.0
+lib/libppm2tif.a
+lib/libppm2tif.so
+lib/libppm2tif.so.0
 lib/libri2rib.a
 lib/libri2rib.so
 lib/libri2rib.so.0
@@ -67,61 +88,42 @@ lib/libshadervm.so.0
 lib/libslparse.a
 lib/libslparse.so
 lib/libslparse.so.0
+lib/libslpp.so
+lib/libslpp.so.0
 lib/libslxargs.a
 lib/libslxargs.so
 lib/libslxargs.so.0
-share/aqsis/shaders/DPBlueMarble.slx
-share/aqsis/shaders/DPProctext.h
-share/aqsis/shaders/SpaceTest.slx
-share/aqsis/shaders/ambientlight.sl
-share/aqsis/shaders/ambientlight.slx
-share/aqsis/shaders/borg_metal.sl
-share/aqsis/shaders/borg_metal.slx
-share/aqsis/shaders/brickbump.sl
-share/aqsis/shaders/brickbump.slx
-share/aqsis/shaders/bumpy.sl
-share/aqsis/shaders/bumpy.slx
-share/aqsis/shaders/cellnoisetest.sl
-share/aqsis/shaders/cellnoisetest.slx
-share/aqsis/shaders/constant.sl
-share/aqsis/shaders/constant.slx
-share/aqsis/shaders/debug.sl
-share/aqsis/shaders/debug.slx
-share/aqsis/shaders/dented.sl
-share/aqsis/shaders/dented.slx
-share/aqsis/shaders/depthcue.sl
-share/aqsis/shaders/depthcue.slx
-share/aqsis/shaders/distantlight.sl
-share/aqsis/shaders/distantlight.slx
-share/aqsis/shaders/dpbluemarble.sl
-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/noises.h
-share/aqsis/shaders/paintedplastic.sl
-share/aqsis/shaders/paintedplastic.slx
-share/aqsis/shaders/patterns.h
-share/aqsis/shaders/plastic.sl
-share/aqsis/shaders/plastic.slx
-share/aqsis/shaders/pointlight.sl
-share/aqsis/shaders/pointlight.slx
-share/aqsis/shaders/randgrid.sl
-share/aqsis/shaders/randgrid.slx
-share/aqsis/shaders/shadowspot.sl
-share/aqsis/shaders/shadowspot.slx
-share/aqsis/shaders/shinymetal.sl
-share/aqsis/shaders/shinymetal.slx
-share/aqsis/shaders/show_st.sl
-share/aqsis/shaders/show_st.slx
-share/aqsis/shaders/spacetest.sl
-share/aqsis/shaders/spotlight.sl
-share/aqsis/shaders/spotlight.slx
-share/aqsis/shaders/uvtest.sl
-share/aqsis/shaders/uvtest.slx
-share/aqsis/shaders/wavy.sl
-share/aqsis/shaders/wavy.slx
-@dirrm share/aqsis/shaders
-@dirrm share/aqsis
+lib/libtga2tif.a
+lib/libtga2tif.so
+lib/libtga2tif.so.0
+%%DATADIR%%/shaders/DPProctext.h
+%%DATADIR%%/shaders/ambientlight.sl
+%%DATADIR%%/shaders/borg_metal.sl
+%%DATADIR%%/shaders/brickbump.sl
+%%DATADIR%%/shaders/bumpy.sl
+%%DATADIR%%/shaders/cellnoisetest.sl
+%%DATADIR%%/shaders/constant.sl
+%%DATADIR%%/shaders/curvetube.sl
+%%DATADIR%%/shaders/debug.sl
+%%DATADIR%%/shaders/dented.sl
+%%DATADIR%%/shaders/depthcue.sl
+%%DATADIR%%/shaders/distantlight.sl
+%%DATADIR%%/shaders/dpbluemarble.sl
+%%DATADIR%%/shaders/fog.sl
+%%DATADIR%%/shaders/matte.sl
+%%DATADIR%%/shaders/metal.sl
+%%DATADIR%%/shaders/noises.h
+%%DATADIR%%/shaders/paintedplastic.sl
+%%DATADIR%%/shaders/patterns.h
+%%DATADIR%%/shaders/plastic.sl
+%%DATADIR%%/shaders/pointlight.sl
+%%DATADIR%%/shaders/randgrid.sl
+%%DATADIR%%/shaders/shadowspot.sl
+%%DATADIR%%/shaders/shinymetal.sl
+%%DATADIR%%/shaders/show_st.sl
+%%DATADIR%%/shaders/spacetest.sl
+%%DATADIR%%/shaders/spotlight.sl
+%%DATADIR%%/shaders/uvtest.sl
+%%DATADIR%%/shaders/wavy.sl
+@dirrm %%DATADIR%%/shaders
+@dirrm %%DATADIR%%