Update to 1.5.

Loosely based on

PR:		41652
Submitted by:	Nakata Maho <chat95@mbox.kyoto-inet.or.jp>

13 files changed, 163 insertions, 57 deletions

diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 06d10bd29bd7..b9f7704848d1 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # New ports collection makefile for:	chemtool
 # Date created:			Mar 31, 2001
 # Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
@@ -6,16 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	chemtool
-PORTVERSION=	1.3.1
+PORTVERSION=	1.5
 CATEGORIES=	science
-MASTER_SITES=	http://www.uni-ulm.de/~s_tvolk/chemtool/src/
+MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 
 MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
-MAN1=	chemtool.1
+MAN1=	chemtool.1 cht.1
+
+post-install:
+	${MKDIR} ${PREFIX}/share/examples/chemtool
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/chemtool
 
 .include <bsd.port.mk>
diff --git a/science/chemtool/distinfo b/science/chemtool/distinfo
index 5ee3a1d2feed..8c165777f9d1 100644
--- a/science/chemtool/distinfo
+++ b/science/chemtool/distinfo
@@ -1 +1 @@
-MD5 (chemtool-1.3.1.tar.gz) = 1b61a19a9757292b9b9a827b798f0320
+MD5 (chemtool-1.5.tar.gz) = 093b68e032b2c5611c2f83315764bd40
diff --git a/science/chemtool/files/patch-Makefile b/science/chemtool/files/patch-Makefile
deleted file mode 100644
index 5a3986e3c48b..000000000000
--- a/science/chemtool/files/patch-Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-$FreeBSD$
-
---- Makefile.orig	Thu May  3 08:31:00 2001
-+++ Makefile	Fri Sep 21 23:15:06 2001
-@@ -1,7 +1,5 @@
--PREFIX=/usr/local
--LOCALEDIR=/usr/share/locale
--CFLAGS=-O2 -Wall `gtk-config --cflags` # -DDISABLE_NLS
--CC=gcc
-+LOCALEDIR=${PREFIX}/share/locale
-+CFLAGS+=`${GTK_CONFIG} --cflags` # -DDISABLE_NLS
- CP=/bin/cp
- RM=/bin/rm -f
- 
-@@ -9,7 +7,7 @@
- OBJS = main.o chemproc.o graph.o draw.o inout.o 
- 
- 
--SYS_LIBRARIES = `gtk-config --libs` -lm
-+SYS_LIBRARIES = `${GTK_CONFIG} --libs` -lm
- 
- all: chemtool cht
- 
-@@ -25,9 +23,12 @@
- #	${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 \
-+		mkdir -p ${LOCALEDIR}/$$L/LC_MESSAGES; \
-+		${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/science/chemtool/files/patch-Makefile.in b/science/chemtool/files/patch-Makefile.in
new file mode 100644
index 000000000000..7125b80875e9
--- /dev/null
+++ b/science/chemtool/files/patch-Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Thu Apr 11 21:41:37 2002
++++ Makefile.in	Fri Aug 30 01:25:01 2002
+@@ -5,7 +5,7 @@
+ mandir=@mandir@
+ kdedir=@kdemimedir@
+ gnomedir=@gnomemimedir@
+-CFLAGS=-O2 -Wall -Wunused -Wuninitialized -I. `gtk-config --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\"
++CFLAGS= @CFLAGS@ -I. `${GTK_CONFIG} --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\"
+ 
+ CC=@CC@
+ CP=/bin/cp
+@@ -16,7 +16,7 @@
+ SRCS = main.c chemproc.c graph.c draw.c inout.c gtkfilesel.c undo.c 
+ OBJS = main.o chemproc.o graph.o draw.o inout.o gtkfilesel.o undo.o
+ 
+-SYS_LIBRARIES = `gtk-config --libs` -lm
++SYS_LIBRARIES = `${GTK_CONFIG} --libs` -lm
+ 
+ all: chemtool cht
+ 
diff --git a/science/chemtool/files/patch-ct.h b/science/chemtool/files/patch-ct.h
new file mode 100644
index 000000000000..40368c614009
--- /dev/null
+++ b/science/chemtool/files/patch-ct.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- ct.h.orig	Fri Aug 30 00:57:10 2002
++++ ct.h	Fri Aug 30 00:58:22 2002
+@@ -1,7 +1,6 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+-#undef __GNUC__
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
diff --git a/science/chemtool/files/patch-ct1.h b/science/chemtool/files/patch-ct1.h
new file mode 100644
index 000000000000..f0aa7bcadb63
--- /dev/null
+++ b/science/chemtool/files/patch-ct1.h
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- ct1.h.orig	Sat Aug 31 01:07:06 2002
++++ ct1.h	Sat Aug 31 01:07:56 2002
+@@ -224,8 +224,8 @@
+ extern void check_fig2dev(void);
+ 
+ #ifdef LIBUNDO
+-extern int undo_free();
+-extern int undo_malloc();
++extern void undo_free();
++extern void *undo_malloc();
+ extern int undo_snapshot();
+ #endif
+ 
diff --git a/science/chemtool/files/patch-src-cht::Makefile b/science/chemtool/files/patch-src-cht::Makefile
deleted file mode 100644
index 70da66702f59..000000000000
--- a/science/chemtool/files/patch-src-cht::Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- src-cht/Makefile.orig	Wed Feb  7 03:38:54 2001
-+++ src-cht/Makefile	Sat Apr 14 02:13:38 2001
-@@ -1,4 +1,4 @@
- default: cht
- 
- cht:	cht-1.7.c
--	gcc -O cht-1.7.c -lm -o cht
-+	${CC} ${CFLAGS} cht-1.7.c -lm -o cht
diff --git a/science/chemtool/files/patch-src-cht_Makefile.in b/science/chemtool/files/patch-src-cht_Makefile.in
new file mode 100644
index 000000000000..3760a2002085
--- /dev/null
+++ b/science/chemtool/files/patch-src-cht_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src-cht/Makefile.in.orig	Fri Aug 30 01:23:49 2002
++++ src-cht/Makefile.in	Fri Aug 30 01:24:27 2002
+@@ -1,4 +1,7 @@
++CC=@CC@
++CFLAGS=@CFLAGS@
++
+ default: cht
+ 
+ cht:	cht-2.1.c
+-	gcc -O cht-2.1.c -o cht
++	$(CC) $(CFLAGS) -o cht cht-2.1.c
diff --git a/science/chemtool/files/patch-src-cht_cht-2.1.c b/science/chemtool/files/patch-src-cht_cht-2.1.c
new file mode 100644
index 000000000000..e8b486678f73
--- /dev/null
+++ b/science/chemtool/files/patch-src-cht_cht-2.1.c
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- src-cht/cht-2.1.c.orig	Fri Aug 30 01:25:46 2002
++++ src-cht/cht-2.1.c	Fri Aug 30 01:31:51 2002
+@@ -1431,7 +1431,7 @@
+ {
+ #ifndef NO_TIME
+     struct tm *tm;
+-    long clock;
++    time_t clock;
+ 
+     time(&clock);
+     tm = localtime(&clock);
+@@ -1449,7 +1449,7 @@
+ Void VAXdate(s)
+ char *s;
+ {
+-    long clock;
++    time_t clock;
+     char *c;
+     int i;
+     static int where[] = {8, 9, 0, 4, 5, 6, 0, 20, 21, 22, 23};
+@@ -1465,7 +1465,7 @@
+ Void VAXtime(s)
+ char *s;
+ {
+-    long clock;
++    time_t clock;
+     char *c;
+     int i;
+ 
diff --git a/science/chemtool/files/patch-undo.c b/science/chemtool/files/patch-undo.c
new file mode 100644
index 000000000000..ff8442f1c072
--- /dev/null
+++ b/science/chemtool/files/patch-undo.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- undo.c.orig	Sat Mar  9 17:27:32 2002
++++ undo.c	Fri Aug 30 00:12:23 2002
+@@ -61,7 +61,7 @@
+ #define MAP_NEW_ANON_AT_FLAGS(pos, size, flags) \
+             (mmap((pos), (size), \
+ 			      PROT_READ | PROT_WRITE | PROT_EXEC, \
+-				  MAP_PRIVATE | MAP_ANONYMOUS | (flags), 0, 0))
++				  MAP_PRIVATE | MAP_ANON | (flags), -1, 0))
+ #define MAP_NEW_ANON(size) MAP_NEW_ANON_AT_FLAGS(0, (size), 0)
+ #define MAP_NEW_ANON_AT(pos, size) \
+             MAP_NEW_ANON_AT_FLAGS((pos), (size), MAP_FIXED)
diff --git a/science/chemtool/pkg-comment b/science/chemtool/pkg-comment
index 6c1ecaa57bc0..366220f109cd 100644
--- a/science/chemtool/pkg-comment
+++ b/science/chemtool/pkg-comment
@@ -1 +1 @@
-Drawing organic molecules easily and store them
+Draw organic molecules easily and store them
diff --git a/science/chemtool/pkg-descr b/science/chemtool/pkg-descr
index 28896e514610..45636f9566f9 100644
--- a/science/chemtool/pkg-descr
+++ b/science/chemtool/pkg-descr
@@ -1,4 +1,4 @@
-Chemtool is a program for drawing organic molecules easily and store them as
-a X bitmap file.
+Chemtool is a program for drawing organic molecules easily and storing
+them as an X bitmap file.
 
-WWW: http://www.uni-ulm.de/~s_tvolk/chemtool.html
+WWW: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
diff --git a/science/chemtool/pkg-plist b/science/chemtool/pkg-plist
index 624a46fbc3a7..877a78c2bf0e 100644
--- a/science/chemtool/pkg-plist
+++ b/science/chemtool/pkg-plist
@@ -1,5 +1,40 @@
+@comment $FreeBSD$
 bin/chemtool
 bin/cht
+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/Neu2
+share/examples/chemtool/amine.mol
+share/examples/chemtool/bcarotin.pdb
+share/examples/chemtool/breve.cht
+share/examples/chemtool/breve.mol
+share/examples/chemtool/byrostatin1.cht
+share/examples/chemtool/camphor
+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/indigo
+share/examples/chemtool/kdo
+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/pt_BR/LC_MESSAGES/chemtool.mo
 share/locale/ru/LC_MESSAGES/chemtool.mo
+@dirrm share/examples/chemtool