Install macros where TeX can find them (viz. ${PREFIX}/share/texmf/tex/noweb).

Install examples.  Bump up version number.

4 files changed, 146 insertions, 24 deletions

diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index cb32cef74fd..f4b7a9b67a8 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/02/16 14:38:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/04/13 17:58:51 jtb Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
 #
 
-DISTNAME=		noweb-2.9a
+DISTNAME=		noweb-2.9anb1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.cs.virginia.edu/pub/nr/
 EXTRACT_SUFX=		.tgz
@@ -24,4 +24,8 @@ do-configure:
 	(cd ${WRKSRC} ; ./awkname awk)
 .endif
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/noweb
+	${INSTALL_DATA} ${WRKDIR}/examples/* ${PREFIX}/share/examples/noweb
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/noweb/files/patch-sum b/devel/noweb/files/patch-sum
index 9cf8f927806..f51a8029a5b 100644
--- a/devel/noweb/files/patch-sum
+++ b/devel/noweb/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 2001/04/05 15:53:48 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2001/04/13 17:58:52 jtb Exp $
 
-SHA1 (patch-aa) = 696ba4aebcb6b32e9e8011b27db54f4d9d4e87f8
+SHA1 (patch-aa) = 0c0c446173c1ee13eeb0b80041cb8cf98e3c7325
diff --git a/devel/noweb/patches/patch-aa b/devel/noweb/patches/patch-aa
index c0bb1ed3ba2..8c693407217 100644
--- a/devel/noweb/patches/patch-aa
+++ b/devel/noweb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2001/04/05 15:53:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/13 17:58:52 jtb Exp $
 
 --- Makefile.orig	Mon Aug 17 00:54:11 1998
 +++ Makefile
@@ -34,12 +34,109 @@ $NetBSD: patch-aa,v 1.1 2001/04/05 15:53:49 wiz Exp $
  MAN7EXT=7
 -TEXINPUTS=/usr/local/tex/inputs
 -ELISP=/dev/null
-+TEXINPUTS=${LIB}/tex
++TEXINPUTS=${PREFIX}/share/texmf/tex/noweb
 +ELISP=${PREFIX}/share/emacs/site-lisp
  
  # change WEAVE if you want a different version of noweave to be installed
  WEAVE=noweave		
-@@ -135,12 +135,12 @@
+@@ -41,14 +41,14 @@
+ TEXNAME=$(TEXINPUTS)
+ 
+ all:
+-	cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
++	cd c; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all 
+ 	for i in shell lib xdoc tex; do (cd $$i; make all); done
+-	cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
++	cd $(LIBSRC); make ICONT="$(ICONT)" ICONC="$(ICONC)" all
+ 
+ install: install-code install-man install-tex install-elisp
+ 
+ install-shell:
+-	-mkdir $(BIN) $(LIB) 2>/dev/null
++	-mkdir -p $(BIN) $(LIB) 2>/dev/null
+ 	sed "s@|LIBDIR|@$(LIBNAME)@" shell/noweb > $(BIN)/noweb
+ 	chmod +x $(BIN)/noweb
+ 	sed "s@|LIBDIR|@$(LIBNAME)@" shell/notangle > $(BIN)/notangle
+@@ -74,13 +74,13 @@
+ 	cp shell/tmac.w $(LIB)
+ 
+ install-code: install-shell
+-	-mkdir $(BIN) $(LIB) 2>/dev/null
++	-mkdir -p $(BIN) $(LIB) 2>/dev/null
+ 	strip c/nt c/markup c/mnt c/finduses
+ 	cp c/nt c/markup c/mnt c/finduses $(LIB)
+ 	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
+ 	cd lib; make LIB=$(LIB) install
+ install-man:
+-	-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
++	-mkdir -p $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+ 	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
+ 	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(MANDIR)/nodefs.$(MANEXT)
+ 	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT)
+@@ -98,49 +98,49 @@
+ 	rm -f $(MANDIR)/nountangle.$(MANEXT)
+ 	(cd $(MANDIR); ln notangle.$(MANEXT) nountangle.$(MANEXT))
+ install-gzipped-man:
+-	-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1  | gzip -9 > $(MANDIR)/cpif.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1  | gzip -9 > $(MANDIR)/nodefs.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1  | gzip -9 > $(MANDIR)/noroots.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1  | gzip -9 > $(MANDIR)/noweb.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1  | gzip -9 > $(MANDIR)/noindex.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1  | gzip -9 > $(MANDIR)/nuweb2noweb.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1  | gzip -9 > $(MANDIR)/notangle.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1  | gzip -9 > $(MANDIR)/noroff.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1  | gzip -9 > $(MANDIR)/sl2h.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1  | gzip -9 > $(MANDIR)/htmltoc.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7  | gzip -9 > $(MAN7DIR)/nowebstyle.$(MAN7EXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7  | gzip -9 > $(MAN7DIR)/nowebfilters.$(MAN7EXT).gz
++	-mkdir -p $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1  > $(MANDIR)/cpif.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1  > $(MANDIR)/nodefs.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1  > $(MANDIR)/noweb.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 > $(MANDIR)/noindex.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1  > $(MANDIR)/nuweb2noweb.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 > $(MANDIR)/notangle.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 > $(MANDIR)/noroff.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1  > $(MANDIR)/sl2h.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 > $(MANDIR)/htmltoc.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7  > $(MAN7DIR)/nowebstyle.$(MAN7EXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7  > $(MAN7DIR)/nowebfilters.$(MAN7EXT)
+ 	rm -f $(MANDIR)/noweave.$(MANEXT).gz
+ 	(cd $(MANDIR); ln notangle.$(MANEXT).gz noweave.$(MANEXT).gz)
+ 	rm -f $(MANDIR)/nountangle.$(MANEXT).gz
+ 	(cd $(MANDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
+ install-preformat-man:
+ 	-echo "Warning: install-preformat-man is obsolete, even on Slackware systems" 1>&2
+-	-mkdir $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt  | gzip > $(CATDIR)/cpif.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt  | gzip > $(CATDIR)/nodefs.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt  | gzip > $(CATDIR)/noroots.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.txt  | gzip > $(CATDIR)/noweb.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.txt  | gzip > $(CATDIR)/noindex.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.txt  | gzip > $(CATDIR)/nuweb2noweb.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.txt  | gzip > $(CATDIR)/notangle.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.txt  | gzip > $(CATDIR)/noroff.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.txt  | gzip > $(CATDIR)/sl2h.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.txt  | gzip > $(CATDIR)/htmltoc.$(MANEXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.txt  | gzip > $(CAT7DIR)/nowebstyle.$(MAN7EXT).gz
+-	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.txt  | gzip > $(CAT7DIR)/nowebfilters.$(MAN7EXT).gz
++	-mkdir -p $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt > $(CATDIR)/cpif.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt > $(CATDIR)/nodefs.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt  > $(CATDIR)/noroots.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.txt  > $(CATDIR)/noweb.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.txt > $(CATDIR)/noindex.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.txt  > $(CATDIR)/nuweb2noweb.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.txt  > $(CATDIR)/notangle.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.txt > $(CATDIR)/noroff.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.txt > $(CATDIR)/sl2h.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.txt  > $(CATDIR)/htmltoc.$(MANEXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.txt  > $(CAT7DIR)/nowebstyle.$(MAN7EXT)
++	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.txt > $(CAT7DIR)/nowebfilters.$(MAN7EXT)
+ 	rm -f $(CATDIR)/noweave.$(MANEXT).gz
+ 	(cd $(CATDIR); ln notangle.$(MANEXT).gz noweave.$(MANEXT).gz)
  	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
  	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
  install-tex:
diff --git a/devel/noweb/pkg/PLIST b/devel/noweb/pkg/PLIST
index a2d6d54f5af..0984eb41a65 100644
--- a/devel/noweb/pkg/PLIST
+++ b/devel/noweb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 09:59:32 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/04/13 17:58:52 jtb Exp $
 bin/htmltoc
 bin/nodefs
 bin/noindex
@@ -11,6 +11,39 @@ bin/noweb
 bin/nuweb2noweb
 bin/cpif
 bin/sl2h
+man/man1/cpif.1
+man/man1/nodefs.1
+man/man1/noroots.1
+man/man1/noweb.1
+man/man1/noindex.1
+man/man1/nuweb2noweb.1
+man/man1/notangle.1
+man/man1/sl2h.1
+man/man1/htmltoc.1
+man/man1/nountangle.1
+man/man1/noweave.1
+man/man7/nowebstyle.7
+man/man7/nowebfilters.7
+share/examples/noweb/Makefile
+share/examples/noweb/README
+share/examples/noweb/README.h
+share/examples/noweb/breakmodel.nw
+share/examples/noweb/compress.nw
+share/examples/noweb/dag.nw
+share/examples/noweb/graphs.nw
+share/examples/noweb/mipscoder.nw
+share/examples/noweb/multicol.sty
+share/examples/noweb/primes.bbl
+share/examples/noweb/primes.blg
+share/examples/noweb/primes.nw
+share/examples/noweb/scanner.nw
+share/examples/noweb/sharpline
+share/examples/noweb/test.nw
+share/examples/noweb/tree.nw
+share/examples/noweb/wc.bbl
+share/examples/noweb/wc.nw
+share/examples/noweb/wc.nw2html
+share/examples/noweb/whitespace
 share/emacs/site-lisp/noweb-mode.el
 share/noweb/autodefs.c
 share/noweb/autodefs.icon
@@ -35,20 +68,8 @@ share/noweb/tohtml
 share/noweb/totex
 share/noweb/toroff
 share/noweb/unmarkup
-share/noweb/tex/noweb.sty
-share/noweb/tex/nwmac.tex
-man/man1/cpif.1.gz
-man/man1/nodefs.1.gz
-man/man1/noroots.1.gz
-man/man1/noweb.1.gz
-man/man1/noindex.1.gz
-man/man1/nuweb2noweb.1.gz
-man/man1/notangle.1.gz
-man/man1/sl2h.1.gz
-man/man1/htmltoc.1.gz
-man/man1/nountangle.1.gz
-man/man1/noweave.1.gz
-man/man7/nowebstyle.7.gz
-man/man7/nowebfilters.7.gz
-@dirrm share/noweb/tex
+share/texmf/tex/noweb/noweb.sty
+share/texmf/tex/noweb/nwmac.tex
+@dirrm share/examples/noweb
+@dirrm share/texmf/tex/noweb
 @dirrm share/noweb