Update ap-dtcl to mod_dtcl-0.10.0. There is no list of changes from version

0.8.12, but mod_dtcl now uses <? ?> tags instead of <+ +>.  For now, mod_dtcl
contains compatibility code so that your old scripts will still run.

6 files changed, 122 insertions, 44 deletions

diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 5a0f05ebc16..ef95b35ad17 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/05/20 05:23:27 jonb Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/24 03:04:05 jlam Exp $
 
-DISTNAME=	mod_dtcl-0.8.12
-PKGNAME=	ap-dtcl-0.8.12
+DISTNAME=	mod_dtcl-0.10.1
+PKGNAME=	ap-dtcl-0.10.1
 WRKSRC=		${WRKDIR}/mod_dtcl
 CATEGORIES=	www
 MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
@@ -11,29 +11,32 @@ HOMEPAGE=	http://tcl.apache.org/
 COMMENT=	Simple, fast Tcl server side scripting for apache
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+DEPENDS+=	tcl>=8.3.2nb2:../../lang/tcl
 
-INCLUDES=	-I${PREFIX}/include/
-LIBS=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ltcl83 -lm
+TCLSH=		${LOCALBASE}/bin/tclsh
+CPPFLAGS+=	-I${PREFIX}/include/httpd
+
+MAKE_ENV+=	TCLSH="${TCLSH}"
+MAKE_ENV+=	INCLUDES="${CPPFLAGS}"
+
+APACHEMODDIR=	${PREFIX}/lib/httpd
+HTMLDIR=	${PREFIX}/share/doc/html/mod_dtcl
+EGDIR=		${PREFIX}/share/examples/mod_dtcl
 
 do-build:
-	cd ${WRKSRC} && ${PREFIX}/sbin/apxs -DDTCL_VERSION=\\\"`cat ${WRKSRC}/VERSION`\\\" ${INCLUDES} ${LIBS} -c mod_dtcl.c
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} builddtcl.sh
 
 do-install:
-	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -i mod_dtcl.so
-	${INSTALL_DATA_DIR} ${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
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_dtcl
-	${INSTALL_DATA_DIR} ${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
-	${INSTALL_DATA} ${WRKSRC}/contrib/*.tcl ${PREFIX}/share/examples/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/docs/examples.ttml ${PREFIX}/share/examples/mod_dtcl
+	${INSTALL_DATA} ${WRKSRC}/mod_dtcl.so ${APACHEMODDIR}
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${HTMLDIR}
+	${INSTALL_DATA_DIR} ${EGDIR}/tests
+	cd ${WRKSRC}; ${INSTALL_DATA} tests/README ${EGDIR}/tests
+	cd ${WRKSRC}; ${INSTALL_DATA} tests/dtcl-test.ttml ${EGDIR}/tests
+	cd ${WRKSRC}; ${INSTALL_DATA} tests/dtcl.test ${EGDIR}/tests
+	cd ${WRKSRC}; ${INSTALL_DATA} contrib/*.ttml ${EGDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} contrib/*.tcl ${EGDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} docs/examples.ttml ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dtcl/distinfo b/www/ap-dtcl/distinfo
index 1ba243d3c45..21fd2b85271 100644
--- a/www/ap-dtcl/distinfo
+++ b/www/ap-dtcl/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:31 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/24 03:04:05 jlam Exp $
 
-SHA1 (mod_dtcl-0.8.12.tar.gz) = 628ece104afdcf539c4500cb3ef57c2f3e4c6736
-Size (mod_dtcl-0.8.12.tar.gz) = 59064 bytes
+SHA1 (mod_dtcl-0.10.1.tar.gz) = 12af6fc3be7678898a3909ce14596586a485f8bc
+Size (mod_dtcl-0.10.1.tar.gz) = 77624 bytes
+SHA1 (patch-aa) = d074619f6b4322a747dd1aaafa1ace7dd079c3f0
diff --git a/www/ap-dtcl/patches/patch-aa b/www/ap-dtcl/patches/patch-aa
new file mode 100644
index 00000000000..6ac163e4737
--- /dev/null
+++ b/www/ap-dtcl/patches/patch-aa
@@ -0,0 +1,72 @@
+$NetBSD: patch-aa,v 1.3 2001/05/24 03:04:05 jlam Exp $
+
+--- builddtcl.sh.orig	Tue May  1 11:56:01 2001
++++ builddtcl.sh	Wed May 23 12:36:09 2001
+@@ -1,57 +1,6 @@
+ #!/bin/sh
+ # $Id: patch-aa,v 1.3 2001/05/24 03:04:05 jlam Exp $
+ 
+-# Name of tclsh - on FreeBSD, this is probably tclsh8.2
+-TCLSH=tclsh  ######### CHANGEME ##########
+-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-TCLSH=`which $TCLSH`
+-
+-if [ "$TCLSH" = "" ]
+-    then
+-    echo "No tclsh executable, please edit builddtcl.sh"
+-    exit 1
+-fi
+-
+-TCLSHEXIST=`echo "puts helloworld" | $TCLSH`
+-if [ "$TCLSHEXIST" != "helloworld" ]
+-    then
+-    echo "Tclsh is not $TCLSH, please edit builddtcl.sh"
+-    exit 1
+-    else
+-    echo "Using $TCLSH as tclsh program"
+-fi
+-
+-# Location of Apache source install (for static installs - you can
+-# comment this out for shared lib installs
+-APACHE=$HOME/download/apache-1.3/  ######### CHANGEME ##########
+-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-# APACHE=/usr/local/src/apache-1.3/
+-# APACHE=/
+-
+-export APACHE
+-
+-if [ -d $APACHE ]
+-    then
+-    echo "Apache in $APACHE"
+-    else
+-    echo "Apache NOT in $APACHE, please edit builddtcl.sh"
+-    exit 1
+-fi
+-
+-# Location of Apache include files.
+-INC=/usr/include/apache-1.3/  ######### CHANGEME ##########
+-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-# INC=$APACHE/src/include
+-
+-if [ -f $INC/httpd.h ] 
+-    then
+-    echo "Apache includes in $INC"
+-    INCLUDES="-I$INC" ; export INCLUDES
+-    else
+-    echo "Apache include files *not* in $INC, please edit builddtcl.sh"
+-    exit 1
+-fi
+-
+ # find location of tclConfig.sh, source it, and export variables to
+ # make them available to 'make'
+ 
+@@ -60,9 +9,7 @@
+ . $CONFIG
+ 
+ export TCL_CC
+-export TCL_CFLAGS_DEBUG 
+ export TCL_CFLAGS_OPTIMIZE 
+-export TCL_CFLAGS_WARNING 
+ export TCL_EXTRA_CFLAGS
+ export TCL_LIBS
+ export TCL_LIB_FLAG 
diff --git a/www/ap-dtcl/pkg/DESCR b/www/ap-dtcl/pkg/DESCR
index 4a205f43888..1f7b3f27f2b 100644
--- a/www/ap-dtcl/pkg/DESCR
+++ b/www/ap-dtcl/pkg/DESCR
@@ -1,4 +1,3 @@
-mod_dtcl is a free/open source implementation of server side
-Tcl, under Apache.  It allows you to tightly integrate html
-with Tcl, a widely used scripting language with many years of
-development invested in it. 
+The mod_dtcl Apache module enables the use of Tcl as an HTML-embedded
+scripting language, similar to PHP. It is fast, light, and lets you
+use the extensive codebase of existing Tcl code, on the web.
diff --git a/www/ap-dtcl/pkg/MESSAGE b/www/ap-dtcl/pkg/MESSAGE
index 55f307c2048..1ac6e84f33a 100644
--- a/www/ap-dtcl/pkg/MESSAGE
+++ b/www/ap-dtcl/pkg/MESSAGE
@@ -1,16 +1,18 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.2 2001/04/09 12:02:12 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2001/05/24 03:04:06 jlam Exp $
 
-You will need to edit ${PREFIX}/etc/httpd/httpd.conf and add the following
-lines to the Dynamic Shared Object section in order to use this module:
+In order to enable mod_dtcl in your Apache installation, you need to add
+the following to your httpd.conf file:
 
-LoadModule ${PREFIX}/lib/httpd/mod_dtcl.so
+	LoadModule dtcl_module ${PREFIX}/lib/httpd/mod_dtcl.so
+	AddModule mod_dtcl.c
 
-In order to turn on parsing of .ttml pages, you will need to add
+In order to turn on parsing of .ttml pages, you will also need to add
 
-AddType application/x-httpd-tcl .ttml
+	AddType application/x-httpd-tcl .ttml
 
-to httpd.conf.  For more configuration options, see
-${PREFIX}/share/doc/mod_dtcl/INSTALL.html.
+For more configuration options, see:
+
+	${PREFIX}/share/doc/html/mod_dtcl/documentation.html
 
 =============================================================================
diff --git a/www/ap-dtcl/pkg/PLIST b/www/ap-dtcl/pkg/PLIST
index aee8bc64ddc..98460cfc783 100644
--- a/www/ap-dtcl/pkg/PLIST
+++ b/www/ap-dtcl/pkg/PLIST
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2000/12/27 23:04:28 jwise Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/05/24 03:04:06 jlam Exp $
 lib/httpd/mod_dtcl.so
-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/doc/html/mod_dtcl/asf_logo.gif
+share/doc/html/mod_dtcl/documentation.html
+share/doc/html/mod_dtcl/dtcl.gif
+share/doc/html/mod_dtcl/logoLarge.gif
 share/examples/mod_dtcl/examples.ttml
 share/examples/mod_dtcl/clocks.ttml
+share/examples/mod_dtcl/dtclparser.tcl
+share/examples/mod_dtcl/tabletransform.tcl
 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/doc/html/mod_dtcl
 @dirrm share/examples/mod_dtcl/tests
 @dirrm share/examples/mod_dtcl