Changes 1.6.7:

- Fixed several serious bugs related to label rendering and printing
  that occured when chemtool was built with GTK 2 instead of GTK 1.2
  (see ChangeLog for details)
- SVG export now adds a namespace header as required by current builds
  of the firefox browser
- SVG export now uses color values instead of color names for better
  SVGT compatibility
- The separation between the lines of multiple bonds is configurable
- The keys of the numeric keypad now create two dots instead of a line
   for free electron pairs when the Shift key is pressed
- Two new bond types for drawing filled and unfilled p orbital lobes
- chemtool now checks for fig2sxd (sourceforge.net) and offers to export
  to OpenOffice Draw format when it is present.
- rpm packages did not install the dutch locale file.

Chnges 1.6.6:
- Fixed bug in molfile preview that caused an immediate crash in 1.6.5
- Made drawing of wiggly bonds work again

4 files changed, 36 insertions, 35 deletions

diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index f137aac29b5..ef17c23e1d7 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/26 11:53:32 adam Exp $
 
-DISTNAME=		chemtool-1.6
-PKGREVISION=	1
-CATEGORIES=		biology
-MASTER_SITES=		http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
+DISTNAME=	chemtool-1.6.7
+CATEGORIES=	biology
+MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
-COMMENT=		Program for drawing organic molecules
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
+COMMENT=	Program for drawing organic molecules
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-gnomedir
 
 post-install:
diff --git a/biology/chemtool/PLIST b/biology/chemtool/PLIST
index 67b28475cff..714c8840e1f 100644
--- a/biology/chemtool/PLIST
+++ b/biology/chemtool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/30 21:10:11 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/26 11:53:32 adam Exp $
 bin/chemtool
 bin/cht
 man/man1/chemtool.1
@@ -14,34 +14,37 @@ share/examples/chemtool/Indolizomycin.cht
 share/examples/chemtool/Lepicidin-A-Aglycon.cht
 share/examples/chemtool/Neu2
 share/examples/chemtool/amine.mol
-share/examples/chemtool/anabsinthin
-share/examples/chemtool/atp
+share/examples/chemtool/anabsinthin.cht
+share/examples/chemtool/anthocyanidine.cht
+share/examples/chemtool/atp.cht
 share/examples/chemtool/bcarotin.pdb
 share/examples/chemtool/breve.cht
-share/examples/chemtool/breve.mol
-share/examples/chemtool/bufotalin
+share/examples/chemtool/bufotalin.cht
 share/examples/chemtool/byrostatin1.cht
 share/examples/chemtool/c70.cht
-share/examples/chemtool/camphor
-share/examples/chemtool/chlorophyll
+share/examples/chemtool/camphor.cht
+share/examples/chemtool/chlorophyll.cht
 share/examples/chemtool/claisen.cht
 share/examples/chemtool/dodecahedran.cht
-share/examples/chemtool/indigo
-share/examples/chemtool/kdo
+share/examples/chemtool/indigo.cht
+share/examples/chemtool/kdo.cht
 share/examples/chemtool/krebs.cht
 share/examples/chemtool/labeltest
 share/examples/chemtool/pagodan.cht
 share/examples/chemtool/penicillin_v.cht
-share/examples/chemtool/pteridin
+share/examples/chemtool/pteridin.cht
 share/examples/chemtool/reaction.cht
 share/examples/chemtool/rutamycin_b.cht
-share/examples/chemtool/tbutylazulene
+share/examples/chemtool/sample.sdf
+share/examples/chemtool/tbutylazulene.cht
 share/examples/chemtool/tcdd.cht
-share/examples/chemtool/tetracyclin
+share/examples/chemtool/tetracyclin.cht
+share/examples/chemtool/v3000.mol
 share/examples/chemtool/viagra.cht
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/chemtool.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/chemtool.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/chemtool.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/chemtool.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/chemtool.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/chemtool.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/chemtool.mo
diff --git a/biology/chemtool/distinfo b/biology/chemtool/distinfo
index 536336f560f..43d7e90aeb8 100644
--- a/biology/chemtool/distinfo
+++ b/biology/chemtool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2005/02/22 21:28:55 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/08/26 11:53:32 adam Exp $
 
-SHA1 (chemtool-1.6.tar.gz) = 0560600bdc4a66b1fb9d5df68584a4a33c56b584
-RMD160 (chemtool-1.6.tar.gz) = 98932a8f3933dfe909489825ea3ca7f0a8641b6b
-Size (chemtool-1.6.tar.gz) = 358695 bytes
-SHA1 (patch-aa) = ab3a9f5dc6e1c33cebab52dd8068b8d25d0b5d37
+SHA1 (chemtool-1.6.7.tar.gz) = 52b93c4873c1106e7e3f13cc0bc1d02ec0cfe5e5
+RMD160 (chemtool-1.6.7.tar.gz) = 30d2457fac03e4ec380529b4f95516f625628359
+Size (chemtool-1.6.7.tar.gz) = 427878 bytes
+SHA1 (patch-aa) = dfea234b55889db843b78933433461ae708160a0
diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa
index 2ab68178265..cf6bd690e05 100644
--- a/biology/chemtool/patches/patch-aa
+++ b/biology/chemtool/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.11 2004/06/11 13:22:36 grant Exp $
+$NetBSD: patch-aa,v 1.12 2005/08/26 11:53:32 adam Exp $
 
---- Makefile.in.orig	2003-05-11 23:02:15.000000000 +1000
+--- Makefile.in.orig	2005-01-30 13:09:46.000000000 +0000
 +++ Makefile.in
-@@ -5,7 +5,7 @@ localedir=@localedir@
- mandir=@mandir@
+@@ -6,7 +6,7 @@ mandir=@mandir@
  kdedir=@kdemimedir@
  gnomedir=@gnomemimedir@
--CFLAGS=-O2 -Wall -Wunused -Wuninitialized -I. `gtk-config --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\"
-+CFLAGS+=-Wall -Wunused -Wuninitialized -I. `gtk-config --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\"
- 
+ CPPFLAGS=@CPPFLAGS@ -I. @GTK_CFLAGS@ @DEFS@ -DLOCALEDIR=\"${localedir}\"
+-CFLAGS=-O2 -Wall -Wunused -Wuninitialized @CFLAGS@
++CFLAGS+=-Wall -Wunused -Wuninitialized @CFLAGS@
  CC=@CC@
- CP=/bin/cp
+ CP=@CP@
+ RM=@RM@ -f
 @@ -33,7 +33,8 @@ lint: ${SRCS}
  	splint -weak -initallelements +posixlib `gtk-config --cflags` -I. ${SRCS} >splint.log