diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index 8927ba80ee10..8835319ff2f6 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -5,19 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	v_sim
-PORTVERSION=	3.3.3
+PORTVERSION=	3.4.0
 CATEGORIES=	science
 MASTER_SITES=	http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/download/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Visualization of atomic structures
 
+LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
+
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc
+CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
@@ -34,10 +36,10 @@ PLIST_SUB+=	NLS=""
 
 .if !defined(WITHOUT_CDF)
 LIB_DEPENDS+=	netcdf.4:${PORTSDIR}/science/netcdf
-CONFIGURE_ARGS+=--with-nanoquanta --with-nanoquanta-path=${LOCALBASE}
+CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE}
 PLIST_SUB+=	CDF=""
 .else
-CONFIGURE_ARGS+=--without-nanoquanta
+CONFIGURE_ARGS+=--without-netcdf
 PLIST_SUB+=	CDF="@comment "
 .endif
 
@@ -53,10 +55,8 @@ PLIST_SUB+=	BABEL="@comment "
 pre-configure:
 	${REINPLACE_CMD} -e 's|$$datadir/doc/$$PACKAGE/examples|${EXAMPLESDIR}|'	\
 		-e 's|CFLAGS="-O2"|#CFLAGS="-O2"|;s|Werror ansi pedantic-errors||'	\
+		-e 's|$${docdir}/examples|${EXAMPLESDIR}|'				\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-	${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/src/Makefile.in
-	${REINPLACE_CMD} -e 's|-pedantic-errors||' \
-	    	${WRKSRC}/src/extraGtkFunctions/Makefile.in
 .if defined(WITHOUT_NLS)
 	${REINPLACE_CMD} -e 's|	po ||'	\
 		${WRKSRC}/Makefile.in
diff --git a/science/v_sim/distinfo b/science/v_sim/distinfo
index 77adefcca30a..106b8c5e37eb 100644
--- a/science/v_sim/distinfo
+++ b/science/v_sim/distinfo
@@ -1,3 +1,3 @@
-MD5 (v_sim-3.3.3.tar.bz2) = 21e8606c401f2e2f073ef2e710719bc3
-SHA256 (v_sim-3.3.3.tar.bz2) = 655e3f827d0e088b4a48aee8651ab4445a3a386231efffb2d0aeeac9c94b32c3
-SIZE (v_sim-3.3.3.tar.bz2) = 1712206
+MD5 (v_sim-3.4.0.tar.bz2) = fd4e1db1ac6bfbb753e21f3f5b20ccf0
+SHA256 (v_sim-3.4.0.tar.bz2) = 4bd8547023cec85d9bd4e7667700512c5b07cd0d2e0910f8ad4a71c5486ff245
+SIZE (v_sim-3.4.0.tar.bz2) = 2597756
diff --git a/science/v_sim/pkg-plist b/science/v_sim/pkg-plist
index 3faec0310c93..33601593fcc2 100644
--- a/science/v_sim/pkg-plist
+++ b/science/v_sim/pkg-plist
@@ -1,131 +1,141 @@
 bin/v_sim
-%%CDF%%lib/v_sim/plug-ins/libnanoquanta.a
-%%CDF%%lib/v_sim/plug-ins/libnanoquanta.la
-%%CDF%%lib/v_sim/plug-ins/libnanoquanta.so
-%%CDF%%lib/v_sim/plug-ins/libnanoquanta.so.1
+lib/v_sim/plug-ins/abinit.png
 %%BABEL%%lib/v_sim/plug-ins/libobloader.a
 %%BABEL%%lib/v_sim/plug-ins/libobloader.la
 %%BABEL%%lib/v_sim/plug-ins/libobloader.so
 %%BABEL%%lib/v_sim/plug-ins/libobloader.so.1
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/axesTransform.png
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch02.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch04.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch05.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch06.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch07.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch08.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch09.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch10.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch11.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch12.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ch13.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/core.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/gtkInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/home.png
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/index.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/left.png
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/right.png
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/style.css
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/up.png
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-VisuObject.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-atomic-xyz.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-axes.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-box.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-callbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-cylinder.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dataFile.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dataNode.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dumpThroughGdkPixbuf.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dumpToAscii.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dumpToGif.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dumpToPsAndPdf.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-dumpToTiff.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-externalOpenGLExtensions.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-externalPairsExtensions.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-externalRenderingMethods.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-fogAndBGColor.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-about.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-colorComboBoxWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-cylinder.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-dumpDialogWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-main.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-numericalEntryWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-observePick.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-openGLWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-pairs.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-renderingWindowWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-save.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-shadeComboBoxWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-toolPanelWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtk-wire.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtkAtomic.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-gtkSpin.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-interactive.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-light.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-nq-basic.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-nq-density.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-nq-structure.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-objectList.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-opengl.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelBoxAxes.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelBrowser.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelDataFile.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelElements.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelFogBgColor.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelMethod.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelOpenGL.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelPlanes.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelSurfaces.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-panelSurfacesTools.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-plane.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-pot2surf.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-renderingAtomic-ascii.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-renderingAtomic-d3.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-renderingAtomic.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-renderingMode.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-renderingSpin.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-scalarFields.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-surfaces.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-text.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolColor.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolConfigFile.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolFileFormat.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolFortran.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolMatrix.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolOptions.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-toolShade.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-view.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-OSInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-actionInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-basic.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-commandLine.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-configFile.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-data.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-dump.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-elements.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-extension.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-nodes.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-openGL.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-pairs.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-pickMesure.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-plugins.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-rendering.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-tools.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visu-windowInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-visuConfig.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v-sim-wire.html
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v_sim.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/APIreference/v_sim/v_sim.devhelp2
+lib/v_sim/plug-ins/nanoquanta.png
+lib/v_sim/plug-ins/openbabel.png
+lib/v_sim/plug-ins/xsf.png
+%%PORTDOCS%%%%DOCSDIR%%/ColorComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%/DumpDialog.html
+%%PORTDOCS%%%%DOCSDIR%%/NumericalEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/OpenGLWidget.html
+%%PORTDOCS%%%%DOCSDIR%%/OrientationChooser.html
+%%PORTDOCS%%%%DOCSDIR%%/Plane.html
+%%PORTDOCS%%%%DOCSDIR%%/RenderingWindow.html
+%%PORTDOCS%%%%DOCSDIR%%/Scale.html
+%%PORTDOCS%%%%DOCSDIR%%/ShadeComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%/StippleComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%/VisuData.html
 %%PORTDOCS%%%%DOCSDIR%%/authors
+%%PORTDOCS%%%%DOCSDIR%%/axesTransform.png
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/ch05.html
+%%PORTDOCS%%%%DOCSDIR%%/ch06.html
+%%PORTDOCS%%%%DOCSDIR%%/ch07.html
+%%PORTDOCS%%%%DOCSDIR%%/ch08.html
+%%PORTDOCS%%%%DOCSDIR%%/ch09.html
+%%PORTDOCS%%%%DOCSDIR%%/ch10.html
+%%PORTDOCS%%%%DOCSDIR%%/ch11.html
+%%PORTDOCS%%%%DOCSDIR%%/ch12.html
+%%PORTDOCS%%%%DOCSDIR%%/core.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/ix01.html
+%%PORTDOCS%%%%DOCSDIR%%/left.png
 %%PORTDOCS%%%%DOCSDIR%%/licence.en.txt
 %%PORTDOCS%%%%DOCSDIR%%/licence.fr.txt
 %%PORTDOCS%%%%DOCSDIR%%/pot2surf_help
 %%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-ABINIT-file-format.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-ETSF-file-format.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-LineObject.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-ToolPanel.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-VisuObject.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-atomic-xyz.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-axes.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-box.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-cylinder.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dataFile.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dataNode.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dumpThroughGdkPixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dumpToAscii.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dumpToGif.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dumpToPsAndPdf.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dumpToSVG.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-dumpToTiff.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-extInfos.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-fogAndBGColor.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-about.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-cylinder.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-interactive.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-main.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-move.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-pairs.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-pick.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-save.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtk-wire.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtkAtomic.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-gtkSpin.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-interactive.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-isolines.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-light.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-objectList.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-opengl.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelAxes.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelBox.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelBrowser.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelDataFile.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelElements.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelFogBgColor.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelMap.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelMethod.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelOpenGL.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelPlanes.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelSurfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-panelSurfacesTools.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-pot2surf.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-renderingAtomic-ascii.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-renderingAtomic-d3.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-renderingAtomic.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-renderingMode.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-renderingSpin.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-scalarFields.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-surfacesPoints.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-text.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolColor.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolConfigFile.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolElements.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolFileFormat.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolFortran.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolMatrix.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolOptions.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-toolShade.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-view.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-OSInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-actionInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-basic.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-commandLine.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-configFile.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-dump.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-elements.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-extension.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-gtk.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-nodes.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-openGL.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-pairs.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-pickMesure.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-rendering.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-tools.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visu-windowInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-visuConfig.html
+%%PORTDOCS%%%%DOCSDIR%%/v-sim-wire.html
+%%PORTDOCS%%%%DOCSDIR%%/v_sim.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/v_sim.devhelp2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ab_silicon.in
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/aluminium.d3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cinchonidine.xsf.bz2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo-browser.tar.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.ascii
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.d3
@@ -138,6 +148,7 @@ bin/v_sim
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nq-netcdf.cdl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nq-netcdf.nc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/planes.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/si1002x1-o_DS1_DEN-etsf.nc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/silane.nc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_isosurfaces.ascii
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_isosurfaces.surf
@@ -146,6 +157,10 @@ share/pixmaps/v_sim.16.png
 share/pixmaps/v_sim.32.png
 share/pixmaps/v_sim.48.png
 share/pixmaps/v_sim.xpm
+%%DATADIR%%/pixmaps/axes-angles.png
+%%DATADIR%%/pixmaps/axes-box.png
+%%DATADIR%%/pixmaps/axes-button.png
+%%DATADIR%%/pixmaps/axes-ortho.png
 %%DATADIR%%/pixmaps/icone-about.png
 %%DATADIR%%/pixmaps/icone-dialog.png
 %%DATADIR%%/pixmaps/icone-observe.png
@@ -156,15 +171,18 @@ share/pixmaps/v_sim.xpm
 %%DATADIR%%/pixmaps/logo_grey.png
 %%DATADIR%%/pixmaps/logo_petit.png
 %%DATADIR%%/pixmaps/logo_rectangle.png
-%%DATADIR%%/pixmaps/nanoquanta.png
 %%DATADIR%%/pixmaps/observe-bandeau.png
-%%DATADIR%%/pixmaps/openbabel.png
 %%DATADIR%%/pixmaps/save-bandeau.png
 %%DATADIR%%/pixmaps/stock-atomic.png
+%%DATADIR%%/pixmaps/stock-axes_20.png
 %%DATADIR%%/pixmaps/stock-black-to-white.png
 %%DATADIR%%/pixmaps/stock-blue-to-red.png
 %%DATADIR%%/pixmaps/stock-blue-to-yellow.png
-%%DATADIR%%/pixmaps/stock-channels-16.png
+%%DATADIR%%/pixmaps/stock-box_20.png
+%%DATADIR%%/pixmaps/stock-browser_20.png
+%%DATADIR%%/pixmaps/stock-data_20.png
+%%DATADIR%%/pixmaps/stock-elements_20.png
+%%DATADIR%%/pixmaps/stock-fog_20.png
 %%DATADIR%%/pixmaps/stock-four-lights_20.png
 %%DATADIR%%/pixmaps/stock-go-and-back.png
 %%DATADIR%%/pixmaps/stock-go-around.png
@@ -172,9 +190,14 @@ share/pixmaps/v_sim.xpm
 %%DATADIR%%/pixmaps/stock-green-to-red.png
 %%DATADIR%%/pixmaps/stock-hot-color.png
 %%DATADIR%%/pixmaps/stock-inter.png
-%%DATADIR%%/pixmaps/stock-isosurfaces.png
+%%DATADIR%%/pixmaps/stock-isosurfaces_20.png
+%%DATADIR%%/pixmaps/stock-map_20.png
+%%DATADIR%%/pixmaps/stock-masking.png
 %%DATADIR%%/pixmaps/stock-menu-detach.png
+%%DATADIR%%/pixmaps/stock-method_20.png
 %%DATADIR%%/pixmaps/stock-one-light_20.png
+%%DATADIR%%/pixmaps/stock-opengl_20.png
+%%DATADIR%%/pixmaps/stock-planes_20.png
 %%DATADIR%%/pixmaps/stock-refresh-dir_20.png
 %%DATADIR%%/pixmaps/stock-select-all_20.png
 %%DATADIR%%/pixmaps/stock-union.png
@@ -182,10 +205,8 @@ share/pixmaps/v_sim.xpm
 %%DATADIR%%/pixmaps/stock-white-to-black.png
 %%DATADIR%%/pixmaps/stock-white-to-red.png
 %%DATADIR%%/pixmaps/stock_effects-object-colorize_20.png
-%%DATADIR%%/pixmaps/stock_effects-object-colorize_20_.png
 %%DATADIR%%/pixmaps/stock_media-play.png
 %%DATADIR%%/pixmaps/stock_media-stop.png
-%%DATADIR%%/pixmaps/stock_palette_20.png
 %%DATADIR%%/pixmaps/stock_rotate_20.png
 %%DATADIR%%/pixmaps/stock_spin.png
 %%DATADIR%%/v_sim.par
@@ -194,8 +215,6 @@ share/pixmaps/v_sim.xpm
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/APIreference/v_sim
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/APIreference
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/v_sim/plug-ins
 @dirrm lib/v_sim