3 files changed, 121 insertions, 98 deletions

diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 1df2a673b27b..edbbec180605 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	white_dune
-PORTVERSION=	0.19.4
+PORTVERSION=	0.21.3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.csv.ica.uni-stuttgart.de/vrml/dune/
@@ -25,6 +25,10 @@ USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-optimization \
+		--without-devil \
+		--with-helpurl="${DOCSDIR}/index.html" \
+		--with-nurbssurfaceprotourl="${DOCSDIR}/vrml200x_nurbssurface/NurbsSurfacePROTO.wrl"
 ALL_TARGET=	# empty
 
 MAN1=	dune.1
@@ -35,7 +39,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dune ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/nostereodune ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/dune.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | \
diff --git a/graphics/white_dune/distinfo b/graphics/white_dune/distinfo
index 692020977146..b0e82b98d218 100644
--- a/graphics/white_dune/distinfo
+++ b/graphics/white_dune/distinfo
@@ -1 +1 @@
-MD5 (white_dune-0.19pl4.tar.gz) = eeaec7cade0befab101aea4b2b58a3a9
+MD5 (white_dune-0.21pl3.tar.gz) = b8b63e26bd95b00c3dfc3bcdde7a1f3b
diff --git a/graphics/white_dune/pkg-plist b/graphics/white_dune/pkg-plist
index b3930a64e18b..1e617ed00e01 100644
--- a/graphics/white_dune/pkg-plist
+++ b/graphics/white_dune/pkg-plist
@@ -1,97 +1,116 @@
 bin/dune
 bin/nostereodune
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/animation_example.wrl
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/index.html
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/joystick2.sh
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/joystick2.sh.html
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/nostereo.sh
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/nostereo.sh.html
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/spaceball_joystick_example.sh
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/spaceball_joystick_example.sh.html
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/wingmancordlessgamepad.sh
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/xinput_example.sh
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/xinput_example.sh.html
-%%PORTDOCS%%share/doc/white_dune/commandline_examples/xinput_irix6.2_example.sh
-%%PORTDOCS%%share/doc/white_dune/deutsch.jpg
-%%PORTDOCS%%share/doc/white_dune/developer_docs/Doxyfile.in
-%%PORTDOCS%%share/doc/white_dune/developer_docs/Makefile
-%%PORTDOCS%%share/doc/white_dune/developer_docs/dune.jpg
-%%PORTDOCS%%share/doc/white_dune/developer_docs/dune_developer.html
-%%PORTDOCS%%share/doc/white_dune/english.jpg
-%%PORTDOCS%%share/doc/white_dune/index.html
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/billboard.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/bubble.wav
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/camera_animation.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/checker_planesensor.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/checker_touchsensor.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/door_cylindersensor.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/elevator_proximity_trigger.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/forward_kinematic_animation.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/forward_kinematic_spheresensor.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/headupdisplay_example.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/image.gif
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/index.html
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/material_animation.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/misc_animation.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/movie.mpg
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/movie_trigger.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/sound_trigger.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/touch_trigger.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/transform_animation.wrl
-%%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/visibilty_trigger.wrl
-%%PORTDOCS%%share/doc/white_dune/usage_docs/6d.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/6dloc.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_right1.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_right2.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_right3.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_wrong.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/animation_onetime.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/animation_onetime2.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/animation_recording.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/cassettenrecorder.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/center.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/colorcircle1.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/colorcircle2.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/cosmo_colorpervertex.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/cosmo_no_colorpervertex.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/crash.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/crashrestore.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/rot.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dials_default.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dials_normal.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune.1.html
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_animation.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_colorpervertex.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_de.html
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_de_exercise.html
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_en.html
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_en_exercise.html
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_interaktion.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_no_colorpervertex.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/fieldchange.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/interpolator.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/level3.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/navigation.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/node_add_invalid.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/node_add_valid.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/recording.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/recording_one.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/routecut1.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/routecut2.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/routemake1.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/routemake2.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/scale.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/scenegraphchange_invalid.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/scenegraphchange_valid.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/sceneicon.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/schieb.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/spaceball.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/timesensor.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/transform.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/transform2.jpg
-%%PORTDOCS%%share/doc/white_dune/usage_docs/windows.jpg
-%%PORTDOCS%%@dirrm share/doc/white_dune/usage_docs
-%%PORTDOCS%%@dirrm share/doc/white_dune/typical_vrml_examples
-%%PORTDOCS%%@dirrm share/doc/white_dune/developer_docs
-%%PORTDOCS%%@dirrm share/doc/white_dune/commandline_examples
-%%PORTDOCS%%@dirrm share/doc/white_dune
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/animation_example.wrl
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/index.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/joystick2.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/joystick2.sh.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/nostereo.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/nostereo.sh.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/sidewinder3dpro.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/sidewinder3dpro.sh.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/spaceball_joystick_example.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/spaceball_joystick_example.sh.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/spaceball_solaris8.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmancordlessgamepad.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/xinput_example.sh
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/xinput_example.sh.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/xinput_irix6.2_example.sh
+%%PORTDOCS%%%%DOCSDIR%%/deutsch.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/Doxyfile.in
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/dune.png
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/dune_developer.html
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/man2html.sh
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/png2jpg.sh
+%%PORTDOCS%%%%DOCSDIR%%/developer_docs/standard.jpg
+%%PORTDOCS%%%%DOCSDIR%%/english.jpg
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/billboard.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/bubble.wav
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/camera_animation.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/checker_planesensor.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/checker_touchsensor.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/door_cylindersensor.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/elevator_proximity_trigger.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/forward_kinematic_animation.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/forward_kinematic_spheresensor.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/headupdisplay_example.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/image.gif
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/index.html
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/material_animation.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/misc_animation.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/movie.mpg
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/movie_trigger.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/sound_trigger.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/touch_trigger.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/transform_animation.wrl
+%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/visibilty_trigger.wrl
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/6d.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/6dloc.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/6dlocal_right1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/6dlocal_right2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/6dlocal_right3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/6dlocal_wrong.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/animation_onetime.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/animation_onetime2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/animation_recording.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/cassettenrecorder.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/center.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/colorcircle1.png
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/colorcircle2.png
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/cosmo_colorpervertex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/cosmo_no_colorpervertex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/crash.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/crashrestore.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dials_default.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dials_normal.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune.1.html
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_animation.png
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_colorpervertex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_de.html
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_de_exercise.html
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_en.html
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_en_exercise.html
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_interaktion.png
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_no_colorpervertex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/fieldchange.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/hover.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/interpolator.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/joystick_3D_move.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/joystick_3D_rot.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/joystick_sidewinder.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/navigation.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/near_far.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/node_add_invalid.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/node_add_valid.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/recording.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/recording_one.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/rocket.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/rot.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/routecut1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/routecut2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/routemake1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/routemake2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/scale.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/scenegraphchange_invalid.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/scenegraphchange_valid.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/sceneicon.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/schieb.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/spaceball.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/timesensor.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/transform.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/transform2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/up_down.jpg
+%%PORTDOCS%%%%DOCSDIR%%/usage_docs/windows.png
+%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsSurface.wrl
+%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsSurfacePROTO.wrl
+%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsSurface_example.wrl
+%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/index.html
+%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/nurbs.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/commandline_examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/developer_docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/typical_vrml_examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/usage_docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vrml200x_nurbssurface
+%%PORTDOCS%%@dirrm %%DOCSDIR%%