7 files changed, 23 insertions, 31 deletions

diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 4afede99454e..d8b9d65d1461 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gchempaint
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.8
@@ -31,5 +31,6 @@ CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help --with-omf-dir=${PREF
 post-patch:
 	@${REINPLACE_CMD} -e 's|-release $$(VERSION)|-version @GCP_VERSION_INFO@|' \
 		${WRKSRC}/lib/Makefile.in ${WRKSRC}/libgcpcanvas/Makefile.in
+	@${REINPLACE_CMD} -e 's,GNOME|Applications|Education,Applications|Education,' ${WRKSRC}/help/gchempaint.omf.in
 
 .include <bsd.port.mk>
diff --git a/science/gchempaint/distinfo b/science/gchempaint/distinfo
index 946775f8d48f..7f1a6ef52fdb 100644
--- a/science/gchempaint/distinfo
+++ b/science/gchempaint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gchempaint-0.8.0.tar.bz2) = 8ddac8bf752e927197b42f91b3d2e24a
-SHA256 (gchempaint-0.8.0.tar.bz2) = 2422e0781dc3fc63787c7b3fe281c75381887e0087279f2ec8ce0ab0b3ac34d4
-SIZE (gchempaint-0.8.0.tar.bz2) = 1355062
+MD5 (gchempaint-0.8.1.tar.bz2) = 47e23cb2935b967a7913ed4b1f5ca5ed
+SHA256 (gchempaint-0.8.1.tar.bz2) = 76043e0174ecfb0ec6419cb658361133257ec4478455bcb15b8b1e411af07e4d
+SIZE (gchempaint-0.8.1.tar.bz2) = 1354236
diff --git a/science/gchempaint/files/patch-goffice-gchempaint.cc b/science/gchempaint/files/patch-goffice-gchempaint.cc
deleted file mode 100644
index 9c8db643f024..000000000000
--- a/science/gchempaint/files/patch-goffice-gchempaint.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- goffice/gchempaint.cc.orig	Mon May  7 18:27:11 2007
-+++ goffice/gchempaint.cc	Mon May 21 19:17:04 2007
-@@ -31,6 +31,7 @@
- #include <libgnomecanvas/gnome-canvas.h>
- #include <math.h>
- #include <openbabel/mol.h>
-+#include <libintl.h>
- 
- gcpGOfficeApplication *app;
- 
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 83d0a5174b85..e156938d3232 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gchemutils
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.8
diff --git a/science/gchemutils/distinfo b/science/gchemutils/distinfo
index 937bac2f450a..72b81854e0a1 100644
--- a/science/gchemutils/distinfo
+++ b/science/gchemutils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-chemistry-utils-0.8.0.tar.bz2) = d96c6fb8c5c43db00c253624cfa01ecf
-SHA256 (gnome-chemistry-utils-0.8.0.tar.bz2) = aee76c068f07f7b43bef12ee931af5b63f0fa8565da73027dfbb8c75a44b3893
-SIZE (gnome-chemistry-utils-0.8.0.tar.bz2) = 1445092
+MD5 (gnome-chemistry-utils-0.8.1.tar.bz2) = 68e5bfa81bbfc7ca66bbd47180c3dedd
+SHA256 (gnome-chemistry-utils-0.8.1.tar.bz2) = 541d6a5a091e01948d7f4e70217e4b164b8391f2677b0f48d5547e47a2d09976
+SIZE (gnome-chemistry-utils-0.8.1.tar.bz2) = 1533810
diff --git a/science/gchemutils/files/patch-programs-gchemtable-main.cc b/science/gchemutils/files/patch-programs-gchemtable-main.cc
deleted file mode 100644
index aac70c328cb5..000000000000
--- a/science/gchemutils/files/patch-programs-gchemtable-main.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/table/gchemtable-main.cc.orig	Thu Feb  9 13:24:54 2006
-+++ programs/table/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 c8ce4136e599..4ff4edacf082 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -267,6 +267,7 @@ share/gchemutils/glade/table/eltpage.glade
 share/gchemutils/glade/table/family.glade
 share/gchemutils/glade/table/state-thermometer.glade
 share/gchemutils/isotopes.xml
+share/gchemutils/pixmaps/gcrystal_logo.png
 share/gchemutils/radii.xml
 share/gnome/help/gchem3d-viewer/C/figures/main-window.png
 share/gnome/help/gchem3d-viewer/C/gchem3d-viewer.xml
@@ -299,15 +300,26 @@ share/gnome/help/gcrystal/C/figures/size-dlg.png
 share/gnome/help/gcrystal/C/figures/view-settings.png
 share/gnome/help/gcrystal/C/gcrystal.xml
 share/gnome/help/gcrystal/C/legal.xml
-share/gnome-chemistry-utils/pixmaps/gcrystal_logo.png
 share/mimelnk/application/x-gcrystal.desktop
 share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-gcrystal.png
+share/icons/hicolor/32x32/apps/gchem3d-viewer.png
+share/icons/hicolor/32x32/apps/gchemcalc.png
+share/icons/hicolor/32x32/apps/gchemtable.png
 share/icons/hicolor/32x32/apps/gcrystal.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-gcrystal.png
+share/icons/hicolor/48x48/apps/gchem3d-viewer.png
+share/icons/hicolor/48x48/apps/gchemcalc.png
+share/icons/hicolor/48x48/apps/gchemtable.png
 share/icons/hicolor/48x48/apps/gcrystal.png
 share/icons/hicolor/72x72/mimetypes/gnome-mime-application-x-gcrystal.png
+share/icons/hicolor/72x72/apps/gchem3d-viewer.png
+share/icons/hicolor/72x72/apps/gchemcalc.png
+share/icons/hicolor/72x72/apps/gchemtable.png
 share/icons/hicolor/72x72/apps/gcrystal.png
 share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-gcrystal.png
+share/icons/hicolor/128x128/apps/gchem3d-viewer.png
+share/icons/hicolor/128x128/apps/gchemcalc.png
+share/icons/hicolor/128x128/apps/gchemtable.png
 share/icons/hicolor/128x128/apps/gcrystal.png
 share/locale/de/LC_MESSAGES/gchemutils.mo
 share/locale/es/LC_MESSAGES/gchemutils.mo
@@ -322,6 +334,7 @@ share/mime/packages/gchemutils.xml
 @dirrmtry share/applications
 @dirrm share/doc/gchemutils/reference
 @dirrm share/doc/gchemutils
+@dirrm share/gchemutils/pixmaps
 @dirrm share/gchemutils/glade/crystal
 @dirrm share/gchemutils/glade/table
 @dirrm share/gchemutils/glade
@@ -338,8 +351,6 @@ share/mime/packages/gchemutils.xml
 @dirrm share/gnome/help/gcrystal/C/figures
 @dirrm share/gnome/help/gcrystal/C
 @dirrm share/gnome/help/gcrystal
-@dirrm share/gnome-chemistry-utils/pixmaps
-@dirrm share/gnome-chemistry-utils
 @dirrmtry share/mime/chemical
 @dirrmtry share/mimelnk/application
 @dirrmtry share/mimelnk