These patches fix some lesser problems:

1) malloc.h doesn't exits in 2.0.
2) Makefile.inc wasn't picked up so one of the build steps (install?)
failed.
3) LIBMD wasn't depended on.
4) "ctm foo" dumped core because "foo" doesn't have a '.' in it.

Bruce

I updated the mkCTM stuff while I was at it anyway.  /phk

Reviewed by:	phk
Submitted by:	bde

3 files changed, 21 insertions, 9 deletions

diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
index bbef14dff9fe..7ab9f23efab5 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
@@ -1,9 +1,11 @@
 #!/usr/local/bin/tclsh
 
 set CTMname	cvs-cur
-set CTMdest	/u4/CTM
 set CTMref	/u1/CVS-FreeBSD
+set CTMdest	/u4/ftp/pub/CTM
 set CTMprefix	.
-set CTMcopy	$CTMdest/$CTMname
-set CTMtmp	$CTMdest/_tmp_$CTMname
+set CTMdont	{^/CVSROOT/history.*$|^/src/secure|^src/eBones}
+
+set CTMcopy	/u1/CTM/$CTMname
+set CTMtmp	/u1/CTM/tmp/_tmp_$CTMname
 set CTMdate	[exec date -u +%Y%m%d%H%M%SZ]
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
index d81d39f2d98b..b0702fb3b64c 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
@@ -1,9 +1,11 @@
 #!/usr/local/bin/tclsh
 
 set CTMname	src-cur
-set CTMdest	/u1/CTM
 set CTMref	/u4/ftp/pub/FreeBSD/SRC-current/src
+set CTMdest	/u4/ftp/pub/CTM
 set CTMprefix	.
-set CTMcopy	$CTMdest/$CTMname
-set CTMtmp	$CTMdest/_tmp_$CTMname
+set CTMdont	{/CVS$|/CVS/Entries$|/CVS/Repository$|^secure|^eBones}
+
+set CTMcopy	/u1/CTM/$CTMname
+set CTMtmp	/u1/CTM/tmp/_tmp_$CTMname
 set CTMdate	[exec date -u +%Y%m%d%H%M%SZ]
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index 35198e98453a..850ff140043c 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -2,9 +2,12 @@
 
 set CTMignoreCVS 0
 set CTMapply 1
+set CTMdont {^///}
 
 source $argv
 
+cd /u1/CTM/SW
+
 set tmp $CTMtmp
 set dd  $CTMdest
 set d1  $CTMcopy
@@ -118,6 +121,9 @@ while 1 {
     set n1 [lindex $l1 1]
     set n2 [lindex $l2 1]
 
+    #if {[regexp $CTMdont /$n1]} { set l1 "" ; continue }
+    if {[regexp $CTMdont /$n2]} { set l2 "" ; continue }
+
     if {$l1 == $l2}  { set l1 "" ; set l2 "" ; continue }
 
     if {$CTMignoreCVS } {
@@ -152,13 +158,15 @@ if {!$changes} {
     exit 0
 }
 flush stdout
-set  nm [format "%s/%s.%04d" $dd $CTMname $CTMnbr]
+set  nm [format "%s.%04d" $CTMname $CTMnbr]
 
 exec cat $tmp.begin $tmp.del $tmp.rmdir $tmp.mkdir $tmp.files $tmp.end \
-	| gzip -9 > ${nm}.gz 
+	| gzip -9 > ${tmp}:${nm}.gz 
 
 exec sh -x -c "rm -f ${tmp}.*" >&@ stdout
 
 if {$CTMapply} {
-	exec sh -e -x -c "cd $CTMcopy ; /root/CTM/ctm -v -v -v ${nm}.gz" >&@ stdout
+	exec sh -e -x -c "cd $CTMcopy ; /u1/CTM/SW/ctm -v -v -v ${tmp}:${nm}.gz" >&@ stdout
 }
+exec mv ${tmp}:${nm}.gz $dd/.tmp_${nm}.gz >&@ stdout
+exec mv $dd/.tmp_${nm}.gz $dd/${nm}.gz >&@ stdout