5 files changed, 24 insertions, 9 deletions

diff --git a/www/mod_dtcl/Makefile b/www/mod_dtcl/Makefile
index 1f5f08b5dc4d..b2497d18cd2c 100644
--- a/www/mod_dtcl/Makefile
+++ b/www/mod_dtcl/Makefile
@@ -26,11 +26,13 @@ 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/doc/mod_dtcl
-	${INSTALL_DATA} ${WRKSRC}/dtcl.tcl ${PREFIX}/share/doc/mod_dtcl
+	${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 \
 		${PREFIX}/share/doc/mod_dtcl
 	${CAT} ${PKGMESSAGE}
@@ -39,7 +41,7 @@ do-install:
 	#	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/doc/mod_dtcl/dtcl.tcl
+	#	${PREFIX}/share/mod_dtcl/dtcl.tcl
 	# but the comment in it suggests it should not be used
 	# in a "production environment"...
 .endif
diff --git a/www/mod_dtcl/files/Makefile.bsd b/www/mod_dtcl/files/Makefile.bsd
index 23427ec2f0e5..d3587aa965e7 100644
--- a/www/mod_dtcl/files/Makefile.bsd
+++ b/www/mod_dtcl/files/Makefile.bsd
@@ -9,6 +9,7 @@ INCLUDES=-I${PREFIX}/include/apache -I${PREFIX}/include/tcl${TCL_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/\""
 
 LIB=	mod_dtcl
 SHLIB_MAJOR=1
diff --git a/www/mod_dtcl/files/patch-aa b/www/mod_dtcl/files/patch-aa
index 86f3aa87f6cd..05fee8a9fcb8 100644
--- a/www/mod_dtcl/files/patch-aa
+++ b/www/mod_dtcl/files/patch-aa
@@ -1,12 +1,18 @@
---- testdtcl.c.orig	Mon Oct 18 10:29:02 1999
-+++ testdtcl.c	Sun Jan  9 19:13:53 2000
+--- 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
-@@ -229,4 +230,5 @@
+@@ -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/pkg-message b/www/mod_dtcl/pkg-message
index 923fa6dcbd33..709fec7cb3eb 100644
--- a/www/mod_dtcl/pkg-message
+++ b/www/mod_dtcl/pkg-message
@@ -6,7 +6,7 @@
 	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/doc/mod_dtcl/dtcl.tcl .
+	installed as /usr/local/share/mod_dtcl/dtcl.tcl .
 
 	The mentioning of mod_dtcl is already in the Apache's config
 	file, but it is commented out -- you have to uncomment it
diff --git a/www/mod_dtcl/pkg-plist b/www/mod_dtcl/pkg-plist
index 0f4ee422c31f..b2e3d693dfcf 100644
--- a/www/mod_dtcl/pkg-plist
+++ b/www/mod_dtcl/pkg-plist
@@ -1,5 +1,12 @@
+bin/testdtcl
 libexec/apache/mod_dtcl.so
-@exec %D/sbin/apxs -e -A -n dtcl %D/%
+@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/Makefile.html
 share/doc/mod_dtcl/benchmark.html
@@ -7,7 +14,6 @@ share/doc/mod_dtcl/browse-source.html
 share/doc/mod_dtcl/dtcl-tcl.html
 share/doc/mod_dtcl/dtcl.gif
 share/doc/mod_dtcl/dtcl.html
-share/doc/mod_dtcl/dtcl.tcl
 share/doc/mod_dtcl/examples.ttml
 share/doc/mod_dtcl/globalscript.html
 share/doc/mod_dtcl/infodebug.html