6 files changed, 212 insertions, 126 deletions

diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 89f4bd36dc05..99de0533215a 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gchemutils
-PORTVERSION=	0.4.8
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,21 +15,21 @@ MAINTAINER=	pav@FreeBSD.org
 COMMENT=	C++ classes and Gtk2 widgets related to chemistry
 
 LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext \
-		openbabel.1:${PORTSDIR}/science/openbabel
+		openbabel.1:${PORTSDIR}/science/openbabel \
+		goffice-1.2:${PORTSDIR}/devel/goffice
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack libglade2 libgnomeprint libgnomeui
+USE_GNOME=	gnomehack gnomeprefix intlhack libglade2 libgnomeprintui libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"does not link with openbabel"
+BROKEN=		does not link with openbabel
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/gchemutils/distinfo b/science/gchemutils/distinfo
index d542364af39d..fc02c24ad0cd 100644
--- a/science/gchemutils/distinfo
+++ b/science/gchemutils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-chemistry-utils-0.4.8.tar.bz2) = ea4e96091dfd98993f84b3018efc5525
-SHA256 (gnome-chemistry-utils-0.4.8.tar.bz2) = 3ec42eadd17de30f1cbb81eaa01b78feb8d2e55f4cab527f5960846f9d1e4b06
-SIZE (gnome-chemistry-utils-0.4.8.tar.bz2) = 493202
+MD5 (gnome-chemistry-utils-0.6.0.tar.bz2) = 46eb14c0f61386f75bd27063b4e905dd
+SHA256 (gnome-chemistry-utils-0.6.0.tar.bz2) = af1bb6ae658343b2c3b48a744dd2d7e80aab62d7d88cd3a4a72fe10673b5e74d
+SIZE (gnome-chemistry-utils-0.6.0.tar.bz2) = 538944
diff --git a/science/gchemutils/files/patch-gcu-formula.cc b/science/gchemutils/files/patch-gcu-formula.cc
new file mode 100644
index 000000000000..2b301b6edb0e
--- /dev/null
+++ b/science/gchemutils/files/patch-gcu-formula.cc
@@ -0,0 +1,31 @@
+--- gcu/formula.cc.orig	Thu Feb  9 13:24:54 2006
++++ gcu/formula.cc	Mon Mar 20 18:17:25 2006
+@@ -31,6 +31,19 @@
+ #include <glib/gi18n.h>
+ #include <sstream>
+ 
++/* XXX Implement strndup for FreeBSD. */
++static char *
++strndup(const char *str, size_t len) {
++    char *ret;
++
++    if ((str == NULL || len < 0)) return(NULL);
++    ret = (char *)malloc(len + 1);
++    if (ret == NULL) return(NULL);
++    strncpy(ret, str, len);
++    ret[len] = '\0';
++    return(ret);
++}
++
+ using namespace gcu;
+ 
+ parse_error::parse_error(const string& __arg, int start, int length)
+@@ -448,7 +461,7 @@
+ 			atom_weight = Element::GetElement ((*i).first)->GetWeight (atom_prec);
+ 			if (atom_prec == 0)
+ 				m_Artificial = true;
+-			delta += pow10 (-atom_prec) * (*i).second;
++			delta += pow (10, -atom_prec) * (*i).second;
+ 			m_Weight += atom_weight * (*i).second;
+ 		}
+ 		m_WeightPrec = (int) ceil (-log10 (delta) - 1e-5);
diff --git a/science/gchemutils/files/patch-programs-gchemcalc.cc b/science/gchemutils/files/patch-programs-gchemcalc.cc
new file mode 100644
index 000000000000..01cabccf18d3
--- /dev/null
+++ b/science/gchemutils/files/patch-programs-gchemcalc.cc
@@ -0,0 +1,11 @@
+--- programs/gchemcalc.cc.orig	Sat Feb 25 18:35:50 2006
++++ programs/gchemcalc.cc	Mon Mar 20 18:22:41 2006
+@@ -140,7 +140,7 @@
+ 		} else {
+ 			if (prec < 0) {
+ 				// round the value to replace not significant figures by 0s.
+-				double offs = pow10 (prec);
++				double offs = pow (10, prec);
+ 				weight = rint (weight * offs) / offs;
+ 			}
+ 			format = artificial? g_strdup ("(%.0f)"): g_strdup ("%.0f");
diff --git a/science/gchemutils/files/patch-programs-gchemtable-main.cc b/science/gchemutils/files/patch-programs-gchemtable-main.cc
new file mode 100644
index 000000000000..7a6329b80d47
--- /dev/null
+++ b/science/gchemutils/files/patch-programs-gchemtable-main.cc
@@ -0,0 +1,10 @@
+--- programs/gchemtable-main.cc.orig	Thu Feb  9 13:24:54 2006
++++ programs/gchemtable-main.cc	Mon Mar 20 18:30:41 2006
+@@ -27,6 +27,7 @@
+ #include <goffice/goffice.h>
+ #include <goffice/app/go-plugin.h>
+ #include <goffice/app/go-plugin-loader-module.h>
++#include <libintl.h>
+ 
+ using namespace gcu;
+ 
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index 9adc9cd33a2e..f3d484240254 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -1,122 +1,158 @@
-bin/gchem3d
 bin/gchem3d-viewer
-include/gcu/gcu/atom.h
-include/gcu/gcu/bond.h
-include/gcu/gcu/object.h
-include/gcu/gcu/document.h
-include/gcu/gcu/element.h
-include/gcu/gcu/matrix.h
-include/gcu/gcu/matrix2d.h
-include/gcu/gcu/xml-utils.h
-include/gcu/gcu/chemistry.h
-include/gcu/gcu/gtkperiodic.h
-include/gcu/gcu/gtkcrystalviewer.h
-include/gcu/gcu/crystalview.h
-include/gcu/gcu/crystaldoc.h
-include/gcu/gcu/crystalatom.h
-include/gcu/gcu/crystalline.h
-include/gcu/gcu/crystalcleavage.h
-include/gcu/gcu/gtkchem3dviewer.h
+bin/gchemcalc
+bin/gchemtable
+include/gchemutils/gcu/application.h
+include/gchemutils/gcu/atom.h
+include/gchemutils/gcu/bond.h
+include/gchemutils/gcu/crystalatom.h
+include/gchemutils/gcu/crystalcleavage.h
+include/gchemutils/gcu/crystaldoc.h
+include/gchemutils/gcu/crystalline.h
+include/gchemutils/gcu/crystalview.h
+include/gchemutils/gcu/dialog.h
+include/gchemutils/gcu/document.h
+include/gchemutils/gcu/element.h
+include/gchemutils/gcu/formula.h
+include/gchemutils/gcu/gtkcomboperiodic.h
+include/gchemutils/gcu/gtkcrystalviewer.h
+include/gchemutils/gcu/gtkchem3dviewer.h
+include/gchemutils/gcu/gtkperiodic.h
+include/gchemutils/gcu/chemistry.h
+include/gchemutils/gcu/isotope.h
+include/gchemutils/gcu/matrix2d.h
+include/gchemutils/gcu/matrix.h
+include/gchemutils/gcu/object.h
+include/gchemutils/gcu/xml-utils.h
 lib/libgcu.la
 lib/libgcu.so
-lib/libgcu.so.4
-libdata/bonobo/servers/gchem3d.server
+lib/libgcu.so.6
 libdata/pkgconfig/gcu.pc
 share/gnome/applications/gchem3d-viewer.desktop
-share/gnome/doc/gchemutils/reference/html/annotated.html
-share/gnome/doc/gchemutils/reference/html/atom_8h-source.html
-share/gnome/doc/gchemutils/reference/html/bond_8h-source.html
-share/gnome/doc/gchemutils/reference/html/classes.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Atom.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Atom.png
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Atom-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Bond.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Bond.png
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Bond-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalAtomList.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalAtom.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalAtom.png
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalAtom-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalCleavage.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalCleavage-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalClevageList.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalDoc.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalDoc-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalLineList.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalLine.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalLine-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalView.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalView-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Document.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Document.png
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Document-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Element.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Element-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix2D.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix2D-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix-members.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Object.html
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Object.png
-share/gnome/doc/gchemutils/reference/html/classgcu_1_1Object-members.html
-share/gnome/doc/gchemutils/reference/html/crystalatom_8h-source.html
-share/gnome/doc/gchemutils/reference/html/crystalcleavage_8h-source.html
-share/gnome/doc/gchemutils/reference/html/crystaldoc_8h-source.html
-share/gnome/doc/gchemutils/reference/html/crystalline_8h-source.html
-share/gnome/doc/gchemutils/reference/html/crystalview_8h-source.html
-share/gnome/doc/gchemutils/reference/html/dirs.html
-share/gnome/doc/gchemutils/reference/html/dir_000000.html
-share/gnome/doc/gchemutils/reference/html/dir_000001.html
-share/gnome/doc/gchemutils/reference/html/document_8h-source.html
-share/gnome/doc/gchemutils/reference/html/doxygen.css
-share/gnome/doc/gchemutils/reference/html/doxygen.png
-share/gnome/doc/gchemutils/reference/html/element_8h-source.html
-share/gnome/doc/gchemutils/reference/html/files.html
-share/gnome/doc/gchemutils/reference/html/functions.html
-share/gnome/doc/gchemutils/reference/html/functions_func.html
-share/gnome/doc/gchemutils/reference/html/functions_vars.html
-share/gnome/doc/gchemutils/reference/html/gchem3d-viewer_8c.html
-share/gnome/doc/gchemutils/reference/html/gchem3d-viewer_8c-source.html
-share/gnome/doc/gchemutils/reference/html/globals.html
-share/gnome/doc/gchemutils/reference/html/globals_enum.html
-share/gnome/doc/gchemutils/reference/html/globals_func.html
-share/gnome/doc/gchemutils/reference/html/gtkcrystalviewer_8h.html
-share/gnome/doc/gchemutils/reference/html/gtkcrystalviewer_8h-source.html
-share/gnome/doc/gchemutils/reference/html/gtkchem3dviewer_8h.html
-share/gnome/doc/gchemutils/reference/html/gtkchem3dviewer_8h-source.html
-share/gnome/doc/gchemutils/reference/html/gtkperiodic_8h.html
-share/gnome/doc/gchemutils/reference/html/gtkperiodic_8h-source.html
-share/gnome/doc/gchemutils/reference/html/hierarchy.html
-share/gnome/doc/gchemutils/reference/html/chemistry_8h.html
-share/gnome/doc/gchemutils/reference/html/chemistry_8h-source.html
-share/gnome/doc/gchemutils/reference/html/index.html
-share/gnome/doc/gchemutils/reference/html/matrix2d_8h-source.html
-share/gnome/doc/gchemutils/reference/html/matrix_8h-source.html
-share/gnome/doc/gchemutils/reference/html/namespacegcu.html
-share/gnome/doc/gchemutils/reference/html/namespacemembers.html
-share/gnome/doc/gchemutils/reference/html/namespacemembers_enum.html
-share/gnome/doc/gchemutils/reference/html/namespacemembers_type.html
-share/gnome/doc/gchemutils/reference/html/namespaces.html
-share/gnome/doc/gchemutils/reference/html/object_8h-source.html
-share/gnome/doc/gchemutils/reference/html/structGcuAtomicRadius.html
-share/gnome/doc/gchemutils/reference/html/structGcuAtomicRadius-members.html
-share/gnome/doc/gchemutils/reference/html/structGcuElectronegativity.html
-share/gnome/doc/gchemutils/reference/html/structGcuElectronegativity-members.html
-share/gnome/doc/gchemutils/reference/html/structGtkCrystalViewer.html
-share/gnome/doc/gchemutils/reference/html/structGtkChem3DViewer.html
-share/gnome/doc/gchemutils/reference/html/structGtkPeriodic.html
-share/gnome/doc/gchemutils/reference/html/testbonobocontrol_8c.html
-share/gnome/doc/gchemutils/reference/html/testbonobocontrol_8c-source.html
-share/gnome/doc/gchemutils/reference/html/testgtkcrystalviewer_8c.html
-share/gnome/doc/gchemutils/reference/html/testgtkcrystalviewer_8c-source.html
-share/gnome/doc/gchemutils/reference/html/testgtkchem3dviewer_8c.html
-share/gnome/doc/gchemutils/reference/html/testgtkchem3dviewer_8c-source.html
-share/gnome/doc/gchemutils/reference/html/testgtkperiodic_8c.html
-share/gnome/doc/gchemutils/reference/html/testgtkperiodic_8c-source.html
-share/gnome/doc/gchemutils/reference/html/xml-utils_8h.html
-share/gnome/doc/gchemutils/reference/html/xml-utils_8h-source.html
+share/gnome/applications/gchemcalc.desktop
+share/gnome/applications/gchemtable.desktop
+share/gnome/doc/gchemutils/reference/annotated.html
+share/gnome/doc/gchemutils/reference/application_8h-source.html
+share/gnome/doc/gchemutils/reference/atom_8h-source.html
+share/gnome/doc/gchemutils/reference/bond_8h-source.html
+share/gnome/doc/gchemutils/reference/classes.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Application.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Application-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Atom.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Atom.png
+share/gnome/doc/gchemutils/reference/classgcu_1_1Atom-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Bond.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Bond.png
+share/gnome/doc/gchemutils/reference/classgcu_1_1Bond-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalAtomList.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalAtom.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalAtom.png
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalAtom-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalCleavage.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalCleavage-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalClevageList.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalDoc.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalDoc-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalLineList.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalLine.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalLine-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalView.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1CrystalView-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Dialog.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Dialog-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Document.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Document.png
+share/gnome/doc/gchemutils/reference/classgcu_1_1Document-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Element.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Element-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Formula.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Formula-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Isotope.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Isotope.png
+share/gnome/doc/gchemutils/reference/classgcu_1_1Isotope-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1IsotopicPattern.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1IsotopicPattern-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Matrix2D.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Matrix2D-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Matrix.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Matrix-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Object.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1Object.png
+share/gnome/doc/gchemutils/reference/classgcu_1_1Object-members.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1parse__error.html
+share/gnome/doc/gchemutils/reference/classgcu_1_1parse__error-members.html
+share/gnome/doc/gchemutils/reference/crystalatom_8h-source.html
+share/gnome/doc/gchemutils/reference/crystalcleavage_8h-source.html
+share/gnome/doc/gchemutils/reference/crystaldoc_8h-source.html
+share/gnome/doc/gchemutils/reference/crystalline_8h-source.html
+share/gnome/doc/gchemutils/reference/crystalview_8h-source.html
+share/gnome/doc/gchemutils/reference/dialog_8h-source.html
+share/gnome/doc/gchemutils/reference/dirs.html
+share/gnome/doc/gchemutils/reference/dir_000000.html
+share/gnome/doc/gchemutils/reference/dir_000001.html
+share/gnome/doc/gchemutils/reference/document_8h-source.html
+share/gnome/doc/gchemutils/reference/doxygen.css
+share/gnome/doc/gchemutils/reference/doxygen.png
+share/gnome/doc/gchemutils/reference/element_8h-source.html
+share/gnome/doc/gchemutils/reference/files.html
+share/gnome/doc/gchemutils/reference/formula_8h-source.html
+share/gnome/doc/gchemutils/reference/functions.html
+share/gnome/doc/gchemutils/reference/functions_func.html
+share/gnome/doc/gchemutils/reference/functions_vars.html
+share/gnome/doc/gchemutils/reference/globals.html
+share/gnome/doc/gchemutils/reference/globals_enum.html
+share/gnome/doc/gchemutils/reference/globals_func.html
+share/gnome/doc/gchemutils/reference/gtkcomboperiodic_8h.html
+share/gnome/doc/gchemutils/reference/gtkcomboperiodic_8h-source.html
+share/gnome/doc/gchemutils/reference/gtkcrystalviewer_8h.html
+share/gnome/doc/gchemutils/reference/gtkcrystalviewer_8h-source.html
+share/gnome/doc/gchemutils/reference/gtkchem3dviewer_8h.html
+share/gnome/doc/gchemutils/reference/gtkchem3dviewer_8h-source.html
+share/gnome/doc/gchemutils/reference/gtkperiodic_8h.html
+share/gnome/doc/gchemutils/reference/gtkperiodic_8h-source.html
+share/gnome/doc/gchemutils/reference/hierarchy.html
+share/gnome/doc/gchemutils/reference/chemistry_8h.html
+share/gnome/doc/gchemutils/reference/chemistry_8h-source.html
+share/gnome/doc/gchemutils/reference/index.html
+share/gnome/doc/gchemutils/reference/isotope_8h-source.html
+share/gnome/doc/gchemutils/reference/matrix2d_8h-source.html
+share/gnome/doc/gchemutils/reference/matrix_8h-source.html
+share/gnome/doc/gchemutils/reference/namespacegcu.html
+share/gnome/doc/gchemutils/reference/namespacemembers.html
+share/gnome/doc/gchemutils/reference/namespacemembers_enum.html
+share/gnome/doc/gchemutils/reference/namespacemembers_type.html
+share/gnome/doc/gchemutils/reference/namespaces.html
+share/gnome/doc/gchemutils/reference/object_8h-source.html
+share/gnome/doc/gchemutils/reference/structGcuAtomicRadius.html
+share/gnome/doc/gchemutils/reference/structGcuAtomicRadius-members.html
+share/gnome/doc/gchemutils/reference/structGcuDimensionalValue.html
+share/gnome/doc/gchemutils/reference/structGcuDimensionalValue-members.html
+share/gnome/doc/gchemutils/reference/structGcuElectronegativity.html
+share/gnome/doc/gchemutils/reference/structGcuElectronegativity-members.html
+share/gnome/doc/gchemutils/reference/structGcuIsotope.html
+share/gnome/doc/gchemutils/reference/structGcuIsotope.png
+share/gnome/doc/gchemutils/reference/structGcuIsotope-members.html
+share/gnome/doc/gchemutils/reference/structGcuValue.html
+share/gnome/doc/gchemutils/reference/structGcuValue-members.html
+share/gnome/doc/gchemutils/reference/structGtkComboPeriodic.html
+share/gnome/doc/gchemutils/reference/structGtkCrystalViewer.html
+share/gnome/doc/gchemutils/reference/structGtkChem3DViewer.html
+share/gnome/doc/gchemutils/reference/structGtkPeriodic.html
+share/gnome/doc/gchemutils/reference/testgtkcrystalviewer_8c.html
+share/gnome/doc/gchemutils/reference/testgtkcrystalviewer_8c-source.html
+share/gnome/doc/gchemutils/reference/testgtkchem3dviewer_8c.html
+share/gnome/doc/gchemutils/reference/testgtkchem3dviewer_8c-source.html
+share/gnome/doc/gchemutils/reference/testgtkperiodic_8c.html
+share/gnome/doc/gchemutils/reference/testgtkperiodic_8c-source.html
+share/gnome/doc/gchemutils/reference/xml-utils_8h.html
+share/gnome/doc/gchemutils/reference/xml-utils_8h-source.html
+share/gnome/gchemutils/elecprops.xml
 share/gnome/gchemutils/elements.xml
+share/gnome/gchemutils/glade/curve.glade
+share/gnome/gchemutils/glade/eltpage.glade
+share/gnome/gchemutils/glade/gchemcalc.glade
 share/gnome/gchemutils/glade/gtkperiodic.glade
+share/gnome/gchemutils/isotopes.xml
+share/gnome/gchemutils/radii.xml
 share/locale/de/LC_MESSAGES/gnome-chemistry-utils.mo
 share/locale/fr/LC_MESSAGES/gnome-chemistry-utils.mo
 share/locale/it/LC_MESSAGES/gnome-chemistry-utils.mo
@@ -126,14 +162,13 @@ share/mime/chemical/x-mdl-molfile.xml
 share/mime/chemical/x-pdb.xml
 share/mime/chemical/x-xyz.xml
 share/mime/packages/gchemutils.xml
-@dirrm include/gcu/gcu
-@dirrm include/gcu
-@dirrm share/gnome/gchemutils/glade
-@dirrm share/gnome/gchemutils
-@dirrm share/gnome/doc/gchemutils/reference/html
+@dirrm include/gchemutils/gcu
+@dirrm include/gchemutils
 @dirrm share/gnome/doc/gchemutils/reference
 @dirrm share/gnome/doc/gchemutils
 @dirrm share/gnome/doc
+@dirrm share/gnome/gchemutils/glade
+@dirrm share/gnome/gchemutils
 @dirrmtry share/mime/chemical
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime