summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--biology/chemtool/Makefile29
-rw-r--r--biology/chemtool/files/md54
-rw-r--r--biology/chemtool/files/patch-sum6
-rw-r--r--biology/chemtool/patches/patch-aa48
-rw-r--r--biology/chemtool/patches/patch-ab12
-rw-r--r--biology/chemtool/patches/patch-ac10
-rw-r--r--biology/chemtool/pkg/PLIST24
7 files changed, 90 insertions, 43 deletions
diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index cf9f290974b..f71e6fa97b7 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,29 +1,24 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/25 20:10:55 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/12 02:16:02 jtb Exp $
-DISTNAME= chemtool-1.2
+DISTNAME= chemtool-1.3
CATEGORIES= biology
MASTER_SITES= http://www.uni-ulm.de/~s_tvolk/chemtool/stable/
MAINTAINER= jtb@netbsd.org
-HOMEPAGE= http://www.uni-ulm.de/~s_tvolk/chemtool/
+HOMEPAGE= http://www.uni-ulm.de/~s_tvolk/chemtool.html
DEPENDS+= gtk+>=1.0.0:../../x11/gtk
-USE_IMAKE= YES
-USE_X11BASE= YES
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/chemtool ${PREFIX}/bin
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool
+ @for f in ${WRKSRC}/examples/*; do \
+ i="${INSTALL_DATA} $$f ${PREFIX}/share/examples/chemtool/"; \
+ ${ECHO} $$i; $$i; \
+ done
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/chemtool
- @(cd ${WRKSRC}; \
- for i in examples/*; \
- do \
- ${INSTALL_DATA} $$i ${PREFIX}/share/examples/chemtool; \
- done; \
- for j in README TODO ChangeLog; \
- do \
- ${INSTALL_DATA} $$j ${PREFIX}/share/doc/chemtool; \
- done)
+ @for f in README TODO; do \
+ i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/chemtool/"; \
+ ${ECHO} $$i; $$i; \
+ done
.include "../../mk/bsd.pkg.mk"
diff --git a/biology/chemtool/files/md5 b/biology/chemtool/files/md5
index f02f8e1fc6a..920b90e4073 100644
--- a/biology/chemtool/files/md5
+++ b/biology/chemtool/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/11/25 20:10:55 jtb Exp $
+$NetBSD: md5,v 1.2 2001/02/12 02:16:03 jtb Exp $
-MD5 (chemtool-1.2.tar.gz) = 9ff4ebb7be5101c1f9110de106af10d4
+MD5 (chemtool-1.3.tar.gz) = bc66cf300fb12e6b308c0c3ef33c8491
diff --git a/biology/chemtool/files/patch-sum b/biology/chemtool/files/patch-sum
index a31ce05ca5c..b8d15483343 100644
--- a/biology/chemtool/files/patch-sum
+++ b/biology/chemtool/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/25 20:10:55 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2001/02/12 02:16:03 jtb Exp $
-MD5 (patch-aa) = af8067738f13a84bfe85195ec8a9652d
+MD5 (patch-aa) = 0854349a7060d6a8020b776d315c331c
+MD5 (patch-ab) = 0f990b1e1f3dc5c5176a748870d713ba
+MD5 (patch-ac) = 1c1b963e57d809d6332ada09004d2e58
diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa
index 986d294dbcb..0b02a6aee62 100644
--- a/biology/chemtool/patches/patch-aa
+++ b/biology/chemtool/patches/patch-aa
@@ -1,10 +1,40 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/25 20:10:55 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/12 02:16:03 jtb Exp $
---- Imakefile.orig Sat May 13 10:01:16 2000
-+++ Imakefile
-@@ -9,5 +9,3 @@
- NormalProgramTarget(chemtool,$(OBJS), , , )
-
- InstallProgram(chemtool,$(BINDIR))
--
--#InstallAppDefaults(Chemtool)
+--- Makefile.orig Tue Feb 6 18:52:54 2001
++++ Makefile
+@@ -1,15 +1,15 @@
+-PREFIX=/usr/local
+-LOCALEDIR=/usr/share/locale
+-CFLAGS=-O2 -Wall
+-CC=gcc
+-CP=/bin/cp
+-RM=/bin/rm -f
++#PREFIX=/usr/local
++LOCALEDIR=${PREFIX}/share/locale
++#CFLAGS=-O2 -Wall
++#CC=gcc
++#CP=/bin/cp
++#RM=/bin/rm -f
+
+ 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
++EXTRA_INCLUDES = `gtk-config --cflags` -I${LOCALBASE}/include # -DDISABLE_NLS
+ SYS_LIBRARIES = `gtk-config --libs` -lm
+
+ all: chemtool cht
+@@ -25,9 +25,9 @@
+ ${CC} ${CFLAGS} ${EXTRA_INCLUDES} -c ${SRCS}
+
+ install: chemtool src-cht/cht
+- ${CP} chemtool src-cht/cht ${PREFIX}/bin
+- ${CP} chemtool.1 ${PREFIX}/man/man1
+- for L in `ls locales`; do ${CP} locales/$$L/chemtool.mo ${LOCALEDIR}/$$L/LC_MESSAGES;done
++ ${BSD_INSTALL_PROGRAM} chemtool src-cht/cht ${PREFIX}/bin
++ ${BSD_INSTALL_MAN} chemtool.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
new file mode 100644
index 00000000000..6a032027ea8
--- /dev/null
+++ b/biology/chemtool/patches/patch-ab
@@ -0,0 +1,12 @@
+$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 @@
+
+
+ #include <stdio.h>
++#include <limits.h>
+
+ #define DOUBLE double
+
diff --git a/biology/chemtool/patches/patch-ac b/biology/chemtool/patches/patch-ac
new file mode 100644
index 00000000000..9e9aeaf8a2c
--- /dev/null
+++ b/biology/chemtool/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2001/02/12 02:16:03 jtb Exp $
+
+--- src-cht/Makefile.orig Mon Feb 12 02:13:11 2001
++++ src-cht/Makefile
+@@ -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
diff --git a/biology/chemtool/pkg/PLIST b/biology/chemtool/pkg/PLIST
index c21bc22330b..6c277a832d1 100644
--- a/biology/chemtool/pkg/PLIST
+++ b/biology/chemtool/pkg/PLIST
@@ -1,31 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/25 20:10:55 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/12 02:16:03 jtb Exp $
bin/chemtool
-share/doc/chemtool/ChangeLog
+bin/cht
share/doc/chemtool/README
share/doc/chemtool/TODO
share/examples/chemtool/AAMP
-share/examples/chemtool/A_Fur
share/examples/chemtool/A_Fur_big
-share/examples/chemtool/A_Ph
-share/examples/chemtool/A_Pyr
-share/examples/chemtool/A_ad
-share/examples/chemtool/A_ch_ch
-share/examples/chemtool/N_ade
share/examples/chemtool/N_ado
-share/examples/chemtool/N_cyt
-share/examples/chemtool/N_gua
-share/examples/chemtool/N_hx
-share/examples/chemtool/N_thy
-share/examples/chemtool/N_ura
+share/examples/chemtool/Neu1
+share/examples/chemtool/Neu2
share/examples/chemtool/amp.cht
share/examples/chemtool/breve.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
share/examples/chemtool/example4
share/examples/chemtool/example5
share/examples/chemtool/example7
+share/examples/chemtool/indigo
+share/examples/chemtool/label
+share/examples/chemtool/pteridin
share/examples/chemtool/tcdd.cht
+share/locale/cs/LC_MESSAGES/chemtool.mo
+share/locale/de/LC_MESSAGES/chemtool.mo
@dirrm share/examples/chemtool
@dirrm share/doc/chemtool