Update ap-dtcl to version 0.8.12. Changes since version 0.8.1 (the last

pkgsrc version) include:

  * Various cookie fixes.
  * New build system.
  * Code to deal with before/after scripts.
  * Rewrite of Apache directives.

In addition, mod_dtcl is now a project of the Apache Software Foundation.
See http://tcl.apache.org/ for details.

5 files changed, 32 insertions, 51 deletions

diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 0409b3603aa..229bf1f9274 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2000/09/05 09:33:17 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/12/27 23:04:27 jwise Exp $
 
-DISTNAME=	libapache-mod-dtcl_0.8.1-1
-PKGNAME=	ap-dtcl-0.8.1
+DISTNAME=	mod_dtcl-0.8.12
+PKGNAME=	ap-dtcl-0.8.12
 WRKSRC=		${WRKDIR}/mod_dtcl
 CATEGORIES=	www
-MASTER_SITES=	http://master.debian.org/~davidw/mod_dtcl/
+MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
 
 MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://comanche.com.dtu.dk/dave/
+HOMEPAGE=	http://tcl.apache.org/
 
 DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	tcl-8.3.2:../../lang/tcl
@@ -18,22 +18,21 @@ INCLUDES=	-I${PREFIX}/include/
 LIBS=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ltcl83 -lm
 
 do-build:
-	cd ${WRKSRC} && ${PREFIX}/sbin/apxs ${INCLUDES} ${LIBS} -c mod_dtcl.c
-	cd ${WRKSRC} && ${CC} -DDEBUG_SCRIPT_DIR=\"${PREFIX}/libexec/mod_dtcl/\" \
-		${INCLUDES} -o testdtcl testdtcl.c ${LIBS}
-	${SED} -e s,/usr/lib,${PREFIX}/libexec,g < ${WRKSRC}/testdtcl.1 > ${WRKSRC}/testdtcl.1.new
+	cd ${WRKSRC} && ${PREFIX}/sbin/apxs -DDTCL_VERSION=\\\"`cat ${WRKSRC}/VERSION`\\\" ${INCLUDES} ${LIBS} -c mod_dtcl.c
 
 do-install:
 	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -i mod_dtcl.so
 	-${MKDIR} ${PREFIX}/share/doc/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/*.gif ${PREFIX}/share/doc/mod_dtcl
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/mod_dtcl
+	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${PREFIX}/share/doc/mod_dtcl
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/mod_dtcl
 	-${MKDIR} ${PREFIX}/share/examples/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/*.ttml ${PREFIX}/share/examples/mod_dtcl
+	-${MKDIR} ${PREFIX}/share/examples/mod_dtcl/tests
+	${INSTALL_DATA} ${WRKSRC}/tests/README ${PREFIX}/share/examples/mod_dtcl/tests
+	${INSTALL_DATA} ${WRKSRC}/tests/dtcl-test.ttml ${PREFIX}/share/examples/mod_dtcl/tests
+	${INSTALL_DATA} ${WRKSRC}/tests/dtcl.test ${PREFIX}/share/examples/mod_dtcl/tests
 	${INSTALL_DATA} ${WRKSRC}/contrib/*.ttml ${PREFIX}/share/examples/mod_dtcl
-	-${MKDIR} ${PREFIX}/libexec/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/*.tcl ${PREFIX}/libexec/mod_dtcl
-	${INSTALL_PROGRAM} ${WRKSRC}/testdtcl ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/testdtcl.1.new ${PREFIX}/man/man1/testdtcl.1
+	${INSTALL_DATA} ${WRKSRC}/contrib/*.tcl ${PREFIX}/share/examples/mod_dtcl
+	${INSTALL_DATA} ${WRKSRC}/docs/examples.ttml ${PREFIX}/share/examples/mod_dtcl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dtcl/files/md5 b/www/ap-dtcl/files/md5
index 519fac78656..bf4157a03b2 100644
--- a/www/ap-dtcl/files/md5
+++ b/www/ap-dtcl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/08/30 00:22:20 jwise Exp $
+$NetBSD: md5,v 1.3 2000/12/27 23:04:28 jwise Exp $
 
-MD5 (libapache-mod-dtcl_0.8.1-1.tar.gz) = 66513a09a1cc0d3a4478276a308d4328
+MD5 (mod_dtcl-0.8.12.tar.gz) = ee71c3a6e2b60554fb22b988ab2a5cc1
diff --git a/www/ap-dtcl/files/patch-sum b/www/ap-dtcl/files/patch-sum
index 9ead4549746..9c75ce71fa9 100644
--- a/www/ap-dtcl/files/patch-sum
+++ b/www/ap-dtcl/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/11/13 00:57:10 jwise Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/27 23:04:28 jwise Exp $
 
-MD5 (patch-aa) = 9f77b0f2381f8591ca0d480485f31cc7
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/www/ap-dtcl/patches/patch-aa b/www/ap-dtcl/patches/patch-aa
deleted file mode 100644
index ca9b17a6bd5..00000000000
--- a/www/ap-dtcl/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/11/12 20:05:19 jwise Exp $
---- dtcl.tcl.orig	Fri Nov 12 14:58:55 1999
-+++ dtcl.tcl	Fri Nov 12 14:59:13 1999
-@@ -1360,8 +1360,8 @@
- 
-     flush $_cgi(mailfid)
- 
--    if {[file executable /usr/lib/sendmail]} {
--	exec /usr/lib/sendmail -t -odb < $_cgi(mailfile)
-+    if {[file executable /usr/sbin/sendmail]} {
-+	exec /usr/sbin/sendmail -t -odb < $_cgi(mailfile)
- 	# Explanation:
- 	# -t   means: pick up recipient from body
- 	# -odb means: deliver in background
diff --git a/www/ap-dtcl/pkg/PLIST b/www/ap-dtcl/pkg/PLIST
index 414380f0781..aee8bc64ddc 100644
--- a/www/ap-dtcl/pkg/PLIST
+++ b/www/ap-dtcl/pkg/PLIST
@@ -1,23 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/30 00:22:22 jwise Exp $
-bin/testdtcl
+@comment $NetBSD: PLIST,v 1.4 2000/12/27 23:04:28 jwise Exp $
 lib/httpd/mod_dtcl.so
-libexec/mod_dtcl/dtcl.tcl
-libexec/mod_dtcl/globalscript.tcl
-libexec/mod_dtcl/infodebug.tcl
-libexec/mod_dtcl/testdtcl.tcl
-man/man1/testdtcl.1
-share/doc/mod_dtcl/INSTALL.html
-share/doc/mod_dtcl/TODO.html
-share/doc/mod_dtcl/benchmark.html
-share/doc/mod_dtcl/browse-source.html
-share/doc/mod_dtcl/dtcl-tcl.html
-share/doc/mod_dtcl/readme.hpux.html
-share/doc/mod_dtcl/readme.html
-share/doc/mod_dtcl/table.html
-share/doc/mod_dtcl/use.html
+share/doc/mod_dtcl/asf_logo.gif
+share/doc/mod_dtcl/documentation.html
+share/doc/mod_dtcl/documentation.txt
 share/doc/mod_dtcl/dtcl.gif
+share/doc/mod_dtcl/logoLarge.gif
 share/examples/mod_dtcl/examples.ttml
 share/examples/mod_dtcl/clocks.ttml
-@dirrm libexec/mod_dtcl
+share/examples/mod_dtcl/tcl_include.tcl
+share/examples/mod_dtcl/tests/README
+share/examples/mod_dtcl/tests/dtcl-test.ttml
+share/examples/mod_dtcl/tests/dtcl.test
 @dirrm share/doc/mod_dtcl
+@dirrm share/examples/mod_dtcl/tests
 @dirrm share/examples/mod_dtcl