6 files changed, 42 insertions, 94 deletions

diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 65a40fce8bc0..ac04d33fdd78 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	chemtool
-PORTVERSION=	1.6
-PORTREVISION=	2
+PORTVERSION=	1.6.3
 CATEGORIES=	science
 MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 
@@ -16,13 +15,13 @@ COMMENT=	Draw organic molecules easily and store them
 LIB_DEPENDS=	EMF.1:${PORTSDIR}/graphics/libemf
 RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
 
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS+="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-emf=yes
+CONFIGURE_ARGS=	--enable-emf=yes --with-localedir=${PREFIX}
 
 MAN1=	chemtool.1 cht.1
 
diff --git a/science/chemtool/distinfo b/science/chemtool/distinfo
index 881e4f1b010a..9935db0e2264 100644
--- a/science/chemtool/distinfo
+++ b/science/chemtool/distinfo
@@ -1,2 +1,2 @@
-MD5 (chemtool-1.6.tar.gz) = 1b7a1bde89517ef8a1b4a566bfbd9b3f
-SIZE (chemtool-1.6.tar.gz) = 358695
+MD5 (chemtool-1.6.3.tar.gz) = 054b3e737781c5cf09967444d218ae73
+SIZE (chemtool-1.6.3.tar.gz) = 400772
diff --git a/science/chemtool/files/patch-Makefile.in b/science/chemtool/files/patch-Makefile.in
deleted file mode 100644
index 527f9f473520..000000000000
--- a/science/chemtool/files/patch-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Sun May 11 22:02:15 2003
-+++ Makefile.in	Sun Jul 20 22:49:21 2003
-@@ -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 undo.c @MYGTKSRCS@
- OBJS = main.o chemproc.o graph.o draw.o inout.o undo.o @MYGTKOBJS@
- 
--SYS_LIBRARIES = `gtk-config --libs` @EMFLIBS@ -lm
-+SYS_LIBRARIES = `${GTK_CONFIG} --libs` @EMFLIBS@ -lm
-  
- 
- all: chemtool cht
diff --git a/science/chemtool/files/patch-ct.h b/science/chemtool/files/patch-ct.h
deleted file mode 100644
index 40368c614009..000000000000
--- a/science/chemtool/files/patch-ct.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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
deleted file mode 100644
index f0aa7bcadb63..000000000000
--- a/science/chemtool/files/patch-ct1.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$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/pkg-plist b/science/chemtool/pkg-plist
index 1a2f68a0d348..32565b697a84 100644
--- a/science/chemtool/pkg-plist
+++ b/science/chemtool/pkg-plist
@@ -1,44 +1,45 @@
-@comment $FreeBSD$
 bin/chemtool
 bin/cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/14263232.mol
-%%PORTDOCS%%%%EXAMPLESDIR%%/AMP.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/Adenosine.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dehydrotubifolin.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/G-host.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/Indolizomycin.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/Lepicidin-A-Aglycon.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/Neu2
-%%PORTDOCS%%%%EXAMPLESDIR%%/amine.mol
-%%PORTDOCS%%%%EXAMPLESDIR%%/anabsinthin
-%%PORTDOCS%%%%EXAMPLESDIR%%/atp
-%%PORTDOCS%%%%EXAMPLESDIR%%/bcarotin.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/breve.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/breve.mol
-%%PORTDOCS%%%%EXAMPLESDIR%%/bufotalin
-%%PORTDOCS%%%%EXAMPLESDIR%%/byrostatin1.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/c70.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/camphor
-%%PORTDOCS%%%%EXAMPLESDIR%%/chlorophyll
-%%PORTDOCS%%%%EXAMPLESDIR%%/claisen.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/dodecahedran.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/indigo
-%%PORTDOCS%%%%EXAMPLESDIR%%/kdo
-%%PORTDOCS%%%%EXAMPLESDIR%%/krebs.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/labeltest
-%%PORTDOCS%%%%EXAMPLESDIR%%/pagodan.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/penicillin_v.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/pteridin
-%%PORTDOCS%%%%EXAMPLESDIR%%/reaction.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/rutamycin_b.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/tbutylazulene
-%%PORTDOCS%%%%EXAMPLESDIR%%/tcdd.cht
-%%PORTDOCS%%%%EXAMPLESDIR%%/tetracyclin
-%%PORTDOCS%%%%EXAMPLESDIR%%/viagra.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/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.cht
+share/examples/chemtool/byrostatin1.cht
+share/examples/chemtool/c70.cht
+share/examples/chemtool/camphor.cht
+share/examples/chemtool/chlorophyll.cht
+share/examples/chemtool/claisen.cht
+share/examples/chemtool/dodecahedran.cht
+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.cht
+share/examples/chemtool/reaction.cht
+share/examples/chemtool/rutamycin_b.cht
+share/examples/chemtool/tbutylazulene.cht
+share/examples/chemtool/tcdd.cht
+share/examples/chemtool/tetracyclin.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
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm share/examples/chemtool
+