Upgrade devel/tcllib from 1.6 to 1.7 and www/tclhttpd from 3.4.2 to 3.5.1.

Update dependency lines in amsn and tclxml.

7 files changed, 50 insertions, 83 deletions

diff --git a/www/tclhttpd/files/Makefile.lib b/www/tclhttpd/files/Makefile.lib
index fc8e63104efa..0a0fd8a4ae69 100644
--- a/www/tclhttpd/files/Makefile.lib
+++ b/www/tclhttpd/files/Makefile.lib
@@ -1,8 +1,8 @@
-TCL_DVER?=	8.3
+TCL_DVER?=	8.4
 TCL_VER=	${TCL_DVER:S/.//}
 PREFIX?=	/usr/local
 
-SRCS=crypt.c setuid.c limit.c utime.c metaPackage.c
+SRCS=crypt.c setuid.c limit.c metaPackage.c
 
 CFLAGS+=-I${LOCALBASE}/include/tcl${TCL_DVER} -DUSE_TCL_STUBS \
 	-DTclhttpdbin_Init=${LIBNAME}_Init -Wall -Werror
@@ -13,7 +13,4 @@ LDADD+=-L${LOCALBASE}/lib -ltclstub${TCL_VER} -lcrypt
 LIBNAME=	Tclhttpdbin
 SHLIB_NAME=	lib${LIBNAME}.so
 
-ech:
-	@echo ${SHLIB_NAME}
-
 .include <bsd.lib.mk>
diff --git a/www/tclhttpd/files/metaPackage.c b/www/tclhttpd/files/metaPackage.c
index 6046531e084e..4629a41964f9 100644
--- a/www/tclhttpd/files/metaPackage.c
+++ b/www/tclhttpd/files/metaPackage.c
@@ -7,7 +7,6 @@ int Tclhttpdbin_Init(Tcl_Interp *I) {
 	Crypt_Init(I);
 	Limit_Init(I);
 	Setuid_Init(I);
-	Utime_Init(I);
 
 	return TCL_OK;
 }
diff --git a/www/tclhttpd/files/patch-ab b/www/tclhttpd/files/patch-ab
index 8a95f84c0d89..750aa3737aef 100644
--- a/www/tclhttpd/files/patch-ab
+++ b/www/tclhttpd/files/patch-ab
@@ -5,11 +5,6 @@
 -htdocsdir = $(SERVER_ROOT)/htdocs
 +htdocsdir = $(prefix)/share/@PACKAGE@@VERSION@
  
-@@ -183,3 +183,3 @@
- TCL_GENERIC_DIR_NATIVE = @TCL_GENERIC_DIR_NATIVE@
--TCLSH_PROG = @TCLSH_PROG@
-+TCLSH_PROG ?= tclsh8.3
- SHARED_BUILD = @SHARED_BUILD@
 @@ -198,3 +198,3 @@
  CONFIGDIR = @CONFIGDIR@
 -mkinstalldirs = $(SHELL) $(CONFIGDIR)/mkinstalldirs
@@ -28,8 +23,10 @@
 @@ -330,1 +330,1 @@
 -	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/httpd.1
 +	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/tclhttpd.1
-@@ -335,3 +335,3 @@
+@@ -343,5 +343,5 @@
+ 
  installdirs:
--	$(mkinstalldirs) $(pkglibdir) $(cryptlibdir) $(prefix)/bin $(htdocsdir) $(customdir)
-+	$(mkinstalldirs) $(pkglibdir) $(prefix)/bin $(htdocsdir) $(customdir)
+-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(cryptlibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir)
++	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir)
  
+ clean:  
diff --git a/www/tclhttpd/files/patch-af b/www/tclhttpd/files/patch-af
deleted file mode 100644
index 74df2c3f7272..000000000000
--- a/www/tclhttpd/files/patch-af
+++ /dev/null
@@ -1,5 +0,0 @@
---- lib/log.tcl	Mon Apr  3 20:00:28 2000
-+++ lib/log.tcl	Fri May  5 10:01:58 2000
-@@ -29,1 +29,1 @@
--    set Log(compressProg) /usr/local/bin/gzip
-+    set Log(compressProg) /usr/bin/gzip
diff --git a/www/tclhttpd/files/patch-ak b/www/tclhttpd/files/patch-ak
index 48137087c614..5f8e65a3899f 100644
--- a/www/tclhttpd/files/patch-ak
+++ b/www/tclhttpd/files/patch-ak
@@ -1,6 +1,15 @@
---- src/limit.c	Thu May 11 02:00:43 2000
-+++ src/limit.c	Fri Dec  1 20:04:58 2000
-@@ -20,7 +20,6 @@
+--- src/limit.c	Thu May  1 19:42:14 2003
++++ src/limit.c	Fri Nov 19 13:21:15 2004
+@@ -9,6 +9,5 @@
+ 
+ 
+-static int  LimitCmd _ANSI_ARGS_((ClientData clientData,
+-            Tcl_Interp *interp, int argc, char *argv[]));
++Tcl_ObjCmdProc  LimitCmd;
+ 
+ #undef TCL_STORAGE_CLASS
+@@ -29,9 +28,8 @@
+  */
  int
 -LimitCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[])
 +LimitCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[])
@@ -10,66 +19,35 @@
      struct rlimit limit;
 +    Tcl_Obj *limObj[2];
      Tcl_ResetResult(interp);
-@@ -31,3 +30,4 @@
+     if (getrlimit(RLIMIT_NOFILE, &limit) < 0) {
+@@ -40,12 +38,18 @@
+     }
      if (argc > 1) {
--	Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur);
-+	if (Tcl_GetLongFromObj(interp, objv[1], (long *)&limit.rlim_cur)
-+		!= TCL_OK) return TCL_ERROR;
+-    Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur);
++        long	rlim_cur;
++
++        if (Tcl_GetLongFromObj(interp, objv[1], &rlim_cur) != TCL_OK)
++            return TCL_ERROR;
++        limit.rlim_cur = rlim_cur;
          if (setrlimit(RLIMIT_NOFILE, &limit) < 0) {
-@@ -37,3 +37,5 @@
+-        Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL);
+-        return TCL_ERROR;
+-    }
++            Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL);
++            return TCL_ERROR;
++        }
      }
+     /* bad, bad style, direct writing to interp->result */
 -    sprintf(interp->result, "%d %d", limit.rlim_cur, limit.rlim_max);
 +    limObj[0] = Tcl_NewLongObj((long)limit.rlim_cur);
 +    limObj[1] = Tcl_NewLongObj((long)limit.rlim_max);
 +    Tcl_SetObjResult(interp, Tcl_NewListObj(2, limObj));
      return TCL_OK;
-@@ -54,3 +56,3 @@
- {
+ }
+@@ -71,5 +75,5 @@
+     #endif
+ 
 -    Tcl_CreateCommand(interp, "limit", LimitCmd, NULL, NULL);
 +    Tcl_CreateObjCommand(interp, "limit", LimitCmd, NULL, NULL);
-     Tcl_PkgProvide(interp, "limit", "1.0");
---- src/setuid.c	Tue Oct  6 20:12:11 1998
-+++ src/setuid.c	Fri Dec  1 20:05:52 2000
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 
---- src/utime.c	Tue Oct  6 20:12:11 1998
-+++ src/utime.c	Fri Dec  1 20:14:21 2000
-@@ -20,13 +20,8 @@
- int
--UtimeCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[])
-+UtimeCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[])
- {
-     struct utimbuf u = {0, 0};
-+    char *file;
- 
-     Tcl_ResetResult(interp);
--    if (argc > 3) {
--	Tcl_GetInt(interp, argv[3], &u.actime);	/* new access time */
--    }
--    if (argc > 2) {
--	Tcl_GetInt(interp, argv[2], &u.modtime);	/* new modify time */
--    }
-     if (argc > 4 || argc <= 1) {
-@@ -35,4 +30,13 @@
-     }
--    if (utime(argv[1], &u) < 0) {
--	Tcl_AppendResult(interp, "utime: ", argv[1], Tcl_PosixError(interp), NULL);
-+    if (argc > 3) {
-+	if (Tcl_GetLongFromObj(interp, objv[3], (long *)&u.actime)
-+		!= TCL_OK) return TCL_ERROR;	/* new access time */
-+    }
-+    if (argc > 2) {
-+	if (Tcl_GetLongFromObj(interp, objv[2], (long *)&u.modtime)
-+		!= TCL_OK) return TCL_ERROR;	/* new modify time */
-+    }
-+    file = Tcl_GetString(objv[1]);
-+    if (utime(file, &u) < 0) {
-+	Tcl_AppendResult(interp, "utime: ", file, Tcl_PosixError(interp), NULL);
- 	return TCL_ERROR;
-@@ -55,3 +59,3 @@
- {
--    Tcl_CreateCommand(interp, "utime", UtimeCmd, NULL, NULL);
-+    Tcl_CreateObjCommand(interp, "utime", UtimeCmd, NULL, NULL);
-     Tcl_PkgProvide(interp, "utime", "1.0");
+     code = Tcl_PkgProvide(interp, "limit", "1.0");
+     if (code != TCL_OK) {
diff --git a/www/tclhttpd/files/patch-tcl84 b/www/tclhttpd/files/patch-tcl84
index 0d9b472f8fe0..d3da03a679ab 100644
--- a/www/tclhttpd/files/patch-tcl84
+++ b/www/tclhttpd/files/patch-tcl84
@@ -27,17 +27,18 @@
  {
      char *result;
 --- src/setuid.c	Tue Oct  6 20:12:11 1998
-+++ src/setuid.c	Thu Apr 24 12:03:18 2003
-@@ -8,4 +8,8 @@
- #include <unistd.h>
- 
++++ src/setuid.c	Fri Nov 19 13:17:06 2004
+@@ -6,4 +6,9 @@
+ #include <tcl.h>
+ #include <sys/types.h>
++#include <unistd.h>
++
 +#ifndef CONST84
 +#	define CONST84
 +#endif
-+
+ 
  /*
-  * SetuidCmd --
-@@ -19,5 +23,5 @@
+@@ -18,5 +23,5 @@
   */
  int
 -SetuidCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[])
diff --git a/www/tclhttpd/files/tclhttpd.sh b/www/tclhttpd/files/tclhttpd.sh
index bba81a73cb35..6376cb49a646 100644
--- a/www/tclhttpd/files/tclhttpd.sh
+++ b/www/tclhttpd/files/tclhttpd.sh
@@ -12,7 +12,7 @@ case $1 in
 		fi
 		;;
 	''|start)
-		COMMAND_LINE &
+		env LANG=C COMMAND_LINE &
 		sleep 2
 		if kill -0 $! ; then
 			echo -n ' tclhttpd'