5 files changed, 151 insertions, 35 deletions

diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 58873004daab..ca626f6de272 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gchempaint
-PORTVERSION=	0.4.14
+PORTVERSION=	0.6.0
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,15 +13,19 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	2D chemical structures editor for GNOME 2
 
+BUILD_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnomedocutils
 LIB_DEPENDS=	gcu.4:${PORTSDIR}/science/gchemutils
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+GCONF_SCHEMAS=	gchempaint-arrows.schemas
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeprintui libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 
 .include <bsd.port.mk>
diff --git a/science/gchempaint/distinfo b/science/gchempaint/distinfo
index 821901d5ded7..e1bd7d8ed0d7 100644
--- a/science/gchempaint/distinfo
+++ b/science/gchempaint/distinfo
@@ -1,2 +1,2 @@
-MD5 (gchempaint-0.4.14.tar.bz2) = f72aea94e73e0f8e741ab692d15caa9d
-SIZE (gchempaint-0.4.14.tar.bz2) = 681690
+MD5 (gchempaint-0.6.0.tar.bz2) = d7996af2eda5ee2d1c45850742659d2a
+SIZE (gchempaint-0.6.0.tar.bz2) = 897779
diff --git a/science/gchempaint/files/patch-help_Makefile.in b/science/gchempaint/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..1b9f2bb6f91c
--- /dev/null
+++ b/science/gchempaint/files/patch-help_Makefile.in
@@ -0,0 +1,11 @@
+--- help/Makefile.in.orig	Wed Jul 27 02:50:59 2005
++++ help/Makefile.in	Wed Jul 27 02:51:22 2005
+@@ -972,7 +972,7 @@
+ 	    else \
+ 	      figfile="$(srcdir)/C/$$fig"; \
+ 	    fi; \
+-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir="$$lc/"`echo $$fig | sed -E -e 's/^(.*\/).*|.*/\1/'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ 	    if ! test -d "$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $$figdir"; \
diff --git a/science/gchempaint/files/patch-plugin.cc b/science/gchempaint/files/patch-plugin.cc
new file mode 100644
index 000000000000..67de4fba0bcb
--- /dev/null
+++ b/science/gchempaint/files/patch-plugin.cc
@@ -0,0 +1,10 @@
+--- plugins/templates/plugin.cc.orig	Mon Aug 15 12:43:14 2005
++++ plugins/templates/plugin.cc	Mon Sep 19 14:20:05 2005
+@@ -29,7 +29,6 @@
+ #include "lib/application.h"
+ #include "templatetool.h"
+ #include "templatetree.h"
+-#include <mcheck.h>
+ #include <sys/stat.h>
+ 
+ gcpTemplatesPlugin plugin;
diff --git a/science/gchempaint/pkg-plist b/science/gchempaint/pkg-plist
index e0ae8c93e5f7..986f59354dfc 100644
--- a/science/gchempaint/pkg-plist
+++ b/science/gchempaint/pkg-plist
@@ -1,56 +1,141 @@
 bin/gchempaint
+bin/gchempaint-viewer
+include/gchempaint/about.h
+include/gchempaint/application.h
+include/gchempaint/arrow.h
+include/gchempaint/atom.h
+include/gchempaint/bond.h
+include/gchempaint/cycle.h
+include/gchempaint/dialog.h
+include/gchempaint/docprop.h
+include/gchempaint/document.h
+include/gchempaint/electron.h
+include/gchempaint/filechooser.h
+include/gchempaint/fragment.h
+include/gchempaint/fragment-atom.h
+include/gchempaint/chain.h
+include/gchempaint/mendeleiev.h
+include/gchempaint/mesomery.h
+include/gchempaint/mesomery-arrow.h
+include/gchempaint/mesomer.h
+include/gchempaint/molecule.h
+include/gchempaint/operation.h
+include/gchempaint/plugin.h
+include/gchempaint/reactant.h
+include/gchempaint/reaction.h
+include/gchempaint/reaction-arrow.h
+include/gchempaint/reaction-operator.h
+include/gchempaint/reaction-step.h
+include/gchempaint/settings.h
+include/gchempaint/text.h
+include/gchempaint/text-object.h
+include/gchempaint/tool.h
+include/gchempaint/view.h
+include/gchempaint/widgetdata.h
+lib/gchempaint/plugins/arrows.so
+lib/gchempaint/plugins/atoms.so
+lib/gchempaint/plugins/bonds.so
+lib/gchempaint/plugins/cycles.so
+lib/gchempaint/plugins/selection.so
+lib/gchempaint/plugins/templates.so
+lib/gchempaint/plugins/text.so
+lib/libgchempaint.a
+lib/libgchempaint.so
+lib/libgchempaint.so.6
 libdata/bonobo/servers/gchempaint.server
 share/gnome/applications/gchempaint.desktop
-share/gnome/gchempaint/glade/arrow1.xpm
-share/gnome/gchempaint/glade/arrow2.xpm
-share/gnome/gchempaint/glade/bond.xpm
-share/gnome/gchempaint/glade/cn.xpm
-share/gnome/gchempaint/glade/cyclentool.glade
-share/gnome/gchempaint/glade/c3.xpm
-share/gnome/gchempaint/glade/c4.xpm
-share/gnome/gchempaint/glade/c5.xpm
-share/gnome/gchempaint/glade/c6.xpm
-share/gnome/gchempaint/glade/c7.xpm
-share/gnome/gchempaint/glade/c8.xpm
-share/gnome/gchempaint/glade/docprop.glade
-share/gnome/gchempaint/glade/downbond.xpm
-share/gnome/gchempaint/glade/eraser.xpm
-share/gnome/gchempaint/glade/fragment.xpm
-share/gnome/gchempaint/glade/charge-.xpm
-share/gnome/gchempaint/glade/charge+.xpm
-share/gnome/gchempaint/glade/mendeleiev.glade
-share/gnome/gchempaint/glade/mesomery.xpm
-share/gnome/gchempaint/glade/plus.xpm
-share/gnome/gchempaint/glade/selection.xpm
-share/gnome/gchempaint/glade/subscript24.png
-share/gnome/gchempaint/glade/superscript24.png
-share/gnome/gchempaint/glade/texttools.glade
-share/gnome/gchempaint/glade/text.xpm
-share/gnome/gchempaint/glade/tools.glade
-share/gnome/gchempaint/glade/upbond.xpm
-share/gnome/gchempaint/glade/xbond.xpm
 share/gnome/gchempaint/pixmaps/gchempaint_logo.png
-share/gnome/gnome-2.0/ui/gchempaint.xml
-share/gnome/help/gchempaint/C/gchempaint.xml
+share/gnome/gchempaint/templates/templates.xml
+share/gnome/gchempaint/ui/arrows.xml
+share/gnome/gchempaint/ui/arrowtool.glade
+share/gnome/gchempaint/ui/arrow1-24.png
+share/gnome/gchempaint/ui/arrow2-24.png
+share/gnome/gchempaint/ui/atoms.xml
+share/gnome/gchempaint/ui/bonds.xml
+share/gnome/gchempaint/ui/bond24.png
+share/gnome/gchempaint/ui/cn-24.png
+share/gnome/gchempaint/ui/cyclentool.glade
+share/gnome/gchempaint/ui/cycles.xml
+share/gnome/gchempaint/ui/c3-24.png
+share/gnome/gchempaint/ui/c4-24.png
+share/gnome/gchempaint/ui/c5-24.png
+share/gnome/gchempaint/ui/c6-24.png
+share/gnome/gchempaint/ui/c7-24.png
+share/gnome/gchempaint/ui/c8-24.png
+share/gnome/gchempaint/ui/docprop.glade
+share/gnome/gchempaint/ui/downbond24.png
+share/gnome/gchempaint/ui/electronpair24.png
+share/gnome/gchempaint/ui/element24.png
+share/gnome/gchempaint/ui/eraser24.png
+share/gnome/gchempaint/ui/fragment24.png
+share/gnome/gchempaint/ui/gchempaint.xml
+share/gnome/gchempaint/ui/group.glade
+share/gnome/gchempaint/ui/horiz24.png
+share/gnome/gchempaint/ui/charge-24.png
+share/gnome/gchempaint/ui/charge+24.png
+share/gnome/gchempaint/ui/mendeleiev.glade
+share/gnome/gchempaint/ui/merge24.png
+share/gnome/gchempaint/ui/mesomery24.png
+share/gnome/gchempaint/ui/new-template.glade
+share/gnome/gchempaint/ui/retrosynth24.png
+share/gnome/gchempaint/ui/rotate24.png
+share/gnome/gchempaint/ui/selection24.png
+share/gnome/gchempaint/ui/selection.xml
+share/gnome/gchempaint/ui/subscript24.png
+share/gnome/gchempaint/ui/superscript24.png
+share/gnome/gchempaint/ui/templates.glade
+share/gnome/gchempaint/ui/templates.xml
+share/gnome/gchempaint/ui/text24.png
+share/gnome/gchempaint/ui/text.xml
+share/gnome/gchempaint/ui/unpairedelectron24.png
+share/gnome/gchempaint/ui/upbond24.png
+share/gnome/gchempaint/ui/vert24.png
+share/gnome/gchempaint/ui/xbond24.png
 share/gnome/help/gchempaint/C/legal.xml
+share/gnome/help/gchempaint/C/gchempaint.xml
+share/gnome/help/gchempaint/C/figures/arrow-heads.png
 share/gnome/help/gchempaint/C/figures/bond.png
 share/gnome/help/gchempaint/C/figures/charges.png
 share/gnome/help/gchempaint/C/figures/cyclentool.png
 share/gnome/help/gchempaint/C/figures/cycletools.png
+share/gnome/help/gchempaint/C/figures/delocalized-bond.png
+share/gnome/help/gchempaint/C/figures/electrons.png
 share/gnome/help/gchempaint/C/figures/element.png
 share/gnome/help/gchempaint/C/figures/eraser.png
 share/gnome/help/gchempaint/C/figures/fragment.png
+share/gnome/help/gchempaint/C/figures/group.png
 share/gnome/help/gchempaint/C/figures/main-window.png
+share/gnome/help/gchempaint/C/figures/mechanism-arrows.png
 share/gnome/help/gchempaint/C/figures/mendeleiev.png
+share/gnome/help/gchempaint/C/figures/merge1.png
+share/gnome/help/gchempaint/C/figures/merge2.png
+share/gnome/help/gchempaint/C/figures/merge3.png
+share/gnome/help/gchempaint/C/figures/merge.png
+share/gnome/help/gchempaint/C/figures/mesomery1.png
+share/gnome/help/gchempaint/C/figures/mesomery2.png
+share/gnome/help/gchempaint/C/figures/mesomery3.png
 share/gnome/help/gchempaint/C/figures/mesomery-arrow.png
+share/gnome/help/gchempaint/C/figures/new-template.png
 share/gnome/help/gchempaint/C/figures/plus.png
 share/gnome/help/gchempaint/C/figures/properties.png
+share/gnome/help/gchempaint/C/figures/reaction1.png
+share/gnome/help/gchempaint/C/figures/reaction2.png
+share/gnome/help/gchempaint/C/figures/reaction3.png
+share/gnome/help/gchempaint/C/figures/reaction4.png
+share/gnome/help/gchempaint/C/figures/reaction5.png
 share/gnome/help/gchempaint/C/figures/reaction-arrows.png
+share/gnome/help/gchempaint/C/figures/retrosynthesis1.png
+share/gnome/help/gchempaint/C/figures/retrosynthesis2.png
+share/gnome/help/gchempaint/C/figures/retrosynthesis3.png
+share/gnome/help/gchempaint/C/figures/retrosynthesis4.png
+share/gnome/help/gchempaint/C/figures/retrosynthesis.png
+share/gnome/help/gchempaint/C/figures/rotate.png
 share/gnome/help/gchempaint/C/figures/selection.png
 share/gnome/help/gchempaint/C/figures/stereobonds.png
+share/gnome/help/gchempaint/C/figures/templates.png
+share/gnome/help/gchempaint/C/figures/templates-tools.png
 share/gnome/help/gchempaint/C/figures/text.png
 share/gnome/help/gchempaint/C/figures/texttools-bar.png
-share/gnome/help/gchempaint/C/figures/tools-window.png
 share/gnome/omf/gchempaint/gchempaint-C.omf
 share/icons/hicolor/32x32/apps/gchempaint.png
 share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-gchempaint.png
@@ -67,12 +152,18 @@ share/locale/pl/LC_MESSAGES/gchempaint.mo
 share/locale/zh_CN/LC_MESSAGES/gchempaint.mo
 share/mime/application/x-gchempaint.xml
 share/mime/packages/gchempaint.xml
+share/mime/chemical/x-chemdraw.xml
+share/mime/chemical/x-cml.xml
+@dirrm share/gnome/gchempaint/ui
+@dirrm share/gnome/gchempaint/templates
 @dirrm share/gnome/gchempaint/pixmaps
-@dirrm share/gnome/gchempaint/glade
 @dirrm share/gnome/gchempaint
 @dirrm share/gnome/help/gchempaint/C/figures
 @dirrm share/gnome/help/gchempaint/C
 @dirrm share/gnome/help/gchempaint
 @dirrm share/gnome/omf/gchempaint
+@dirrm lib/gchempaint/plugins
+@dirrm lib/gchempaint
+@dirrm include/gchempaint
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime