Explicitly include <sys/types.h> and <unistd.h> to fix the breakage on

recent -current. Fix warnings -- on x86, at least, the package now
builds with ``-Wall -Werror''.

10 files changed, 279 insertions, 45 deletions

diff --git a/devel/tcl-trf/files/patch-configure b/devel/tcl-trf/files/patch-configure
index d93f84590cd..03210cc3d20 100644
--- a/devel/tcl-trf/files/patch-configure
+++ b/devel/tcl-trf/files/patch-configure
@@ -1,5 +1,12 @@
 --- configure	Tue Aug 21 01:52:30 2001
 +++ configure	Fri Feb  8 11:52:30 2002
+@@ -1487,5 +1487,5 @@
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 @@ -2658,7 +2658,7 @@
  
  if test "${SHARED_BUILD}" = "1" ; then
diff --git a/devel/tcl-trf/files/patch-crypt b/devel/tcl-trf/files/patch-crypt
index eaeeb2053f2..2e88d755862 100644
--- a/devel/tcl-trf/files/patch-crypt
+++ b/devel/tcl-trf/files/patch-crypt
@@ -1,5 +1,11 @@
 --- generic/crypt.c	Sat Nov 18 17:42:31 2000
 +++ generic/crypt.c	Fri Feb  8 11:59:47 2002
+@@ -29,4 +29,5 @@
+ 
+ #include "loadman.h"
++#include <unistd.h>
+ 
+ static int
 @@ -112,4 +112,6 @@
   */
  
diff --git a/devel/tcl-trf/files/patch-haval b/devel/tcl-trf/files/patch-haval
index 9478732e95f..37f3a4d1bc9 100644
--- a/devel/tcl-trf/files/patch-haval
+++ b/devel/tcl-trf/files/patch-haval
@@ -1,18 +1,27 @@
 --- generic/haval.c	Wed Aug  9 15:13:17 2000
-+++ generic/haval.c	Fri Feb  8 11:07:48 2002
-@@ -59,8 +59,8 @@
++++ generic/haval.c	Fri Jul  9 16:25:39 2004
+@@ -46,8 +46,5 @@
+  */
+ 
+-static void MDHaval_Start     _ANSI_ARGS_ ((VOID* context));
+ static void MDHaval_Update    _ANSI_ARGS_ ((VOID* context, unsigned int character));
+-static void MDHaval_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
+-static void MDHaval_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+ 
+ /*
+@@ -59,8 +56,8 @@
    sizeof (CTX_TYPE),
    DIGEST_SIZE,
 -  MDHaval_Start,
-+  haval_start,
++  (Trf_MDStart *)haval_start,
    MDHaval_Update,
 -  MDHaval_UpdateBuf,
 -  MDHaval_Final,
-+  haval_hash,
-+  haval_end,
++  (Trf_MDUpdateBuf *)haval_hash,
++  (Trf_MDFinal *)haval_end,
    NULL
  };
-@@ -94,30 +94,4 @@
+@@ -94,30 +91,4 @@
   *------------------------------------------------------*
   *
 - *	MDHaval_Start --
@@ -43,7 +52,7 @@
 - *
   *	MDHaval_Update --
   *
-@@ -145,63 +119,2 @@
+@@ -145,63 +116,2 @@
    haval_hash ((CTX_TYPE*) context, &buf, 1);
  }
 -
diff --git a/devel/tcl-trf/files/patch-loadman b/devel/tcl-trf/files/patch-loadman
index 7a396f64031..952de7cb258 100644
--- a/devel/tcl-trf/files/patch-loadman
+++ b/devel/tcl-trf/files/patch-loadman
@@ -5,8 +5,10 @@ the OpenSSL library.
 
 --- generic/loadman.h	Fri Feb 15 14:49:06 2002
 +++ generic/loadman.h	Fri Feb 15 14:50:48 2002
-@@ -48,9 +48,5 @@
+@@ -48,9 +48,7 @@
  
++#include <sys/types.h>
++
  #ifdef HAVE_MD2_H
 -#   ifdef OPENSSL_SUB
 -#       include <openssl/md2.h>
diff --git a/devel/tcl-trf/files/patch-md2 b/devel/tcl-trf/files/patch-md2
index e78906317be..de2cfe05097 100644
--- a/devel/tcl-trf/files/patch-md2
+++ b/devel/tcl-trf/files/patch-md2
@@ -1,5 +1,5 @@
 --- generic/md2.c	Wed Aug  9 15:13:17 2000
-+++ generic/md2.c	Fri Feb 15 14:55:50 2002
++++ generic/md2.c	Fri Jul  9 16:36:33 2004
 @@ -30,13 +30,8 @@
  #include "loadman.h"
  
@@ -17,20 +17,30 @@
 +#define DIGEST_SIZE               16
  #define CTX_TYPE                  MD2_CTX
  
-@@ -59,9 +54,9 @@
+@@ -45,9 +40,6 @@
+  */
+ 
+-static void MDmd2_Start     _ANSI_ARGS_ ((VOID* context));
+ static void MDmd2_Update    _ANSI_ARGS_ ((VOID* context, unsigned int character));
+-static void MDmd2_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
+ static void MDmd2_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+-static int  MDmd2_Check     _ANSI_ARGS_ ((Tcl_Interp* interp));
+ 
+ /*
+@@ -59,9 +51,9 @@
    sizeof (CTX_TYPE),
    DIGEST_SIZE,
 -  MDmd2_Start,
-+  MD2Init,
++  (Trf_MDStart *)MD2Init,
    MDmd2_Update,
 -  MDmd2_UpdateBuf,
-+  MD2Update,
++  (Trf_MDUpdateBuf *)MD2Update,
    MDmd2_Final,
 -  MDmd2_Check
 +  NULL
  };
  
-@@ -94,30 +89,4 @@
+@@ -94,30 +86,4 @@
   *------------------------------------------------------*
   *
 - *	MDmd2_Start --
@@ -61,7 +71,7 @@
 - *
   *	MDmd2_Update --
   *
-@@ -143,33 +112,5 @@
+@@ -143,33 +109,5 @@
    unsigned char buf = character;
  
 -  md2f.update ((MD2_CTX*) context, &buf, 1);
@@ -96,7 +106,7 @@
 +  MD2Update ((MD2_CTX*) context, &buf, 1);
  }
  
-@@ -198,31 +139,4 @@
+@@ -198,31 +136,4 @@
  VOID* digest;
  {
 -  md2f.final ((unsigned char*) digest, (MD2_CTX*) context);
diff --git a/devel/tcl-trf/files/patch-md5dig b/devel/tcl-trf/files/patch-md5dig
index 557a90d7806..c109baf0346 100644
--- a/devel/tcl-trf/files/patch-md5dig
+++ b/devel/tcl-trf/files/patch-md5dig
@@ -1,5 +1,5 @@
 --- generic/md5dig.c	Wed Aug  9 15:13:17 2000
-+++ generic/md5dig.c	Fri Feb 15 00:41:42 2002
++++ generic/md5dig.c	Fri Jul  9 16:23:11 2004
 @@ -29,5 +29,5 @@
  
  #include "loadman.h"
@@ -15,20 +15,31 @@
 -
  #ifndef OTP
  #define DIGEST_SIZE               (16)
-@@ -72,9 +69,9 @@
+@@ -52,10 +49,6 @@
+  */
+ 
+-static void MDmd5_Start     _ANSI_ARGS_ ((VOID* context));
+ static void MDmd5_Update    _ANSI_ARGS_ ((VOID* context, unsigned int character));
+-static void MDmd5_UpdateBuf _ANSI_ARGS_ ((VOID* context,
+-				       unsigned char* buffer, int bufLen));
+ static void MDmd5_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+-static int  MDmd5_Check     _ANSI_ARGS_ ((Tcl_Interp* interp));
+ 
+ /*
+@@ -72,9 +65,9 @@
    sizeof (CTX_TYPE),
    DIGEST_SIZE,
 -  MDmd5_Start,
-+  MD5Init,
++  (Trf_MDStart *)MD5Init,
    MDmd5_Update,
 -  MDmd5_UpdateBuf,
-+  MD5Update,
++  (Trf_MDUpdateBuf *)MD5Update,
    MDmd5_Final,
 -  MDmd5_Check
 +  NULL,
  };
  
-@@ -111,38 +108,4 @@
+@@ -111,38 +104,4 @@
   *------------------------------------------------------*
   *
 - *	MDmd5_Start --
@@ -67,7 +78,7 @@
 - *
   *	MDmd5_Update --
   *
-@@ -168,52 +131,5 @@
+@@ -168,52 +127,5 @@
    unsigned char buf = character;
  
 -  /*  MD5Update ((MD5_CTX*) context, &buf, 1); */
@@ -121,7 +132,7 @@
 +  MD5Update ((MD5_CTX*) context, &buf, 1);
  }
  
-@@ -243,6 +159,5 @@
+@@ -243,6 +155,5 @@
  {
  #ifndef OTP
 -  /*  MD5Final ((unsigned char*) digest, (MD5_CTX*) context); */
@@ -129,14 +140,14 @@
 +  MD5Final ((unsigned char*) digest, (MD5_CTX*) context);
  #else
      int    i;
-@@ -250,5 +165,5 @@
+@@ -250,5 +161,5 @@
  
      /*    MD5Final ((unsigned char*) result, (MD5_CTX*) context);*/
 -    md5f.final (MD5_CTXP context, (unsigned char*) result);
 +    MD5Final ((unsigned char*) result, (MD5_CTX*) context);
  
      for (i = 0; i < 8; i++)
-@@ -265,54 +180,2 @@
+@@ -265,54 +176,2 @@
  #endif
  }
 -
diff --git a/devel/tcl-trf/files/patch-sha b/devel/tcl-trf/files/patch-sha
index 74979787b75..3b8ee2891f3 100644
--- a/devel/tcl-trf/files/patch-sha
+++ b/devel/tcl-trf/files/patch-sha
@@ -1,5 +1,5 @@
 --- generic/sha.c	Wed Aug  9 15:13:18 2000
-+++ generic/sha.c	Fri Feb  8 11:22:17 2002
++++ generic/sha.c	Fri Jul  9 16:28:57 2004
 @@ -30,34 +30,6 @@
  #include "transformInt.h"
  
@@ -37,7 +37,15 @@
 +#include <sha.h>
  
  /*
-@@ -76,9 +48,9 @@
+@@ -65,7 +37,5 @@
+  */
+ 
+-static void MDsha_Start     _ANSI_ARGS_ ((VOID* context));
+ static void MDsha_Update    _ANSI_ARGS_ ((VOID* context, unsigned int character));
+-static void MDsha_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
+ static void MDsha_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+ 
+@@ -76,9 +46,9 @@
  static Trf_MessageDigestDescription mdDescription = { /* THREADING: constant, read-only => safe */
    "sha",
 -  sizeof (CTX_TYPE),
@@ -45,13 +53,13 @@
 -  MDsha_Start,
 +  sizeof (SHA_CTX),
 +  SHA_DIGEST_LENGTH,
-+  SHA_Init,
++  (Trf_MDStart *)SHA_Init,
    MDsha_Update,
 -  MDsha_UpdateBuf,
-+  SHA_Update,
++  (Trf_MDUpdateBuf *)SHA_Update,
    MDsha_Final,
    NULL
-@@ -113,33 +85,4 @@
+@@ -113,33 +83,4 @@
   *------------------------------------------------------*
   *
 - *	MDsha_Start --
@@ -85,7 +93,7 @@
 - *
   *	MDsha_Update --
   *
-@@ -163,79 +106,7 @@
+@@ -163,79 +104,7 @@
  unsigned int   character;
  {
 -  sha_trf_info* s = (sha_trf_info*) context;
@@ -167,7 +175,7 @@
 +  SHA_Update ((SHA_CTX*)context, &buf, 1);
  }
  
-@@ -264,26 +135,4 @@
+@@ -264,26 +133,4 @@
  VOID* digest;
  {
 -  sha_trf_info* s = (sha_trf_info*) context;
diff --git a/devel/tcl-trf/files/patch-sha1 b/devel/tcl-trf/files/patch-sha1
index bbef27a6e70..47aa08530c7 100644
--- a/devel/tcl-trf/files/patch-sha1
+++ b/devel/tcl-trf/files/patch-sha1
@@ -1,5 +1,5 @@
 --- generic/sha1.c	Wed Aug  9 15:13:18 2000
-+++ generic/sha1.c	Fri Feb  8 10:39:46 2002
++++ generic/sha1.c	Fri Jul  9 16:41:33 2004
 @@ -30,4 +30,7 @@
  #include "loadman.h"
  
@@ -8,20 +8,30 @@
 +
  /*
   * Generator description
-@@ -67,9 +70,9 @@
+@@ -49,9 +52,6 @@
+  */
+ 
+-static void MDsha1_Start     _ANSI_ARGS_ ((VOID* context));
+ static void MDsha1_Update    _ANSI_ARGS_ ((VOID* context, unsigned int character));
+-static void MDsha1_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
+ static void MDsha1_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+-static int  MDsha1_Check     _ANSI_ARGS_ ((Tcl_Interp* interp));
+ 
+ /*
+@@ -67,9 +67,9 @@
    sizeof (CTX_TYPE),
    DIGEST_SIZE,
 -  MDsha1_Start,
-+  SHA1_Init,
++  (Trf_MDStart *)SHA1_Init,
    MDsha1_Update,
 -  MDsha1_UpdateBuf,
-+  SHA1_Update,
++  (Trf_MDUpdateBuf *)SHA1_Update,
    MDsha1_Final,
 -  MDsha1_Check
 +  NULL
  };
  
-@@ -106,30 +109,4 @@
+@@ -106,30 +106,4 @@
   *------------------------------------------------------*
   *
 - *	MDsha1_Start --
@@ -52,7 +62,7 @@
 - *
   *	MDsha1_Update --
   *
-@@ -155,33 +132,5 @@
+@@ -155,33 +129,5 @@
    unsigned char buf = character;
  
 -  sha1f.update ((SHA_CTX*) context, &buf, 1);
@@ -87,7 +97,7 @@
 +  SHA1_Update ((SHA_CTX*) context, &buf, 1);
  }
  
-@@ -211,9 +160,9 @@
+@@ -211,9 +157,9 @@
  {
  #ifndef OTP
 -  sha1f.final ((unsigned char*) digest, (SHA_CTX*) context);
@@ -99,7 +109,7 @@
 +    SHA1_Final ((unsigned char*) result, (SHA_CTX*) context);
  
      result[0] ^= result[2];
-@@ -224,30 +173,3 @@
+@@ -224,30 +170,3 @@
      memcpy ((VOID *) digest, (VOID *) result, DIGEST_SIZE);
  #endif
 -}
diff --git a/devel/tcl-trf/files/patch-warnings b/devel/tcl-trf/files/patch-warnings
new file mode 100644
index 00000000000..4613f0db751
--- /dev/null
+++ b/devel/tcl-trf/files/patch-warnings
@@ -0,0 +1,117 @@
+--- generic/init.c	Wed Aug  9 15:13:17 2000
++++ generic/init.c	Tue Apr  6 12:20:51 2004
+@@ -60,5 +60,5 @@
+ 
+ #ifdef USE_TCL_STUBS
+-  char* actualVersion;
++  const char* actualVersion;
+ 
+   actualVersion = Tcl_InitStubs(interp, "8.1", 0);
+--- generic/transformInt.h	Tue Aug 21 01:51:33 2001
++++ generic/transformInt.h	Tue Apr  6 12:27:33 2004
+@@ -678,4 +678,8 @@
+ #define TCL_STORAGE_CLASS DLLIMPORT
+ 
++#ifndef CONST84
++#    define CONST84
++#endif
++
+ #ifdef __cplusplus
+ }
+--- generic/registry.c	Tue Aug 21 01:51:33 2001
++++ generic/registry.c	Tue Apr  6 12:32:35 2004
+@@ -285,5 +285,5 @@
+ static int
+ TrfOutput _ANSI_ARGS_ ((ClientData instanceData,
+-			char*  buf, int toWrite,
++			CONST84 char*  buf, int toWrite,
+ 			int*        errorCodePtr));
+ 
+@@ -300,9 +300,9 @@
+ static int
+ TrfGetOption _ANSI_ARGS_ ((ClientData instanceData, Tcl_Interp* interp,
+-			   char* optionName, Tcl_DString* dsPtr));
++			   CONST84 char* optionName, Tcl_DString* dsPtr));
+ 
+ static int
+ TrfSetOption _ANSI_ARGS_((ClientData instanceData, Tcl_Interp* interp,
+-			  char* optionName, char* value));
++			  CONST84 char* optionName, CONST84 char* value));
+ #ifdef USE_TCL_STUBS
+ static int
+@@ -364,9 +364,9 @@
+ DownSOpt _ANSI_ARGS_ ((Tcl_Interp* interp,
+ 		       TrfTransformationInstance* ctrl,
+-		       char* optionName, char* value));
++		       CONST84 char* optionName, CONST84 char* value));
+ static int
+ DownGOpt _ANSI_ARGS_ ((Tcl_Interp* interp,
+ 		       TrfTransformationInstance* ctrl,
+-		       char* optionName, Tcl_DString* dsPtr));
++		       CONST84 char* optionName, Tcl_DString* dsPtr));
+ 
+ #define DOWNC(trans)             (DownChannel (trans))
+@@ -1708,5 +1708,5 @@
+ TrfOutput (instanceData, buf, toWrite, errorCodePtr)
+ ClientData instanceData;
+-char*      buf;
++CONST84 char*      buf;
+ int        toWrite;
+ int*       errorCodePtr;
+@@ -2162,6 +2162,6 @@
+      ClientData  instanceData;
+      Tcl_Interp* interp;
+-     char*       optionName;
+-     char*       value;
++     CONST84 char*       optionName;
++     CONST84 char*       value;
+ {
+   /* Recognized options:
+@@ -2315,5 +2315,5 @@
+      ClientData   instanceData;
+      Tcl_Interp*  interp;
+-     char*        optionName;
++     CONST84 char*        optionName;
+      Tcl_DString* dsPtr;
+ {
+@@ -3207,6 +3207,6 @@
+      Tcl_Interp*                interp;
+      TrfTransformationInstance* ctrl;
+-     char*                      optionName;
+-     char*                      value;
++     CONST84 char*                optionName;
++     CONST84 char*                value;
+ {
+   Tcl_Channel parent = DOWNC (ctrl);
+@@ -3252,5 +3252,5 @@
+      Tcl_Interp*                interp;
+      TrfTransformationInstance* ctrl;
+-     char*                      optionName;
++     CONST84 char*                optionName;
+      Tcl_DString*               dsPtr;
+ {
+--- generic/trfStubLib.c	Mon Sep 20 17:07:24 1999
++++ generic/trfStubLib.c	Tue Apr  6 13:13:38 2004
+@@ -61,5 +61,5 @@
+ #endif
+ 
+-char *
++const char *
+ Trf_InitStubs(interp, version, exact)
+     Tcl_Interp *interp;
+@@ -67,5 +67,5 @@
+     int exact;
+ {
+-    char *actualVersion;
++    const char *actualVersion;
+ 
+     actualVersion = Tcl_PkgRequireEx(interp, "Trf", (char *) version, exact,
+--- generic/transform.h	Tue Aug 21 01:52:21 2001
++++ generic/transform.h	Tue Apr  6 13:15:22 2004
+@@ -916,5 +916,5 @@
+ #define TCL_STORAGE_CLASS
+ 
+-EXTERN char *Trf_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, CONST char *version, int exact));
++EXTERN const char *Trf_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, CONST char *version, int exact));
+ 
+ #ifndef USE_TRF_STUBS
diff --git a/devel/tcl-trf/files/patch-zlib b/devel/tcl-trf/files/patch-zlib
index b0ccb07efdc..1eb619ca56a 100644
--- a/devel/tcl-trf/files/patch-zlib
+++ b/devel/tcl-trf/files/patch-zlib
@@ -1,13 +1,40 @@
 --- generic/adler.c	Wed Aug  9 15:13:17 2000
-+++ generic/adler.c	Fri Feb 15 15:09:44 2002
-@@ -63,5 +63,5 @@
++++ generic/adler.c	Fri Jul  9 16:30:50 2004
+@@ -49,5 +49,4 @@
+ static void MDAdler_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
+ static void MDAdler_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+-static int  MDAdler_Check     _ANSI_ARGS_ ((Tcl_Interp* interp));
+ 
+ /*
+@@ -63,5 +62,5 @@
    MDAdler_UpdateBuf,
    MDAdler_Final,
 -  MDAdler_Check
 +  NULL
  };
  
-@@ -222,36 +222,2 @@
+@@ -121,5 +120,5 @@
+   /* call md specific initialization here */
+ 
+-  ADLER = zf.adler32 (0L, Z_NULL, 0);
++  ADLER = adler32 (0L, Z_NULL, 0);
+ 
+   DONE (MDAdler_Start);
+@@ -154,5 +153,5 @@
+   unsigned char buf = character;
+ 
+-  ADLER = zf.adler32 (ADLER, &buf, 1);
++  ADLER = adler32 (ADLER, &buf, 1);
+ }
+ 
+@@ -184,5 +183,5 @@
+   /* call md specific update here */
+ 
+-  ADLER = zf.adler32 (ADLER, buffer, bufLen);
++  ADLER = adler32 (ADLER, buffer, bufLen);
+ }
+ 
+@@ -222,36 +221,2 @@
    out [3] = (char) ((adler >>  0) & 0xff);
  }
 -
@@ -45,15 +72,42 @@
 -}
 -
 --- generic/crc_zlib.c	Wed Aug  9 15:13:17 2000
-+++ generic/crc_zlib.c	Fri Feb 15 15:11:49 2002
-@@ -63,5 +63,5 @@
++++ generic/crc_zlib.c	Fri Jul  9 16:34:11 2004
+@@ -49,5 +49,4 @@
+ static void MDcrcz_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
+ static void MDcrcz_Final     _ANSI_ARGS_ ((VOID* context, VOID* digest));
+-static int  MDcrcz_Check     _ANSI_ARGS_ ((Tcl_Interp* interp));
+ 
+ /*
+@@ -63,5 +62,5 @@
    MDcrcz_UpdateBuf,
    MDcrcz_Final,
 -  MDcrcz_Check
 +  NULL
  };
  
-@@ -217,28 +217,2 @@
+@@ -118,5 +117,5 @@
+   /* call md specific initialization here */
+ 
+-  CRC = zf.crc32 (0L, Z_NULL, 0);
++  CRC = crc32 (0L, Z_NULL, 0);
+ }
+ 
+@@ -149,5 +148,5 @@
+   unsigned char buf = character;
+ 
+-  CRC = zf.crc32 (CRC, &buf, 1);
++  CRC = crc32 (CRC, &buf, 1);
+ }
+ 
+@@ -179,5 +178,5 @@
+   /* call md specific update here */
+ 
+-  CRC = zf.crc32 (CRC, buffer, bufLen);
++  CRC = crc32 (CRC, buffer, bufLen);
+ }
+ 
+@@ -217,28 +216,2 @@
    out [0] = (char) ((crc >>  0) & 0xff);
  }
 -