7 files changed, 27 insertions, 66 deletions

diff --git a/www/mod_dtcl/Makefile b/www/mod_dtcl/Makefile
index 0b1b3cab061e..e191738568c5 100644
--- a/www/mod_dtcl/Makefile
+++ b/www/mod_dtcl/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	mod_dtcl
-PORTVERSION=	0.8.1.1
+PORTVERSION=	0.8.12
 CATEGORIES=	www tcl83
-MASTER_SITES=	http://master.debian.org/~davidw/mod_dtcl/
-DISTNAME=	libapache-mod-dtcl_0.8.1-1
+MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
 
 MAINTAINER=	mi@aldan.algebra.com
 
@@ -20,30 +19,16 @@ WRKSRC=		${WRKDIR}/mod_dtcl
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
-MAN1=		testdtcl.1
-MANCOMPRESSED=	no
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libmod_dtcl.so.1* \
 		${PREFIX}/libexec/apache/mod_dtcl.so
 	${PREFIX}/sbin/apxs -e -A -n dtcl ${PREFIX}/libexec/apache/mod_dtcl.so
-	${INSTALL_PROGRAM} ${WRKSRC}/testdtcl ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/testdtcl.1 ${PREFIX}/man/man1/
 	${MKDIR} ${PREFIX}/share/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/*.tcl ${PREFIX}/share/mod_dtcl
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/*.?tml ${WRKSRC}/*.gif \
+	${INSTALL_DATA} ${WRKSRC}/docs/*.?tml ${WRKSRC}/docs/*.gif \
 		${PREFIX}/share/doc/mod_dtcl
-	${CAT} ${PKGMESSAGE}
-.else
-	# Not installing the documentation. Consult the
-	#	file:/${WRKSRC}/INSTALL.html
-	# for information on how to proceed to enable mod_dtcl.
-	# Note, that the dtcl.tcl mentioned there is installed as
-	#	${PREFIX}/share/mod_dtcl/dtcl.tcl
-	# but the comment in it suggests it should not be used
-	# in a "production environment"...
+	${SED} 's,/usr/local,${LOCALBASE},g' ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_dtcl/distinfo b/www/mod_dtcl/distinfo
index 6c60de723a6d..8abe9c8e3ca3 100644
--- a/www/mod_dtcl/distinfo
+++ b/www/mod_dtcl/distinfo
@@ -1 +1 @@
-MD5 (libapache-mod-dtcl_0.8.1-1.tar.gz) = 66513a09a1cc0d3a4478276a308d4328
+MD5 (mod_dtcl-0.8.12.tar.gz) = ee71c3a6e2b60554fb22b988ab2a5cc1
diff --git a/www/mod_dtcl/files/Makefile.bsd b/www/mod_dtcl/files/Makefile.bsd
index aa966f0f994d..eec33906d5a3 100644
--- a/www/mod_dtcl/files/Makefile.bsd
+++ b/www/mod_dtcl/files/Makefile.bsd
@@ -1,4 +1,3 @@
-# If you link against Tcl like so "-ltcl", leave this blank.
 TCL_VERSION?=8.3
 TCL_NDVER?=${TCL_VERSION:S/.//}	# same, but without the dot
 
@@ -6,10 +5,13 @@ PREFIX?=	/usr/local
 
 INCLUDES=-I${PREFIX}/include/apache -I${PREFIX}/include/tcl${TCL_VERSION}
 
+DTCL_VERSION!=	cat ${.CURDIR}/VERSION
+
 CC!=		${PREFIX}/sbin/apxs -q CC
 CFLAGS!=	${PREFIX}/sbin/apxs -q CFLAGS CFLAGS_SHLIB
 CFLAGS+=	-Wall -DSTATUS -DNO_DBM_REWRITEMAP ${INCLUDES}
 CFLAGS+=	-DDEBUG_SCRIPT_DIR="\"${PREFIX}/share/mod_dtcl/\""
+CFLAGS+=	-DDTCL_VERSION="\"${DTCL_VERSION}\""
 
 LIB=	mod_dtcl
 SHLIB_MAJOR=1
@@ -24,6 +26,6 @@ INTERNALLIB=	True	# to avoid building a static version
 SRCS=	mod_dtcl.c
 NOMAN=	True	# don't bother with the man-page here, let the port handle it
 
-all:	${SHLIB_NAME} testdtcl
+all:	${SHLIB_NAME}
 
 .include <bsd.lib.mk>
diff --git a/www/mod_dtcl/files/patch-aa b/www/mod_dtcl/files/patch-aa
deleted file mode 100644
index 05fee8a9fcb8..000000000000
--- a/www/mod_dtcl/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- testdtcl.c.orig	Mon Dec  6 00:26:28 1999
-+++ testdtcl.c	Thu Feb 17 15:01:52 2000
-@@ -14,4 +14,5 @@
- #include <tcl.h>
- #include <unistd.h>
-+#include <stdlib.h> /* In older FreeBSD, this is where getopt(3) lives */
- 
- #ifndef DEBUG_SCRIPT_DIR
-@@ -51,5 +52,4 @@
- 	    "Testdtcl is out of date, you should only "
- 	    "really be using it if you wish to improve it\n");
--    exit(0);
- 
-     interp = Tcl_CreateInterp();
-@@ -233,4 +233,5 @@
- 	}
-     }
-+    return 0;
- }
- 
diff --git a/www/mod_dtcl/files/patch-doc b/www/mod_dtcl/files/patch-doc
new file mode 100644
index 000000000000..50f3aae3ece4
--- /dev/null
+++ b/www/mod_dtcl/files/patch-doc
@@ -0,0 +1,7 @@
+There is not index.ttml provided with this package. Make the
+link point to the official site.	-mi
+--- docs/examples.ttml	Wed Nov  8 11:46:00 2000
++++ docs/examples.ttml	Tue Feb 13 12:13:41 2001
+@@ -238 +238 @@
+-<a href="index.ttml">Return to the mod_dtcl homepage</a>
++<a href="http://tcl.apache.org/mod_dtcl/">Return to the mod_dtcl homepage</a>
diff --git a/www/mod_dtcl/pkg-message b/www/mod_dtcl/pkg-message
index 709fec7cb3eb..f3fc469ff3e5 100644
--- a/www/mod_dtcl/pkg-message
+++ b/www/mod_dtcl/pkg-message
@@ -1,14 +1,12 @@
 -
 	Please, follow the instructions in
-		file:/usr/local/share/doc/mod_dtcl/INSTALL.html
+		file:/usr/local/share/doc/mod_dtcl/documentation.html
 
-	(where  /usr/local may  be  replaced  by your  machine's
-	setting for PREFIX) to enable the mod_dtcl's usage.
-
-	Note, that the dtcl.tcl mentioned in the instructions is
-	installed as /usr/local/share/mod_dtcl/dtcl.tcl .
+	(where  /usr/local may  be  replaced  by a  machine's
+	setting for LOCALBASE) to enable the mod_dtcl's usage.
 
 	The mentioning of mod_dtcl is already in the Apache's config
 	file, but it is commented out -- you have to uncomment it
-	manually.
+	manually and add the line:
+		AddType application/x-httpd-tcl .ttml
 -
diff --git a/www/mod_dtcl/pkg-plist b/www/mod_dtcl/pkg-plist
index d67e84fcca1e..079b7a2cfeed 100644
--- a/www/mod_dtcl/pkg-plist
+++ b/www/mod_dtcl/pkg-plist
@@ -1,21 +1,10 @@
-bin/testdtcl
 libexec/apache/mod_dtcl.so
 @exec %D/sbin/apxs -e -A -n dtcl %D/%F
 @unexec %D/sbin/apxs -e -A -n dtcl %D/%F
-share/mod_dtcl/dtcl.tcl
-share/mod_dtcl/globalscript.tcl
-share/mod_dtcl/infodebug.tcl
-share/mod_dtcl/testdtcl.tcl
 @dirrm share/mod_dtcl
-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/examples.ttml
-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/dtcl.gif
-@dirrm share/doc/mod_dtcl
+%%PORTDOCS%%share/doc/mod_dtcl/asf_logo.gif
+%%PORTDOCS%%share/doc/mod_dtcl/documentation.html
+%%PORTDOCS%%share/doc/mod_dtcl/dtcl.gif
+%%PORTDOCS%%share/doc/mod_dtcl/examples.ttml
+%%PORTDOCS%%share/doc/mod_dtcl/logoLarge.gif
+%%PORTDOCS%%@dirrm share/doc/mod_dtcl