Updated cweb to version 3.63. No changelog or news file. Most of the

changes seem to be relatively minor enhancements, etc.

7 files changed, 46 insertions, 28 deletions

diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 3332e428ca5..4ef685fa8a0 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2000/12/13 22:27:11 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/28 04:27:42 jtb Exp $
 
-DISTNAME=	cweb-3.62
+DISTNAME=	cweb-3.63
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=web/cweb/}
 
@@ -16,7 +16,7 @@ EVAL_PREFIX+=	PREFIX=teTeX
 
 post-patch:
 	@for f in ${WRKSRC}/cweb.1 ; do \
-	${SED} -e 's:%%PREFIX%%:'${PREFIX}':g' < $$f > $$f.tmp \
+	${SED} -e 's:@PREFIX@:'${PREFIX}':g' < $$f > $$f.tmp \
 	&& ${MV} $$f.tmp $$f ; done
 
 do-install:
@@ -28,13 +28,19 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/cweb
 	${INSTALL_DATA} ${WRKSRC}/c++lib.w ${PREFIX}/share/cweb
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cweb
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/cweb
+	@for f in ${WRKSRC}/examples/*; do				\
+		i="${INSTALL_DATA} $$f ${PREFIX}/share/examples/cweb/";	\
+		${ECHO} $$i; $$i;					\
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cweb
-	${INSTALL_DATA} ${WRKSRC}/cwebman.tex ${PREFIX}/share/doc/cweb
+	@for f in cwebman.tex cwebman.dvi cweave.dvi ctangle.dvi; do	     \
+		j="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/cweb/"; \
+		${ECHO} $$j; $$j;					     \
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/cweb.el ${PREFIX}/share/emacs/site-lisp
 
 post-install:
-	@mktexlsr
+	mktexlsr
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cweb/files/md5 b/devel/cweb/files/md5
index c5837aa4c3d..23dc1d7a815 100644
--- a/devel/cweb/files/md5
+++ b/devel/cweb/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/11/25 17:23:27 jtb Exp $
+$NetBSD: md5,v 1.2 2001/01/28 04:27:43 jtb Exp $
 
-MD5 (cweb-3.62.tar.gz) = 0678c29c6c2c5328fe4e17c32a33a178
+MD5 (cweb-3.63.tar.gz) = 3f49917d40f5c1152bd3498509563fdb
diff --git a/devel/cweb/files/patch-sum b/devel/cweb/files/patch-sum
index 3c19051b39c..257578a6af7 100644
--- a/devel/cweb/files/patch-sum
+++ b/devel/cweb/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/25 17:23:27 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/28 04:27:43 jtb Exp $
 
-MD5 (patch-aa) = c5e9e2ccdcd5f1ddedebf7ad972a5a25
-MD5 (patch-ab) = 16c0eb9b4ebd1c8686077884aa3d5a18
+MD5 (patch-aa) = 188393d60c94169ef15d14c125a7b4a2
+MD5 (patch-ab) = 4957ab73eec5a4a36e1973f4d159cfdf
diff --git a/devel/cweb/patches/patch-aa b/devel/cweb/patches/patch-aa
index e48aa6dbbd2..fd452aee6e2 100644
--- a/devel/cweb/patches/patch-aa
+++ b/devel/cweb/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/25 17:23:28 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/01/28 04:27:43 jtb Exp $
 
---- Makefile.orig	Mon Jul 24 07:15:41 2000
+--- Makefile.orig	Mon Jan  1 04:13:48 2001
 +++ Makefile
 @@ -18,23 +18,23 @@
  #
@@ -38,21 +38,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/25 17:23:28 jtb Exp $
  
  # We keep debugging info around, for fun, but most users don't need it
 -CFLAGS = -g
--#CFLAGS = -O
--LINKFLAGS = -g
--#LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems
 +#CFLAGS = -g
-+CFLAGS = -O
-+#LINKFLAGS = -g
-+LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems
+ #CFLAGS = -O
+-LINKFLAGS = -g
++LINKFLAGS = $(LDFLAGS)
+ #LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems
  
  # What C compiler are you using?
 -CC = cc
 +#CC = cc
  
  # RM and CP are used below in case rm and cp are aliased
- RM= /bin/rm
- CP= /bin/cp
+-RM= /bin/rm
+-CP= /bin/cp
++#RM= /bin/rm
++#CP= /bin/cp
  
  # uncomment the second line if you use pdftex to bypass .dvi files
 -PDFTEX = dvipdfm
@@ -62,3 +62,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/25 17:23:28 jtb Exp $
  
  ##########  You shouldn't have to change anything after this point #######
  
+@@ -106,7 +106,7 @@
+ 	 pdftex ) pdftex $* ;; \
+ 	esac
+ 
+-all: ctangle cweave
++all: ctangle cweave fullmanual
+ 
+ cautiously: ctangle
+ 	$(CP) common.c SAVEcommon.c
diff --git a/devel/cweb/patches/patch-ab b/devel/cweb/patches/patch-ab
index 7884b633088..64f0355bb8b 100644
--- a/devel/cweb/patches/patch-ab
+++ b/devel/cweb/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/25 17:23:28 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2001/01/28 04:27:43 jtb Exp $
 
 --- cweb.1.orig	Mon Oct 23 11:05:57 2000
 +++ cweb.1
@@ -7,16 +7,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/25 17:23:28 jtb Exp $
  .PP
  .SH FILES
 -/usr/local/lib/tex/inputs/cwebmac.tex   TeX macros used by cweave output.
-+%%PREFIX%%/share/texmf/tex/plain/base/cwebmac.tex   TeX macros used by cweave output.
++@PREFIX@/share/texmf/tex/plain/base/cwebmac.tex   TeX macros used by cweave output.
  .br
 -/usr/local/src/cweb/cwebman.tex      The user manual.
-+%%PREFIX%%/share/doc/cweb/cwebman.tex      The user manual.
++@PREFIX@/share/doc/cweb/cwebman.tex      The user manual.
  .br
 -/usr/local/src/cweb/examples/wc.w   An introductory example.
-+%%PREFIX%%/share/examples/cweb/wc.w   An introductory example.
++@PREFIX@/share/examples/cweb/wc.w   An introductory example.
  .br
 -/usr/local/lib/cweb    Directory for cweb "include" files.
-+%%PREFIX%%/share/cweb    Directory for cweb "include" files.
++@PREFIX@/share/cweb    Directory for cweb "include" files.
  .SH "SEE ALSO"
  .I Literate Programming
  by D.E. Knuth.
diff --git a/devel/cweb/pkg/COMMENT b/devel/cweb/pkg/COMMENT
index fda6548952e..1bab120e604 100644
--- a/devel/cweb/pkg/COMMENT
+++ b/devel/cweb/pkg/COMMENT
@@ -1 +1 @@
-C based version of Knuth's literate programming system WEB
+The CWEB System of Structured Documentation
diff --git a/devel/cweb/pkg/PLIST b/devel/cweb/pkg/PLIST
index 689e49d17e8..0cd45aea0ea 100644
--- a/devel/cweb/pkg/PLIST
+++ b/devel/cweb/pkg/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/13 22:27:12 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/28 04:27:43 jtb Exp $
 bin/ctangle
 bin/cweave
 man/man1/cweb.1
 share/cweb/c++lib.w
+share/doc/cweb/ctangle.dvi
+share/doc/cweb/cweave.dvi
+share/doc/cweb/cwebman.dvi
 share/doc/cweb/cwebman.tex
 share/emacs/site-lisp/cweb.el
 share/examples/cweb/Makefile