Update to version 1.4.1. Numerous bug fixes since 1.3.

7 files changed, 80 insertions, 56 deletions

diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index b14f188033c..bd31dd49947 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2001/12/06 04:30:09 jmc Exp $
+# $NetBSD: Makefile,v 1.12 2002/05/03 22:03:08 jtb Exp $
 
-DISTNAME=	chemtool-1.3
-CATEGORIES=	biology
-MASTER_SITES=	http://www.uni-ulm.de/~s_tvolk/chemtool/src/
+DISTNAME=		chemtool-1.4.1
+CATEGORIES=		biology
+MASTER_SITES=		http://www.uni-ulm.de/~s_tvolk/chemtool/src/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.uni-ulm.de/~s_tvolk/chemtool.html
-COMMENT=	Program for drawing organic molecules
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.uni-ulm.de/~s_tvolk/chemtool.html
+COMMENT=		Program for drawing organic molecules
 
-USE_BUILDLINK_ONLY=	YES
-MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+USE_BUILDLINK_ONLY=	# defined
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool
diff --git a/biology/chemtool/PLIST b/biology/chemtool/PLIST
index 0040d60eb9c..559fc339715 100644
--- a/biology/chemtool/PLIST
+++ b/biology/chemtool/PLIST
@@ -1,19 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:27:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/03 22:03:08 jtb Exp $
 bin/chemtool
 bin/cht
 man/man1/chemtool.1
 share/doc/chemtool/README
 share/doc/chemtool/TODO
-share/examples/chemtool/AAMP
-share/examples/chemtool/A_Fur_big
-share/examples/chemtool/N_ado
+share/examples/chemtool/AMP.cht
+share/examples/chemtool/Adenosine.cht
+share/examples/chemtool/Dehydrotubifolin.cht
+share/examples/chemtool/Indolizomycin.cht
+share/examples/chemtool/Lepicidin-A-Aglycon.cht
 share/examples/chemtool/Neu1
 share/examples/chemtool/Neu2
-share/examples/chemtool/amp.cht
 share/examples/chemtool/breve.cht
+share/examples/chemtool/byrostatin1.cht
 share/examples/chemtool/camphor
 share/examples/chemtool/claisen.cht
-share/examples/chemtool/coronen
 share/examples/chemtool/example1
 share/examples/chemtool/example2
 share/examples/chemtool/example3
@@ -21,10 +22,17 @@ share/examples/chemtool/example4
 share/examples/chemtool/example5
 share/examples/chemtool/example7
 share/examples/chemtool/indigo
-share/examples/chemtool/label
+share/examples/chemtool/krebs.cht
+share/examples/chemtool/penicillin_v.cht
 share/examples/chemtool/pteridin
+share/examples/chemtool/reaction.cht
+share/examples/chemtool/rutamycin_b.cht
 share/examples/chemtool/tcdd.cht
+share/examples/chemtool/viagra.cht
 share/locale/cs/LC_MESSAGES/chemtool.mo
 share/locale/de/LC_MESSAGES/chemtool.mo
+share/locale/fr/LC_MESSAGES/chemtool.mo
+share/locale/pl/LC_MESSAGES/chemtool.mo
+share/locale/ru/LC_MESSAGES/chemtool.mo
 @dirrm share/examples/chemtool
 @dirrm share/doc/chemtool
diff --git a/biology/chemtool/distinfo b/biology/chemtool/distinfo
index 58af2e9d0d9..b90ecae2bae 100644
--- a/biology/chemtool/distinfo
+++ b/biology/chemtool/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/30 11:58:46 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2002/05/03 22:03:08 jtb Exp $
 
-SHA1 (chemtool-1.3.tar.gz) = d1d9e7fee195f2845f3bafaf995521516f9930f6
-Size (chemtool-1.3.tar.gz) = 90616 bytes
-SHA1 (patch-aa) = 2b663d0a7cead5ac61d7325a2ceea3f5c48fc1dd
-SHA1 (patch-ab) = cac82a03d026a9cd1bbea819218682da4b024924
-SHA1 (patch-ac) = 01e3786e50275e82b64340d591a3aebad7bc2174
+SHA1 (chemtool-1.4.1.tar.gz) = 03560d5bbc90e12032e80e5313fc257f3f0955d1
+Size (chemtool-1.4.1.tar.gz) = 150140 bytes
+SHA1 (patch-aa) = 739fe870f755e44b1ca5be862f69640300f2f07e
+SHA1 (patch-ab) = 258a7940f5a2135891f61c30f02c7c57b67aeaa2
+SHA1 (patch-ac) = 05d31454c8e1609ce406be54d8390defbbe35c1f
+SHA1 (patch-ad) = 26f3e4dc18c355185937c34cd7ec789d358d3a02
diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa
index 300aba9de71..821b70ed940 100644
--- a/biology/chemtool/patches/patch-aa
+++ b/biology/chemtool/patches/patch-aa
@@ -1,42 +1,51 @@
-$NetBSD: patch-aa,v 1.4 2001/06/30 11:58:47 zuntum Exp $
-
---- Makefile.orig	Tue Feb  6 19:52:54 2001
-+++ Makefile
-@@ -1,16 +1,16 @@
+--- Makefile.orig	Sat Sep  8 15:56:18 2001
++++ Makefile	Mon Apr 29 10:27:24 2002
+@@ -1,22 +1,12 @@
 -PREFIX=/usr/local
 -LOCALEDIR=/usr/share/locale
--CFLAGS=-O2 -Wall
++LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
+ 
+-ifdef LOCALEDIR
+-CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DLOCALEDIR=\"${LOCALEDIR}\" 
+-else
+-CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DDISABLE_NLS
+-endif
+-
 -CC=gcc
 -CP=/bin/cp
 -RM=/bin/rm -f
-+#PREFIX=/usr/local
-+LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
-+#CFLAGS=-O2 -Wall
-+#CC=gcc
-+#CP=/bin/cp
-+#RM=/bin/rm -f
+-MAKE=make
++CFLAGS+= -Wall `${GTK_CONFIG} --cflags` -DMENU -DLOCALEDIR=\"${LOCALEDIR}\" 
  
  SRCS = main.c chemproc.c graph.c draw.c inout.c 
  OBJS = main.o chemproc.o graph.o draw.o inout.o 
  
  
--EXTRA_INCLUDES = `gtk-config --cflags`  # -DDISABLE_NLS
 -SYS_LIBRARIES = `gtk-config --libs` -lm
-+EXTRA_INCLUDES = `$(GTK_CONFIG) --cflags` # -DDISABLE_NLS
-+SYS_LIBRARIES = `$(GTK_CONFIG) --libs` -lm
++SYS_LIBRARIES = `${GTK_CONFIG} --libs` -lm
  
  all: chemtool cht
  
-@@ -25,9 +25,9 @@
- 	${CC} ${CFLAGS} ${EXTRA_INCLUDES} -c ${SRCS}
+@@ -25,17 +15,15 @@
+ chemtool: ${OBJS}
+ 	${CC} ${OBJS} ${SYS_LIBRARIES} -o chemtool
+ 
+-cht:	src-cht/cht-1.7.c
++cht:	src-cht/cht-1.8.c
+ 	cd src-cht;${MAKE}
+ 
  
  install: chemtool src-cht/cht
 -	${CP} chemtool src-cht/cht ${PREFIX}/bin
 -	${CP} chemtool.1 ${PREFIX}/man/man1
+-	${CP} cht.1	${PREFIX}/man/man1
+-	ifdef LOCALEDIR
 -	for L in `ls locales`; do ${CP} locales/$$L/chemtool.mo ${LOCALEDIR}/$$L/LC_MESSAGES;done
+-	endif 
 +	${BSD_INSTALL_PROGRAM} chemtool src-cht/cht ${PREFIX}/bin
-+	${BSD_INSTALL_MAN} chemtool.1 ${PREFIX}/man/man1
++	${BSD_INSTALL_MAN} chemtool.1 cht.1 ${PREFIX}/man/man1
 +	for L in `ls locales`; do ${BSD_INSTALL_DATA} locales/$$L/chemtool.mo ${LOCALEDIR}/$$L/LC_MESSAGES;done
-  
++
  clean:
  	${RM} *.o *~ src-cht/*.o src-cht/*~ chemtool src-cht/cht
+ 
diff --git a/biology/chemtool/patches/patch-ab b/biology/chemtool/patches/patch-ab
index 6a032027ea8..9ae8c466ea1 100644
--- a/biology/chemtool/patches/patch-ab
+++ b/biology/chemtool/patches/patch-ab
@@ -1,12 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2001/02/12 02:16:03 jtb Exp $
-
---- src-cht/cht-1.3.c.orig	Tue Feb  6 18:38:02 2001
-+++ src-cht/cht-1.3.c
-@@ -16,6 +16,7 @@
+--- src-cht/cht-1.8.c.orig	Mon Apr 29 10:21:47 2002
++++ src-cht/cht-1.8.c	Mon Apr 29 10:22:03 2002
+@@ -14,7 +14,7 @@
+  * by the licence agreement accompanying p2c itself.
+  */
  
- 
- #include <stdio.h>
+-
 +#include <limits.h>
- 
+ #include <stdio.h>
+ #include <unistd.h>
  #define DOUBLE double
- 
diff --git a/biology/chemtool/patches/patch-ac b/biology/chemtool/patches/patch-ac
index 9e9aeaf8a2c..93090fd57be 100644
--- a/biology/chemtool/patches/patch-ac
+++ b/biology/chemtool/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2001/02/12 02:16:03 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2002/05/03 22:03:08 jtb Exp $
 
---- src-cht/Makefile.orig	Mon Feb 12 02:13:11 2001
-+++ src-cht/Makefile
+--- src-cht/Makefile.orig	Mon Apr 29 10:12:34 2002
++++ src-cht/Makefile	Mon Apr 29 10:12:59 2002
 @@ -1,4 +1,4 @@
  default: cht
  
- cht:	cht-1.3.c
--	gcc -O cht-1.3.c -lm -o cht
-+	$(CC) $(CFLAGS) cht-1.3.c -lm -o cht
+ cht:	cht-1.8.c
+-	gcc -O cht-1.8.c -o cht
++	$(CC) $(CFLAGS) cht-1.8.c -o cht -lm
diff --git a/biology/chemtool/patches/patch-ad b/biology/chemtool/patches/patch-ad
new file mode 100644
index 00000000000..393ee40a29e
--- /dev/null
+++ b/biology/chemtool/patches/patch-ad
@@ -0,0 +1,7 @@
+--- ct.h.orig	Mon Apr 29 10:18:39 2002
++++ ct.h	Mon Apr 29 10:18:45 2002
+@@ -1,4 +1,3 @@
+-#undef __GNUC__
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>