4 files changed, 80 insertions, 78 deletions

diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 9701251fa2ed..154efd7a163b 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -1,22 +1,21 @@
-# New ports collection makefile for:	tkrat
-# Version required:	1.1
-# Date created:		24 October 1997
-# Whom:			Bruce Gingery <bgingery@gtcs.com>
+# New ports collection makefile for:	tkrat2
+# Version required:	2.0b7
+# Date created:		9 November 1999
+# Whom:			Stephen J. Roznowski <sjr@home.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkrat-1.2
+DISTNAME=	tkrat-2.0b7
 CATEGORIES=	mail tk82
 MASTER_SITES=	ftp://ftp.md.chalmers.se/pub/tkrat/ \
 		ftp://ftp.sunet.se/pub/unix/mail/tkrat/
 
-MAINTAINER=	appleseed@his.com
+MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	tclsh8.2:${PORTSDIR}/lang/tcl82
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
-		tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
-		c-client4.7:${PORTSDIR}/mail/imap-uw
+LIB_DEPENDS=	tcl82:${PORTSDIR}/lang/tcl82 \
+		tk82:${PORTSDIR}/x11-toolkits/tk82 \
+		c-client4.5:${PORTSDIR}/mail/imap-uw
 
 GNU_CONFIGURE=	yes
 
@@ -38,6 +37,5 @@ post-install:
 .endif
 	@${MKDIR} ${PREFIX}/lib/ratatosk
 	${INSTALL_DATA} ${FILESDIR}/ratatoskrc ${PREFIX}/lib/ratatosk
-	#${CHMOD} ugo+wt /var/mail
 
 .include <bsd.port.mk>
diff --git a/mail/tkrat2/distinfo b/mail/tkrat2/distinfo
index 632847d0341c..f440743b5cc3 100644
--- a/mail/tkrat2/distinfo
+++ b/mail/tkrat2/distinfo
@@ -1 +1 @@
-MD5 (tkrat-1.2.tar.gz) = 125e7874aa0c669ef79b1efbeef92b3a
+MD5 (tkrat-2.0b7.tar.gz) = 3c3d7453ba1e26644fe735798c6bc102
diff --git a/mail/tkrat2/files/patch-aa b/mail/tkrat2/files/patch-aa
index 8a2cb799cc42..cc79b1c7f609 100644
--- a/mail/tkrat2/files/patch-aa
+++ b/mail/tkrat2/files/patch-aa
@@ -1,22 +1,11 @@
---- configure.orig	Tue Jan 13 14:42:59 1998
-+++ configure	Sun Nov 28 21:15:24 1999
-@@ -875,8 +875,8 @@
- test -n "$AWK" && break
- done
- 
--# Extract the first word of "tclsh8.0", so it can be a program name with args.
--set dummy tclsh8.0; ac_word=$2
-+# Extract the first word of "tclsh8.2", so it can be a program name with args.
-+set dummy tclsh8.2; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:882: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
-@@ -1994,7 +1994,7 @@
+--- configure.orig	Tue Nov  9 21:19:42 1999
++++ configure	Tue Nov  9 21:21:04 1999
+@@ -1824,7 +1824,7 @@
  for i in $tcl_dirs ; do
      tcl_include_dirs="$tcl_include_dirs $i/include"
  done
--tcl_include_dirs="$tcl_include_dirs /usr/include/tcl /usr/include"
-+tcl_include_dirs="$tcl_include_dirs /usr/local/include/tcl8.2 /usr/local/include/tk8.2 /usr/include"
+-tcl_include_dirs="$tcl_with_include $tcl_include_dirs /usr/include/tcl /usr/include"
++tcl_include_dirs="$tcl_with_include $tcl_include_dirs /usr/local/include/tcl8.2 /usr/local/include/tk8.2 /usr/include/tcl /usr/include"
  tcl_dir=0
  for i in $tcl_include_dirs ; do
      if test -r $i/tcl.h ; then
diff --git a/mail/tkrat2/pkg-plist b/mail/tkrat2/pkg-plist
index a0af768bd8c4..c7211a7c3b65 100644
--- a/mail/tkrat2/pkg-plist
+++ b/mail/tkrat2/pkg-plist
@@ -1,58 +1,73 @@
 bin/tkrat
-lib/tkratlib/alias.tcl
-lib/tkratlib/balloon.tcl
-lib/tkratlib/compose.tcl
-lib/tkratlib/convert.tcl
-lib/tkratlib/dbase.tcl
-lib/tkratlib/dsn.tcl
-lib/tkratlib/exp.tcl
-lib/tkratlib/fileselector.tcl
-lib/tkratlib/folder.tcl
-lib/tkratlib/font.tcl
-lib/tkratlib/help.tcl
-lib/tkratlib/info.tcl
-lib/tkratlib/keydef.tcl
-lib/tkratlib/languages.tcl
-lib/tkratlib/options.tcl
-lib/tkratlib/pgp.tcl
-lib/tkratlib/preferences.tcl
-lib/tkratlib/print.tcl
-lib/tkratlib/show.tcl
-lib/tkratlib/source.tcl
-lib/tkratlib/tclIndex
-lib/tkratlib/text_balText_en.tcl
-lib/tkratlib/text_balText_it.tcl
-lib/tkratlib/text_balText_sv.tcl
-lib/tkratlib/text_changes_en.tcl
-lib/tkratlib/text_changes_it.tcl
-lib/tkratlib/text_changes_sv.tcl
-lib/tkratlib/text_help_en.tcl
-lib/tkratlib/text_help_it.tcl
-lib/tkratlib/text_help_sv.tcl
-lib/tkratlib/text_t_en.tcl
-lib/tkratlib/text_t_it.tcl
-lib/tkratlib/text_t_sv.tcl
-lib/tkratlib/tkrat
-lib/tkratlib/tkrat.exec
-lib/tkratlib/tkrat.xbm
-lib/tkratlib/tkrat.xpm
-lib/tkratlib/tkrat_small.xbm
-lib/tkratlib/tkrat_smallmask.xbm
-lib/tkratlib/tkratmask.xbm
-lib/tkratlib/vfolder.tcl
-lib/tkratlib/vfolderdef.tcl
-lib/tkratlib/watcher.tcl
+lib/ratatosk/pkgIndex.tcl
+lib/ratatosk/ratatosk2.0.so
 lib/ratatosk/ratatoskrc
-lib/tkratlib/text_balText_fr.tcl
-lib/tkratlib/text_changes_fr.tcl
-lib/tkratlib/text_help_fr.tcl
-lib/tkratlib/text_t_fr.tcl
 share/doc/tkrat/CONFIGURATION
 share/doc/tkrat/COPYRIGHT
 share/doc/tkrat/README
 share/doc/tkrat/interface
-share/doc/tkrat/userprocs
 share/doc/tkrat/userproc.example
-@dirrm lib/tkratlib
-@dirrm share/doc/tkrat
+share/doc/tkrat/userprocs
+share/tkrat2.0/alias.tcl
+share/tkrat2.0/client.tcl
+share/tkrat2.0/compose.tcl
+share/tkrat2.0/convert.tcl
+share/tkrat2.0/dbase.tcl
+share/tkrat2.0/dialog.tcl
+share/tkrat2.0/dsn.tcl
+share/tkrat2.0/exp.tcl
+share/tkrat2.0/folder.tcl
+share/tkrat2.0/font.tcl
+share/tkrat2.0/help.tcl
+share/tkrat2.0/info.tcl
+share/tkrat2.0/keydef.tcl
+share/tkrat2.0/languages.tcl
+share/tkrat2.0/options.tcl
+share/tkrat2.0/pgp.tcl
+share/tkrat2.0/preferences.tcl
+share/tkrat2.0/print.tcl
+share/tkrat2.0/show.tcl
+share/tkrat2.0/source.tcl
+share/tkrat2.0/start.tcl
+share/tkrat2.0/tclIndex
+share/tkrat2.0/text_balText_en.tcl
+share/tkrat2.0/text_balText_fr.tcl
+share/tkrat2.0/text_balText_it.tcl
+share/tkrat2.0/text_balText_sr.tcl
+share/tkrat2.0/text_balText_sv.tcl
+share/tkrat2.0/text_changes_en.tcl
+share/tkrat2.0/text_changes_fr.tcl
+share/tkrat2.0/text_changes_it.tcl
+share/tkrat2.0/text_changes_sr.tcl
+share/tkrat2.0/text_changes_sv.tcl
+share/tkrat2.0/text_help_en.tcl
+share/tkrat2.0/text_help_fr.tcl
+share/tkrat2.0/text_help_it.tcl
+share/tkrat2.0/text_help_sr.tcl
+share/tkrat2.0/text_help_sv.tcl
+share/tkrat2.0/text_t_en.tcl
+share/tkrat2.0/text_t_fr.tcl
+share/tkrat2.0/text_t_it.tcl
+share/tkrat2.0/text_t_sr.tcl
+share/tkrat2.0/text_t_sv.tcl
+share/tkrat2.0/tkrat.xbm
+share/tkrat2.0/tkrat.xpm
+share/tkrat2.0/tkrat_small.xbm
+share/tkrat2.0/tkrat_smallmask.xbm
+share/tkrat2.0/tkratmask.xbm
+share/tkrat2.0/util/blt_busy1.0.so
+share/tkrat2.0/util/pkgIndex.tcl
+share/tkrat2.0/util/rat_balloon.tcl
+share/tkrat2.0/util/rat_ed.tcl
+share/tkrat2.0/util/rat_edit.tcl
+share/tkrat2.0/util/rat_fbox.tcl
+share/tkrat2.0/util/rat_list.tcl
+share/tkrat2.0/util/rat_tabbed.tcl
+share/tkrat2.0/util/rat_textlist.tcl
+share/tkrat2.0/vfolder.tcl
+share/tkrat2.0/vfolderdef.tcl
+share/tkrat2.0/watcher.tcl
+share/tkrat2.0/winctl.tcl
+@dirrm share/tkrat2.0/util
+@dirrm share/tkrat2.0
 @dirrm lib/ratatosk