From 981e0b0330d187e70f478176dd862aeb444634c1 Mon Sep 17 00:00:00 2001 From: jtb Date: Sat, 30 Aug 2003 21:10:11 +0000 Subject: Update to version 1.6. New features in chemtool 1.6 - universal import mode based on BABEL (both openbabel and babel supported) - Formula weight calculator now handles all main group elements and the first row of transition elements, and accepts greek phi as phenyl substituent. - Movable hexagonal or square grid backdrop - Improved SVG export, optional preview bitmaps in EPS export, optional EMF export - Cursor key support for pixel-precise drawing and moving - The cleanup function now corrects bonds that deviate from ideal horizontal or vertical orientation by a single pixel - Color support (bonds and text can be red,green,blue,cyan,magenta or yellow). - Default bond length now configurable, additional grid positions at two and three times this length added - Added a brief help text to accompany the 'About' window in the 'Help' menu. - Added alternate text font (Times Roman) - An attachment site can be marked before saving a molecule or fragment, which act as reference point for adding this fragment to other molecules (previously, this had to be the first atom in a file). Attachment sites are marked in the preview window by a small x. - Background color can now be chosen for screen display and EPS export, and drawing whiteout boxes under labels is now an option ( off by default !). - Text at 8,10,12,14,17,20 and 24pt can now coexist in a drawing. - Increased allowed label length to 100. - Improved rendering of dashed wedge and dotted lines - Improved text kerning in xfig-based print and export. - It is now possible to place an auto-incrementing counter at the cursor position for numbering sites. - Changed double bond drawing code to no longer switch sides depending on drawing (or rotation) angle. (As a result of this, some older drawings will need fixing) - Rescaling a molecule now also scales its labels. Downscaling beyond zero size (causing strange inversions) is no longer possible. - Renamed the "Orbitals" template menu to "Symbols" and added "plus", "minus" and a rearrangement arrow to it. - Added two new bond types, a triple bond with all three lines equal, and a quadruple bond. --- biology/chemtool/Makefile | 17 ++++++----- biology/chemtool/PLIST | 27 ++++++++++++----- biology/chemtool/distinfo | 11 +++---- biology/chemtool/patches/patch-aa | 61 ++++++++------------------------------- biology/chemtool/patches/patch-ab | 12 -------- biology/chemtool/patches/patch-ac | 10 ------- biology/chemtool/patches/patch-ad | 8 ----- 7 files changed, 44 insertions(+), 102 deletions(-) delete mode 100644 biology/chemtool/patches/patch-ab delete mode 100644 biology/chemtool/patches/patch-ac delete mode 100644 biology/chemtool/patches/patch-ad (limited to 'biology/chemtool') diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile index bba405ad3ff..e1a94686766 100644 --- a/biology/chemtool/Makefile +++ b/biology/chemtool/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.18 2003/07/17 21:24:41 grant Exp $ +# $NetBSD: Makefile,v 1.19 2003/08/30 21:10:11 jtb Exp $ -DISTNAME= chemtool-1.4.1 -PKGREVISION= 2 +DISTNAME= chemtool-1.6 CATEGORIES= biology -MASTER_SITES= http://www.uni-ulm.de/~s_tvolk/chemtool/src/ +MASTER_SITES= http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.uni-ulm.de/~s_tvolk/chemtool.html +HOMEPAGE= http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ COMMENT= Program for drawing organic molecules -USE_BUILDLINK2= # defined -USE_PKGLOCALEDIR= # defined -USE_X11= # defined +USE_BUILDLINK2= yes +USE_PKGLOCALEDIR= yes +USE_X11= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool diff --git a/biology/chemtool/PLIST b/biology/chemtool/PLIST index 97259005562..67b28475cff 100644 --- a/biology/chemtool/PLIST +++ b/biology/chemtool/PLIST @@ -1,38 +1,49 @@ -@comment $NetBSD: PLIST,v 1.3 2002/11/30 15:32:00 salo Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/08/30 21:10:11 jtb Exp $ bin/chemtool bin/cht man/man1/chemtool.1 +man/man1/cht.1 share/doc/chemtool/README share/doc/chemtool/TODO +share/examples/chemtool/14263232.mol share/examples/chemtool/AMP.cht share/examples/chemtool/Adenosine.cht share/examples/chemtool/Dehydrotubifolin.cht +share/examples/chemtool/G-host.pdb share/examples/chemtool/Indolizomycin.cht share/examples/chemtool/Lepicidin-A-Aglycon.cht -share/examples/chemtool/Neu1 share/examples/chemtool/Neu2 +share/examples/chemtool/amine.mol +share/examples/chemtool/anabsinthin +share/examples/chemtool/atp +share/examples/chemtool/bcarotin.pdb share/examples/chemtool/breve.cht +share/examples/chemtool/breve.mol +share/examples/chemtool/bufotalin share/examples/chemtool/byrostatin1.cht +share/examples/chemtool/c70.cht share/examples/chemtool/camphor +share/examples/chemtool/chlorophyll share/examples/chemtool/claisen.cht -share/examples/chemtool/example1 -share/examples/chemtool/example2 -share/examples/chemtool/example3 -share/examples/chemtool/example4 -share/examples/chemtool/example5 -share/examples/chemtool/example7 +share/examples/chemtool/dodecahedran.cht share/examples/chemtool/indigo +share/examples/chemtool/kdo 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/reaction.cht share/examples/chemtool/rutamycin_b.cht +share/examples/chemtool/tbutylazulene share/examples/chemtool/tcdd.cht +share/examples/chemtool/tetracyclin 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/pl/LC_MESSAGES/chemtool.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/chemtool.mo ${PKGLOCALEDIR}/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 d026c80672f..7836f427c60 100644 --- a/biology/chemtool/distinfo +++ b/biology/chemtool/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.7 2002/12/01 20:25:39 salo Exp $ +$NetBSD: distinfo,v 1.8 2003/08/30 21:10:11 jtb Exp $ -SHA1 (chemtool-1.4.1.tar.gz) = 03560d5bbc90e12032e80e5313fc257f3f0955d1 -Size (chemtool-1.4.1.tar.gz) = 150140 bytes -SHA1 (patch-aa) = ff4fbfa2bd611ad4e91c598334436a9d982fef74 -SHA1 (patch-ab) = 258a7940f5a2135891f61c30f02c7c57b67aeaa2 -SHA1 (patch-ac) = 05d31454c8e1609ce406be54d8390defbbe35c1f -SHA1 (patch-ad) = 26f3e4dc18c355185937c34cd7ec789d358d3a02 +SHA1 (chemtool-1.6.tar.gz) = 0560600bdc4a66b1fb9d5df68584a4a33c56b584 +Size (chemtool-1.6.tar.gz) = 358695 bytes +SHA1 (patch-aa) = f1ee3192b7b162bbbe1c35728f8c5f440423219f diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa index 3d414708cdb..28206adca68 100644 --- a/biology/chemtool/patches/patch-aa +++ b/biology/chemtool/patches/patch-aa @@ -1,50 +1,13 @@ -$NetBSD: patch-aa,v 1.9 2002/12/01 20:25:39 salo Exp $ +$NetBSD: patch-aa,v 1.10 2003/08/30 21:10:12 jtb Exp $ ---- Makefile.orig Sat Sep 8 16:56:18 2001 -+++ Makefile Sat Nov 30 12:56:37 2002 -@@ -1,21 +1,10 @@ --PREFIX=/usr/local --LOCALEDIR=/usr/share/locale -+localedir=${PREFIX}/share/locale - --ifdef LOCALEDIR --CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DLOCALEDIR=\"${LOCALEDIR}\" --else --CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DDISABLE_NLS --endif -+CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DLOCALEDIR=\"${localedir}\" - --CC=gcc --CP=/bin/cp --RM=/bin/rm -f --MAKE=make -- - SRCS = main.c chemproc.c graph.c draw.c inout.c - OBJS = main.o chemproc.o graph.o draw.o inout.o - -- - SYS_LIBRARIES = `gtk-config --libs` -lm - - all: chemtool cht -@@ -25,17 +14,13 @@ - 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 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 - +--- Makefile.in.orig 2003-08-19 19:24:28.000000000 +0100 ++++ Makefile.in 2003-08-19 19:24:43.000000000 +0100 +@@ -5,7 +5,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}\" + + CC=@CC@ + CP=/bin/cp diff --git a/biology/chemtool/patches/patch-ab b/biology/chemtool/patches/patch-ab deleted file mode 100644 index 5f95ccfa88a..00000000000 --- a/biology/chemtool/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/05/20 17:25:43 cjep Exp $ ---- 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 - #include - #include - #define DOUBLE double diff --git a/biology/chemtool/patches/patch-ac b/biology/chemtool/patches/patch-ac deleted file mode 100644 index 93090fd57be..00000000000 --- a/biology/chemtool/patches/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/05/03 22:03:08 jtb Exp $ - ---- 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.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 deleted file mode 100644 index bab1908503e..00000000000 --- a/biology/chemtool/patches/patch-ad +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/05/20 17:25:43 cjep Exp $ ---- 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 - #include - #include -- cgit v1.2.3