PR pkg/38194: Aleksej Saushev: Update devel/noweb to 2.11b.

CHANGES FOR VERSION 2.11b - released 12 Jun 2006
Make noroff use -mm by default (Debian 218050)
Fixed flagrant errors in noweave -x -troff (but bad formatting remains)

CHANGES FOR VERSION 2.11a - released 20 May 2006
Clarify instructions for $PATH and $MANPATH (B Pierce)
Create examples/Makefile.awk (B Pierce)
Clarify documentation: unescaped << and >> not OK in docs chunk (R Hemmecke)
Add -lua option to docs2comments filter

CHANGES FOR VERSION 2.11 - released 6 April 2006
Braces did not render correctly in [[<<$\{a_i\}$>>]] (Albert Reiner)
From Kevin Quick, Windows hints and a new NOTANGLE.BAT
Generate postscript with -P cmz for better PDF (Francky Leyn)
Clarify for noweave -delay that the first doco chunk is before the first @
extended xchunks with -summary argument
Line in a code chunk opening with unclosed, unescaped << is OK (Ralf Hemmecke)

UNDO ME!  Make docs2comments filter tolerate embedded @xref stuff..
Added Windows XP help to FAQ (David Lemmon)
Noidx now calculates labels for a code chunk using the number of preceding
  definitions from the same @file, not the overall number
Change wording for \noweboptions{german} (Christian Lindig)
Need to insert \leavevmode in \sublabel so that new \@bsphack will work right
From Yann Dirson, new filters in contrib/ydirson.
From Fr'ed'eric Lin'e, some improvements in French translation (apologies to Moli`ere)

CHANGES FOR VERSION 2.10c - released 17 Jul 2002

Bug in noidx.nw caused tag NWD1 etc to be used in multiple files.
Cleaned up alignment tags in tables emitted by l2h.nw (Federico Di Gregorio)
Fixed some bugs in the HTML markup for the hacker's guide
Goes back to iconc, except for noidx.nw, which can't be compiled because
  of the 32-bit polynomial arithmetic

CHANGES FOR VERSION 2.10b - released 15 Jul 2002

Bug in xchunks.nw, around line 100 -- db never initialized (Stephen Edwards)
In local identifier cross-reference, enable breaks between pages
   of multiply defined identifiers (option breakdefs)
Create a secret \noweboptions{breakcode} for those who want their
   code chunks broken across page boundaries
German is `Benutzt' not `Benutztt' (Johannes Huesing)
No longer suggests iconc; compiling with icont is now the default.

CHANGES FOR VERSION 2.10a - released 30 Mar 2001

Fixed problem in src/Makefile -- FAQ should be built by `source' not `all'

CHANGES FOR VERSION 2.10 - released 16 Jun 2000, but not officially

Added -matlab to nountangle (Uwe Brauer)
Added \nwblindhyperanchor to \weblabel (Andrew Swann)
Changed one more 'char c' to 'unsigned char c' in recognize.nw (Gilles ANDRE)
Change noweb.sty to support more than 26 code chunks on a page (F. Leyn)
l2h skips optional arguments with \includegraphics
fixed bugs in htmltoc having to do with nested anchors on one line
Added capacity for two more filters to noweave script
Fixed bug in autodefs.sml (including spaces in symbol chars)
Added autodefs.mmix
Added autodefs.asdl
Scripts for Plan 9 rc (Russ Cox)
Tinkered with noidx sortkey
Added \mbox{} to \nwnewline, so that spaces won't be eaten (John Cummings)
Added xchunks filter, per request of Mike Smith & Glenn Holloway
Replaced FORTH uniqueid heuristic with 32-bit CRC
Added pipedocs filter to pipe documentation chunks through commands
Added h2a (convert html to ascii) for use with pipedoces
Added docs2comments filter, with pipedocs and h2a, to replace nountangle
Added nwmtime filter; helps derive Zephyr web pages
Moved the official FAQ to html
Added multiple-language support to noweb.sty (Miguel Filgueiras)
notangle -L initial newline is a bug and will never be fixed (Harald Soleng)
Added \noweboptions{noxref}, intended for temporary use inside documents.

17 files changed, 105 insertions, 165 deletions

diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 0cd95e2b8fc..ca7af5fe6ac 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2008/03/08 13:02:40 tnn Exp $
 
-DISTNAME=		noweb-2.9a
-PKGREVISION=		3
+DISTNAME=		noweb-2.11b
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.cs.virginia.edu/pub/nr/
+MASTER_SITES=		http://www.eecs.harvard.edu/nr/noweb/dist/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -12,28 +11,28 @@ COMMENT=		Simple, extensible literate-programming tool
 
 DEPENDS+=		icon>=9.3:../../lang/icon
 
-WRKSRC=			${WRKDIR}/src
+BUILD_DIRS=		src
 
 .include "../../mk/bsd.prefs.mk"
 
 USE_TOOLS+=	mktemp:run
 
 SUBST_CLASSES+=		mktemp
-SUBST_FILES.mktemp+=	awk/totex.nw lib/toascii shell/toroff shell/noroff
-SUBST_FILES.mktemp+=	shell/nonu shell/cpif awkname shell/roff.nw
-SUBST_FILES.mktemp+=	shell/roff.mm ../contrib/conrado/d2tex
-SUBST_FILES.mktemp+=	../contrib/jobling/correct-refs.nw
-SUBST_FILES.mktemp+=	../contrib/norman/htmlgif/pstopbm
+SUBST_FILES.mktemp+=	src/awk/totex.nw src/lib/toascii src/shell/toroff src/shell/noroff
+SUBST_FILES.mktemp+=	src/shell/nonu src/shell/cpif src/awkname src/shell/roff.nw
+SUBST_FILES.mktemp+=	src/shell/roff.mm contrib/conrado/d2tex
+SUBST_FILES.mktemp+=	contrib/jobling/correct-refs.nw
+SUBST_FILES.mktemp+=	contrib/norman/htmlgif/pstopbm
 SUBST_SED.mktemp+=	-e 's,@MKTEMP@,${TOOLS_PATH.mktemp},g'
 SUBST_STAGE.mktemp=	post-patch
 
 .if ${OPSYS} != "SunOS"
 do-configure:
-	cd ${WRKSRC} && ./awkname awk
+	cd ${WRKSRC}/src && ./awkname awk
 .endif
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/noweb
-	${INSTALL_DATA} ${WRKDIR}/examples/* ${PREFIX}/share/examples/noweb
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/noweb
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/noweb/PLIST b/devel/noweb/PLIST
index b4a9e1c2cd5..92a5d3f7bc0 100644
--- a/devel/noweb/PLIST
+++ b/devel/noweb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/23 15:45:43 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/03/08 13:02:40 tnn Exp $
 bin/cpif
 bin/htmltoc
 bin/nodefs
@@ -27,6 +27,7 @@ man/man7/nowebfilters.7
 man/man7/nowebstyle.7
 share/emacs/site-lisp/noweb-mode.el
 share/examples/noweb/Makefile
+share/examples/noweb/Makefile.awk
 share/examples/noweb/README
 share/examples/noweb/README.h
 share/examples/noweb/breakmodel.nw
@@ -46,31 +47,39 @@ share/examples/noweb/wc.bbl
 share/examples/noweb/wc.nw
 share/examples/noweb/wc.nw2html
 share/examples/noweb/whitespace
+share/noweb/autodefs.asdl
 share/noweb/autodefs.c
 share/noweb/autodefs.icon
 share/noweb/autodefs.lrtl
+share/noweb/autodefs.mmix
 share/noweb/autodefs.pascal
 share/noweb/autodefs.promela
 share/noweb/autodefs.sml
 share/noweb/autodefs.tex
 share/noweb/autodefs.yacc
+share/noweb/btdefn
 share/noweb/disambiguate
+share/noweb/docs2comments
 share/noweb/elide
 share/noweb/emptydefn
 share/noweb/finduses
+share/noweb/h2a
 share/noweb/l2h
 share/noweb/markup
 share/noweb/mnt
 share/noweb/noidx
 share/noweb/nt
+share/noweb/nwmtime
+share/noweb/pipedocs
 share/noweb/tmac.w
 share/noweb/toascii
 share/noweb/tohtml
 share/noweb/toroff
 share/noweb/totex
 share/noweb/unmarkup
+share/noweb/xchunks
 share/texmf/tex/noweb/noweb.sty
 share/texmf/tex/noweb/nwmac.tex
-@dirrm share/examples/noweb
 @dirrm share/texmf/tex/noweb
 @dirrm share/noweb
+@dirrm share/examples/noweb
diff --git a/devel/noweb/distinfo b/devel/noweb/distinfo
index 914f67e794a..9ae6be89167 100644
--- a/devel/noweb/distinfo
+++ b/devel/noweb/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.4 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/03/08 13:02:40 tnn Exp $
 
-SHA1 (noweb-2.9a.tgz) = 0ee5f97c56fa7898be9815ad817036f8aee0193b
-RMD160 (noweb-2.9a.tgz) = ee61f44091d2634550d33528b426af508ffad729
-Size (noweb-2.9a.tgz) = 728608 bytes
-SHA1 (patch-aa) = 0c0c446173c1ee13eeb0b80041cb8cf98e3c7325
-SHA1 (patch-ab) = 99200991f1dab7aaef349611c11a881483f40888
-SHA1 (patch-ac) = 364d7eb43abac9c33807b7b7d20ff9368f7568d2
-SHA1 (patch-ad) = 6102295ab1c37bb16c92cae3c77a97349794cde4
-SHA1 (patch-ae) = 0079598edc015f0ce387cb1058d06581e05f07c6
-SHA1 (patch-af) = 1af1d268381546ff214450caa7914f30106ff131
-SHA1 (patch-ag) = 5e3e8f271f5a80dda593e908fdbff2a7d5cb6dc6
-SHA1 (patch-ah) = 3038e41f2362de61cd3ad0882c7d39cb3b7e952d
-SHA1 (patch-ai) = a9c82e80ac288f7a3316cf3fb671d5a680012054
-SHA1 (patch-aj) = 800210a1143b37e6cb14bc0fdda7ada3b36692e1
-SHA1 (patch-ak) = 8cc2ee6177c633b2e1913790ab63016c19cf5eef
-SHA1 (patch-al) = d9fd8a2b59ef6b4a8cae57815ff339de6df8567d
-SHA1 (patch-am) = 89803aa4d0db6a9dcbb95832193ce19e25d7ff29
-SHA1 (patch-an) = c706aeeadb59d4b21053518d1c5dcb970be7aaae
+SHA1 (noweb-2.11b.tgz) = 3b391c42f46dcb8a002b863fb2e483560a7da51d
+RMD160 (noweb-2.11b.tgz) = 01e4fbb636dfd0f6d117caa045cf105e49d25fca
+Size (noweb-2.11b.tgz) = 738870 bytes
+SHA1 (patch-aa) = a548bc947bc3846e623565e9d875205ed1b772fd
+SHA1 (patch-ac) = 994a31678edea853ffd04012e1c2394cda6e5913
+SHA1 (patch-ad) = 3dbadb8b512da3aee92330f15f1d66d8dc757b53
+SHA1 (patch-ae) = 007f1943f60d1f5b3207bc6bd537b86e71c56a77
+SHA1 (patch-af) = adf5f5ad3d20455ba51e214fbaec947a7dd49e09
+SHA1 (patch-ag) = 35ef16b8165c8667aba59fca55131204ba36bddc
+SHA1 (patch-ah) = 5dc737e43cf92ba96f32b91de65a15cda23ee0d0
+SHA1 (patch-ai) = 4033dbd3b43015c17d370d88cf3918c330ddce23
+SHA1 (patch-aj) = 4c3adff7a08196dffd846b95690f5865ba4e3131
+SHA1 (patch-ak) = 845d4eb472a803e8ad66dce524a8e10084b62b96
+SHA1 (patch-al) = 42e3d05a052b9b00f3da9a9e157035ccd670a73c
+SHA1 (patch-am) = 9ec2e25fe28be98908d3cf3e4b42fff937730f1d
+SHA1 (patch-an) = 3b3a5167920d49ca7b3432250357010eb781b880
diff --git a/devel/noweb/patches/patch-aa b/devel/noweb/patches/patch-aa
index 8c693407217..2061a19f017 100644
--- a/devel/noweb/patches/patch-aa
+++ b/devel/noweb/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2001/04/13 17:58:52 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2008/03/08 13:02:40 tnn Exp $
 
---- Makefile.orig	Mon Aug 17 00:54:11 1998
-+++ Makefile
+--- src/Makefile.orig	2006-06-12 22:14:20.000000000 +0200
++++ src/Makefile
 @@ -2,13 +2,13 @@
  # See file COPYRIGHT for more information.
  #
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2001/04/13 17:58:52 jtb Exp $
  ICONT=icont
  
  # BIN is where the commands (notangle, noweave, nountangle, noroots) land
-@@ -18,13 +18,13 @@
+@@ -18,13 +18,13 @@ ICONT=icont
  # MAN7EXT is the extension for the nowebstyle man page (usually 7)
  # TEXINPUTS is the directory for TeX macro files
  # ELISP is the directory for emacs lisp files, or /dev/null not to install
@@ -39,115 +39,61 @@ $NetBSD: patch-aa,v 1.2 2001/04/13 17:58:52 jtb Exp $
  
  # change WEAVE if you want a different version of noweave to be installed
  WEAVE=noweave		
-@@ -41,14 +41,14 @@
+@@ -40,10 +40,10 @@ CAT7DIR=$(MAN)/cat$(MAN7EXT)
+ LIBNAME=$(LIB)
  TEXNAME=$(TEXINPUTS)
  
- all:
+-all: 
 -	cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
-+	cd c; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all 
++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)
+ FAQ: FAQ.html
+ 	sleep 1; html2ascii FAQ.html > FAQ
+@@ -98,7 +98,6 @@ uninstall-shell:
+ 	rm $(LIB)/tmac.w
  
  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
+@@ -109,7 +108,7 @@ uninstall-code: uninstall-shell
+ 	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
+ 	cd lib; make LIB=$(LIB) uninstall
  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 @@
+@@ -142,6 +141,8 @@ uninstall-man:
+ 	rm -f $(MANDIR)/noweave.$(MANEXT)
  	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)
++	# nothing
++dont-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
+@@ -179,7 +180,7 @@ install-preformat-man:
  	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
  	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
  install-tex:
 -	-mkdir $(TEXINPUTS) 2>/dev/null
 +	-mkdir -p $(TEXINPUTS) 2>/dev/null
  	cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
- 	-texhash
+ 	-texhash || echo "Program texhash not found or failed"
+ 
+@@ -187,7 +188,7 @@ uninstall-tex:
+ 	rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty
  
  install-elisp:
 -	-mkdir $(ELISP) 2>/dev/null
 +	-mkdir -p $(ELISP) 2>/dev/null
  	cp elisp/noweb-mode.el $(ELISP)
  
- checkin:
+ uninstall-elisp:
diff --git a/devel/noweb/patches/patch-ab b/devel/noweb/patches/patch-ab
deleted file mode 100644
index abadfa94d8c..00000000000
--- a/devel/noweb/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/05/23 16:07:04 joerg Exp $
-
---- elisp/noweb-mode.el.orig	1999-02-16 22:12:21.000000000 +0100
-+++ elisp/noweb-mode.el
-@@ -213,7 +213,7 @@ Misc:
-   (add-hook 'isearch-mode-hook 'noweb-note-isearch-mode)
-   (add-hook 'isearch-mode-end-hook 'noweb-note-isearch-mode-end)
-   (run-hooks 'noweb-mode-hook)
--  (message "nobweb mode: use `M-x noweb-describe-mode' for further information"))
-+  (message "noweb mode: use `M-x noweb-describe-mode' for further information"))
- 
- (defun noweb-setup-keymap ()
-   "Setup the noweb-mode keymap.  This function is rerun every time the
diff --git a/devel/noweb/patches/patch-ac b/devel/noweb/patches/patch-ac
index a5770102a9a..867805a65b6 100644
--- a/devel/noweb/patches/patch-ac
+++ b/devel/noweb/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- awkname.orig	1995-05-26 02:49:07.000000000 +0200
-+++ awkname
+--- src/awkname.orig	2000-06-16 22:26:42.000000000 +0200
++++ src/awkname
 @@ -5,7 +5,7 @@ case $# in
  esac
  
@@ -9,5 +9,5 @@ $NetBSD: patch-ac,v 1.1 2006/05/23 16:07:04 joerg Exp $
 -new=/tmp/$$.new; old=/tmp/$$.old
 +new=$(@MKTEMP@ -t noweb_new) || exit 1; old=$(@MKTEMP@ -t noweb_old) || exit 1
  
- for file in lib/emptydefn lib/unmarkup lib/toascii \
+ for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \
                          awk/noidx awk/totex awk/tohtml awk/noindex \
diff --git a/devel/noweb/patches/patch-ad b/devel/noweb/patches/patch-ad
index 3da33d75420..c2cc938afbe 100644
--- a/devel/noweb/patches/patch-ad
+++ b/devel/noweb/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- shell/cpif.orig	1993-03-01 23:22:02.000000000 +0100
-+++ shell/cpif
+--- src/shell/cpif.orig	1993-03-01 23:22:02.000000000 +0100
++++ src/shell/cpif
 @@ -17,7 +17,7 @@ case $# in
  0)		echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2
  esac
diff --git a/devel/noweb/patches/patch-ae b/devel/noweb/patches/patch-ae
index db4ded218ec..f3a5d9c824d 100644
--- a/devel/noweb/patches/patch-ae
+++ b/devel/noweb/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- shell/nonu.orig	1993-08-19 20:46:04.000000000 +0200
-+++ shell/nonu
+--- src/shell/nonu.orig	1993-08-19 20:46:04.000000000 +0200
++++ src/shell/nonu
 @@ -2,7 +2,7 @@
  LIB=/usr/public/pkg/noweb/lib
  # attempt to convert nuweb to noweb using sam
diff --git a/devel/noweb/patches/patch-af b/devel/noweb/patches/patch-af
index 252700e40cf..e620111cc53 100644
--- a/devel/noweb/patches/patch-af
+++ b/devel/noweb/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-af,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- shell/noroff.orig	1999-02-16 22:58:52.000000000 +0100
-+++ shell/noroff
+--- src/shell/noroff.orig	1999-02-16 22:58:52.000000000 +0100
++++ src/shell/noroff
 @@ -35,9 +35,10 @@ fi
  
  base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
diff --git a/devel/noweb/patches/patch-ag b/devel/noweb/patches/patch-ag
index 3173dac0b31..58003c3918e 100644
--- a/devel/noweb/patches/patch-ag
+++ b/devel/noweb/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- shell/toroff.orig	1999-02-16 22:58:52.000000000 +0100
-+++ shell/toroff
+--- src/shell/toroff.orig	1999-02-16 22:58:52.000000000 +0100
++++ src/shell/toroff
 @@ -9,7 +9,7 @@ for i do
             exit 1;;
      esac
diff --git a/devel/noweb/patches/patch-ah b/devel/noweb/patches/patch-ah
index 6401bed751b..3d444f00e1a 100644
--- a/devel/noweb/patches/patch-ah
+++ b/devel/noweb/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- lib/toascii.orig	1999-02-16 22:58:52.000000000 +0100
-+++ lib/toascii
+--- src/lib/toascii.orig	1999-02-16 22:58:52.000000000 +0100
++++ src/lib/toascii
 @@ -7,9 +7,9 @@ for i do
                  *)      echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
          esac
diff --git a/devel/noweb/patches/patch-ai b/devel/noweb/patches/patch-ai
index dd0319fe7de..74e0da5a61c 100644
--- a/devel/noweb/patches/patch-ai
+++ b/devel/noweb/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- awk/totex.nw.orig	1996-05-31 21:04:15.000000000 +0200
-+++ awk/totex.nw
+--- src/awk/totex.nw.orig	1996-05-31 21:04:15.000000000 +0200
++++ src/awk/totex.nw
 @@ -24,7 +24,7 @@ nawk '<<awk program for conversion to {\
  @
  On an ugly system, we have to put it in a file.
diff --git a/devel/noweb/patches/patch-aj b/devel/noweb/patches/patch-aj
index c40f9e5938d..4718c814fad 100644
--- a/devel/noweb/patches/patch-aj
+++ b/devel/noweb/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- ../contrib/norman/htmlgif/pstopbm.orig	1998-08-07 20:29:32.000000000 +0200
-+++ ../contrib/norman/htmlgif/pstopbm
+--- contrib/norman/htmlgif/pstopbm.orig	1998-08-07 20:29:32.000000000 +0200
++++ contrib/norman/htmlgif/pstopbm
 @@ -36,8 +36,8 @@ while [ $# -gt 0 ]; do
    shift
  done
diff --git a/devel/noweb/patches/patch-ak b/devel/noweb/patches/patch-ak
index 623dd523829..c2a9bae649b 100644
--- a/devel/noweb/patches/patch-ak
+++ b/devel/noweb/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- ../contrib/jobling/correct-refs.nw.orig	1995-05-24 20:12:48.000000000 +0200
-+++ ../contrib/jobling/correct-refs.nw
+--- contrib/jobling/correct-refs.nw.orig	1995-05-24 20:12:48.000000000 +0200
++++ contrib/jobling/correct-refs.nw
 @@ -332,11 +332,12 @@ gawk -f $LIB/awk-scripts.awk anchor-list
  echo Processing HTML nodes
  foreach f (*.awk)
diff --git a/devel/noweb/patches/patch-al b/devel/noweb/patches/patch-al
index a092713f940..1b5d3b799e8 100644
--- a/devel/noweb/patches/patch-al
+++ b/devel/noweb/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-al,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- ../contrib/conrado/d2tex.orig	1993-10-27 18:37:11.000000000 +0100
-+++ ../contrib/conrado/d2tex
+--- contrib/conrado/d2tex.orig	1993-10-27 18:37:11.000000000 +0100
++++ contrib/conrado/d2tex
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -KEYGEN=/tmp/d2tex$$
diff --git a/devel/noweb/patches/patch-am b/devel/noweb/patches/patch-am
index ab228fd90d3..5c101805a8c 100644
--- a/devel/noweb/patches/patch-am
+++ b/devel/noweb/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-am,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- shell/roff.mm.orig	1998-08-18 21:33:04.000000000 +0200
-+++ shell/roff.mm
+--- src/shell/roff.mm.orig	1998-08-18 21:33:04.000000000 +0200
++++ src/shell/roff.mm
 @@ -214,7 +214,7 @@ copy the awk program into a temporary fi
  .ADDLIST 1a
  .PRINTLIST
diff --git a/devel/noweb/patches/patch-an b/devel/noweb/patches/patch-an
index 0fa859b027a..f764a469849 100644
--- a/devel/noweb/patches/patch-an
+++ b/devel/noweb/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1 2006/05/23 16:07:04 joerg Exp $
+$NetBSD: patch-an,v 1.2 2008/03/08 13:02:40 tnn Exp $
 
---- shell/roff.nw.orig	1998-08-17 02:27:09.000000000 +0200
-+++ shell/roff.nw
+--- src/shell/roff.nw.orig	1998-08-17 02:27:09.000000000 +0200
++++ src/shell/roff.nw
 @@ -80,7 +80,8 @@ single quotes and double quotes, so neit
  other, and quoting each quote is ugly.  The pragmatic solution is to
  copy the awk program into a temporary file, using a shell here-document.