Use TCL/TK 8.3 (with TCL_STUBS). I did not bother with autodetection of

the need for stubs. They are  needed with currect TCL port, regretfully.
When the need goes away (hopefully), I'll remove the files/patch-stubs.

Actually  USE the  blasted c-client4  instead of  merely (and  bogusly!)
LIB_DEPEND-ing  on it.  The  port continued  to build  and  use its  own
version (based  on imap-4.7 from  October 1999). Don't even  extract the
imap subdir...

5 files changed, 125 insertions, 8 deletions

diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 68e8281089d3..fd56dfc97c3a 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -7,22 +7,24 @@
 
 PORTNAME=	tkrat
 PORTVERSION=	2.0.1
-CATEGORIES=	mail tk82
+CATEGORIES=	mail tk83
 MASTER_SITES=	ftp://ftp.md.chalmers.se/pub/tkrat/ \
 		ftp://ftp.sunet.se/pub/unix/mail/tkrat/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	tcl82:${PORTSDIR}/lang/tcl82 \
-		tk82:${PORTSDIR}/x11-toolkits/tk82 \
+LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83 \
+		tk83:${PORTSDIR}/x11-toolkits/tk83 \
 		c-client4.8:${PORTSDIR}/mail/cclient
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--with-tcl-config=${PREFIX}/lib/tcl8.2 \
-		--with-tk-config=${PREFIX}/lib/tk8.2 \
-		--with-tcl-include=${PREFIX}/include/tcl8.2 \
-		--with-tk-include=${PREFIX}/include/tk8.2
+CONFIGURE_ARGS=	--with-tcl-config=${PREFIX}/lib/tcl8.3 \
+		--with-tk-config=${PREFIX}/lib/tk8.3 \
+		--with-tcl-include=${PREFIX}/include/tcl8.3 \
+		--with-tk-include=${PREFIX}/include/tk8.3
+MAKE_ARGS+=	-j2 -B
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude '*/imap/*'
 
 DOCFILES=	CONFIGURATION COPYRIGHT README doc/interface doc/userprocs \
 		doc/userproc.example
diff --git a/mail/tkrat2/files/patch-aa b/mail/tkrat2/files/patch-aa
index 7cf40c3864bc..612a4eb810d8 100644
--- a/mail/tkrat2/files/patch-aa
+++ b/mail/tkrat2/files/patch-aa
@@ -5,7 +5,7 @@
      tcl_include_dirs="$tcl_include_dirs $i/include"
  done
 -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_include_dirs="$tcl_with_include $tcl_include_dirs /usr/local/include/tcl8.3 /usr/local/include/tk8.3 /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/files/patch-imap b/mail/tkrat2/files/patch-imap
new file mode 100644
index 000000000000..732e1399a7a6
--- /dev/null
+++ b/mail/tkrat2/files/patch-imap
@@ -0,0 +1,79 @@
+This file  contains the  sequences of  patches that  make TkRat  use the
+standard  c-client library  from instead  of building  and using  it own
+version (based on the now ancient version).
+
+This involved some Makefile hackery,  but most importantly, teaching the
+code in  ratStdMessage.c to not look  for the ``optional'' parts  of the
+ENVELOPE structure,  but take the type  and subtype of the  message from
+the BODY directly.
+
+This changes allow to use the  latest versions of the _standard_ UW-UMAP
+(and they  now have goodies  like SSL support)  and save some  space and
+invocation time by using the shared lib.
+
+	-mi
+
+--- Makefile.in	Fri May 12 16:17:06 2000
++++ Makefile.in	Sun Apr  8 15:56:19 2001
+@@ -19,8 +19,2 @@
+ build:
+-	-cd imap; \
+-	if test "`cat OSTYPE 2>/dev/null`" = "${OSTYPE}" ; then \
+-	    ${MAKE} EXTRACFLAGS="${EXTRACFLAGS}"; \
+-	else \
+-	    ${MAKE} ${OSTYPE} EXTRACFLAGS="${EXTRACFLAGS}"; \
+-	fi
+ 	cd lib; ${MAKE}
+@@ -43,3 +37,2 @@
+ clean:
+-	cd imap; ${MAKE} clean
+ 	cd lib; ${MAKE} clean
+--- lib/Makefile.in	Mon May  1 16:31:01 2000
++++ lib/Makefile.in	Sun Apr  8 16:01:07 2001
+@@ -30,3 +30,3 @@
+ # Pointer to the imap c-client directory
+-      C_CLIENT = ${TOP_DIR}/imap/c-client
++      C_CLIENT = ${prefix}/include/c-client
+ 
+@@ -65,3 +65,3 @@
+ 	 ${SHLIB_CFLAGS} -DVERSION=\"${VERSION}\"
+-C_CLIENT_LIB = ${C_CLIENT}/c-client.a
++C_CLIENT_LIB = -L${prefix}/lib -lc-client4
+ RATLIB = ratatosk${RATLIB_SUFFIX}
+@@ -81,3 +81,3 @@
+ 
+-${RATLIB}: ${OBJ} ${C_CLIENT_LIB}
++${RATLIB}: ${OBJ}
+ 	${SHLIB_LD} -o ${RATLIB} ${OBJ} ${C_CLIENT_LIB} $(EXTRA_LIBS) ${SHLIB_LD_LIBS}
+--- lib/ratDisFolder.c	Fri Jan 12 11:23:20 2001
++++ lib/ratDisFolder.c	Sun Apr  8 16:26:44 2001
+@@ -40,1 +40,0 @@
+-#include "mbx.h"
+--- lib/ratStdMessage.c	Tue Dec 26 05:27:42 2000
++++ lib/ratStdMessage.c	Sun Apr  8 17:44:07 2001
+@@ -584,18 +584,10 @@
+ 	case RAT_FOLDER_TYPE:
+-	    if (stdMsgPtr->envPtr->optional.subtype) {
+-		oPtr = Tcl_NewStringObj(
+-			body_types[stdMsgPtr->envPtr->optional.type], -1);
+-		Tcl_AppendStringsToObj(oPtr, "/",
+-				       stdMsgPtr->envPtr->optional.subtype,
+-				       NULL);
+-	    } else {
+-		if (!stdMsgPtr->bodyPtr) {
+-		    stdMsgPtr->envPtr = mail_fetchstructure_full(
+-			    stdMsgPtr->stream, msgPtr->msgNo+1,
+-			    &stdMsgPtr->bodyPtr, NIL);
+-		}
+-		oPtr =Tcl_NewStringObj(body_types[stdMsgPtr->bodyPtr->type],-1);
+-		Tcl_AppendStringsToObj(oPtr, "/",
+-				       stdMsgPtr->bodyPtr->subtype, NULL);
++	    if (!stdMsgPtr->bodyPtr) {
++		stdMsgPtr->envPtr = mail_fetchstructure_full(
++		    stdMsgPtr->stream, msgPtr->msgNo+1,
++		    &stdMsgPtr->bodyPtr, NIL);
+ 	    }
++	    oPtr = Tcl_NewStringObj(body_types[stdMsgPtr->bodyPtr->type], -1);
++	    Tcl_AppendStringsToObj(oPtr, "/", stdMsgPtr->bodyPtr->subtype,
++			NULL);
+ 	    break;
diff --git a/mail/tkrat2/files/patch-puts b/mail/tkrat2/files/patch-puts
new file mode 100644
index 000000000000..d842b74b907d
--- /dev/null
+++ b/mail/tkrat2/files/patch-puts
@@ -0,0 +1,16 @@
+This file fixes the pkgIndex.tcl generating code. If the pkgIndex.tcl
+is generated properly, the bug is never triggered, which is why this
+went unnoticed for so long. But there is no ``outs'' command in Tcl --
+this resulted in a double error, and you were not be able to see why
+the pkgIndex generation failed.
+
+	-mi
+
+--- util/Makefile.in	Mon May  1 16:31:01 2000
++++ util/Makefile.in	Sun Apr  8 17:17:12 2001
+@@ -91 +91 @@
+-		  {outs \$$error; exit 1}" | ${TCLSH}
++		  {puts \$$error; exit 1}" | ${TCLSH}
+@@ -122 +122 @@
+-		  {outs \$$error; exit 1}" | ${TCLSH}
++		  {puts \$$error; exit 1}" | ${TCLSH}
diff --git a/mail/tkrat2/files/patch-stubs b/mail/tkrat2/files/patch-stubs
new file mode 100644
index 000000000000..23db747b2c83
--- /dev/null
+++ b/mail/tkrat2/files/patch-stubs
@@ -0,0 +1,20 @@
+Use the TCL_STUBS when compiling and linking loadable TCL modules.
+The need for stubs should be detectable by configure, I guess, but
+I'm lazy today...
+
+	-mi
+
+--- lib/Makefile.in	Mon May  1 16:31:01 2000
++++ lib/Makefile.in	Sun Apr  8 16:58:09 2001
+@@ -68,2 +68,4 @@
+ DUMMYLIB = ratDummy${SHLIB_SUFFIX}
++CFLAGS+= -DUSE_TCL_STUBS
++SHLIB_LD_LIBS+=-L${prefix}/lib -ltclstub83
+ 
+--- util/Makefile.in	Mon May  1 16:31:01 2000
++++ util/Makefile.in	Sun Apr  8 17:19:49 2001
+@@ -69,2 +69,4 @@
+ BUSYLIB = blt_busy${BUSYLIB_SUFFIX}
++CFLAGS+= -DUSE_TCL_STUBS
++SHLIB_LD_LIBS+=-L${prefix}/lib -ltclstub83
+