Sat Mar 8 13:02:40 2008 UTC ()
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.


(tnn)
diff -r1.35 -r1.36 pkgsrc/devel/noweb/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/noweb/PLIST
diff -r1.4 -r1.5 pkgsrc/devel/noweb/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/noweb/patches/patch-aa
diff -r1.1 -r0 pkgsrc/devel/noweb/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-af
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ag
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ai
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-aj
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ak
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-al
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-am
diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-an

cvs diff -r1.35 -r1.36 pkgsrc/devel/noweb/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/noweb/Makefile 2006/10/04 21:35:59 1.35
+++ pkgsrc/devel/noweb/Makefile 2008/03/08 13:02:40 1.36
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.35 2006/10/04 21:35:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2008/03/08 13:02:40 tnn Exp $
2 2
3DISTNAME= noweb-2.9a 3DISTNAME= noweb-2.11b
4PKGREVISION= 3 
5CATEGORIES= devel 4CATEGORIES= devel
6MASTER_SITES= ftp://ftp.cs.virginia.edu/pub/nr/ 5MASTER_SITES= http://www.eecs.harvard.edu/nr/noweb/dist/
7EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.eecs.harvard.edu/~nr/noweb/ 9HOMEPAGE= http://www.eecs.harvard.edu/~nr/noweb/
11COMMENT= Simple, extensible literate-programming tool 10COMMENT= Simple, extensible literate-programming tool
12 11
13DEPENDS+= icon>=9.3:../../lang/icon 12DEPENDS+= icon>=9.3:../../lang/icon
14 13
15WRKSRC= ${WRKDIR}/src 14BUILD_DIRS= src
16 15
17.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
18 17
19USE_TOOLS+= mktemp:run 18USE_TOOLS+= mktemp:run
20 19
21SUBST_CLASSES+= mktemp 20SUBST_CLASSES+= mktemp
22SUBST_FILES.mktemp+= awk/totex.nw lib/toascii shell/toroff shell/noroff 21SUBST_FILES.mktemp+= src/awk/totex.nw src/lib/toascii src/shell/toroff src/shell/noroff
23SUBST_FILES.mktemp+= shell/nonu shell/cpif awkname shell/roff.nw 22SUBST_FILES.mktemp+= src/shell/nonu src/shell/cpif src/awkname src/shell/roff.nw
24SUBST_FILES.mktemp+= shell/roff.mm ../contrib/conrado/d2tex 23SUBST_FILES.mktemp+= src/shell/roff.mm contrib/conrado/d2tex
25SUBST_FILES.mktemp+= ../contrib/jobling/correct-refs.nw 24SUBST_FILES.mktemp+= contrib/jobling/correct-refs.nw
26SUBST_FILES.mktemp+= ../contrib/norman/htmlgif/pstopbm 25SUBST_FILES.mktemp+= contrib/norman/htmlgif/pstopbm
27SUBST_SED.mktemp+= -e 's,@MKTEMP@,${TOOLS_PATH.mktemp},g' 26SUBST_SED.mktemp+= -e 's,@MKTEMP@,${TOOLS_PATH.mktemp},g'
28SUBST_STAGE.mktemp= post-patch 27SUBST_STAGE.mktemp= post-patch
29 28
30.if ${OPSYS} != "SunOS" 29.if ${OPSYS} != "SunOS"
31do-configure: 30do-configure:
32 cd ${WRKSRC} && ./awkname awk 31 cd ${WRKSRC}/src && ./awkname awk
33.endif 32.endif
34 33
35post-install: 34post-install:
36 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/noweb 35 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/noweb
37 ${INSTALL_DATA} ${WRKDIR}/examples/* ${PREFIX}/share/examples/noweb 36 ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/noweb
38 37
39.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/devel/noweb/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/noweb/PLIST 2005/10/23 15:45:43 1.2
+++ pkgsrc/devel/noweb/PLIST 2008/03/08 13:02:40 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2005/10/23 15:45:43 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/03/08 13:02:40 tnn Exp $
2bin/cpif 2bin/cpif
3bin/htmltoc 3bin/htmltoc
4bin/nodefs 4bin/nodefs
5bin/noindex 5bin/noindex
6bin/noroff 6bin/noroff
7bin/noroots 7bin/noroots
8bin/notangle 8bin/notangle
9bin/nountangle 9bin/nountangle
10bin/noweave 10bin/noweave
11bin/noweb 11bin/noweb
12bin/nuweb2noweb 12bin/nuweb2noweb
13bin/sl2h 13bin/sl2h
14man/man1/cpif.1 14man/man1/cpif.1
@@ -17,60 +17,69 @@ man/man1/nodefs.1 @@ -17,60 +17,69 @@ man/man1/nodefs.1
17man/man1/noindex.1 17man/man1/noindex.1
18man/man1/noroff.1 18man/man1/noroff.1
19man/man1/noroots.1 19man/man1/noroots.1
20man/man1/notangle.1 20man/man1/notangle.1
21man/man1/nountangle.1 21man/man1/nountangle.1
22man/man1/noweave.1 22man/man1/noweave.1
23man/man1/noweb.1 23man/man1/noweb.1
24man/man1/nuweb2noweb.1 24man/man1/nuweb2noweb.1
25man/man1/sl2h.1 25man/man1/sl2h.1
26man/man7/nowebfilters.7 26man/man7/nowebfilters.7
27man/man7/nowebstyle.7 27man/man7/nowebstyle.7
28share/emacs/site-lisp/noweb-mode.el 28share/emacs/site-lisp/noweb-mode.el
29share/examples/noweb/Makefile 29share/examples/noweb/Makefile
 30share/examples/noweb/Makefile.awk
30share/examples/noweb/README 31share/examples/noweb/README
31share/examples/noweb/README.h 32share/examples/noweb/README.h
32share/examples/noweb/breakmodel.nw 33share/examples/noweb/breakmodel.nw
33share/examples/noweb/compress.nw 34share/examples/noweb/compress.nw
34share/examples/noweb/dag.nw 35share/examples/noweb/dag.nw
35share/examples/noweb/graphs.nw 36share/examples/noweb/graphs.nw
36share/examples/noweb/mipscoder.nw 37share/examples/noweb/mipscoder.nw
37share/examples/noweb/multicol.sty 38share/examples/noweb/multicol.sty
38share/examples/noweb/primes.bbl 39share/examples/noweb/primes.bbl
39share/examples/noweb/primes.blg 40share/examples/noweb/primes.blg
40share/examples/noweb/primes.nw 41share/examples/noweb/primes.nw
41share/examples/noweb/scanner.nw 42share/examples/noweb/scanner.nw
42share/examples/noweb/sharpline 43share/examples/noweb/sharpline
43share/examples/noweb/test.nw 44share/examples/noweb/test.nw
44share/examples/noweb/tree.nw 45share/examples/noweb/tree.nw
45share/examples/noweb/wc.bbl 46share/examples/noweb/wc.bbl
46share/examples/noweb/wc.nw 47share/examples/noweb/wc.nw
47share/examples/noweb/wc.nw2html 48share/examples/noweb/wc.nw2html
48share/examples/noweb/whitespace 49share/examples/noweb/whitespace
 50share/noweb/autodefs.asdl
49share/noweb/autodefs.c 51share/noweb/autodefs.c
50share/noweb/autodefs.icon 52share/noweb/autodefs.icon
51share/noweb/autodefs.lrtl 53share/noweb/autodefs.lrtl
 54share/noweb/autodefs.mmix
52share/noweb/autodefs.pascal 55share/noweb/autodefs.pascal
53share/noweb/autodefs.promela 56share/noweb/autodefs.promela
54share/noweb/autodefs.sml 57share/noweb/autodefs.sml
55share/noweb/autodefs.tex 58share/noweb/autodefs.tex
56share/noweb/autodefs.yacc 59share/noweb/autodefs.yacc
 60share/noweb/btdefn
57share/noweb/disambiguate 61share/noweb/disambiguate
 62share/noweb/docs2comments
58share/noweb/elide 63share/noweb/elide
59share/noweb/emptydefn 64share/noweb/emptydefn
60share/noweb/finduses 65share/noweb/finduses
 66share/noweb/h2a
61share/noweb/l2h 67share/noweb/l2h
62share/noweb/markup 68share/noweb/markup
63share/noweb/mnt 69share/noweb/mnt
64share/noweb/noidx 70share/noweb/noidx
65share/noweb/nt 71share/noweb/nt
 72share/noweb/nwmtime
 73share/noweb/pipedocs
66share/noweb/tmac.w 74share/noweb/tmac.w
67share/noweb/toascii 75share/noweb/toascii
68share/noweb/tohtml 76share/noweb/tohtml
69share/noweb/toroff 77share/noweb/toroff
70share/noweb/totex 78share/noweb/totex
71share/noweb/unmarkup 79share/noweb/unmarkup
 80share/noweb/xchunks
72share/texmf/tex/noweb/noweb.sty 81share/texmf/tex/noweb/noweb.sty
73share/texmf/tex/noweb/nwmac.tex 82share/texmf/tex/noweb/nwmac.tex
74@dirrm share/examples/noweb 
75@dirrm share/texmf/tex/noweb 83@dirrm share/texmf/tex/noweb
76@dirrm share/noweb 84@dirrm share/noweb
 85@dirrm share/examples/noweb

cvs diff -r1.4 -r1.5 pkgsrc/devel/noweb/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/noweb/distinfo 2006/05/23 16:07:04 1.4
+++ pkgsrc/devel/noweb/distinfo 2008/03/08 13:02:40 1.5
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1$NetBSD: distinfo,v 1.4 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2008/03/08 13:02:40 tnn Exp $
2 2
3SHA1 (noweb-2.9a.tgz) = 0ee5f97c56fa7898be9815ad817036f8aee0193b 3SHA1 (noweb-2.11b.tgz) = 3b391c42f46dcb8a002b863fb2e483560a7da51d
4RMD160 (noweb-2.9a.tgz) = ee61f44091d2634550d33528b426af508ffad729 4RMD160 (noweb-2.11b.tgz) = 01e4fbb636dfd0f6d117caa045cf105e49d25fca
5Size (noweb-2.9a.tgz) = 728608 bytes 5Size (noweb-2.11b.tgz) = 738870 bytes
6SHA1 (patch-aa) = 0c0c446173c1ee13eeb0b80041cb8cf98e3c7325 6SHA1 (patch-aa) = a548bc947bc3846e623565e9d875205ed1b772fd
7SHA1 (patch-ab) = 99200991f1dab7aaef349611c11a881483f40888 7SHA1 (patch-ac) = 994a31678edea853ffd04012e1c2394cda6e5913
8SHA1 (patch-ac) = 364d7eb43abac9c33807b7b7d20ff9368f7568d2 8SHA1 (patch-ad) = 3dbadb8b512da3aee92330f15f1d66d8dc757b53
9SHA1 (patch-ad) = 6102295ab1c37bb16c92cae3c77a97349794cde4 9SHA1 (patch-ae) = 007f1943f60d1f5b3207bc6bd537b86e71c56a77
10SHA1 (patch-ae) = 0079598edc015f0ce387cb1058d06581e05f07c6 10SHA1 (patch-af) = adf5f5ad3d20455ba51e214fbaec947a7dd49e09
11SHA1 (patch-af) = 1af1d268381546ff214450caa7914f30106ff131 11SHA1 (patch-ag) = 35ef16b8165c8667aba59fca55131204ba36bddc
12SHA1 (patch-ag) = 5e3e8f271f5a80dda593e908fdbff2a7d5cb6dc6 12SHA1 (patch-ah) = 5dc737e43cf92ba96f32b91de65a15cda23ee0d0
13SHA1 (patch-ah) = 3038e41f2362de61cd3ad0882c7d39cb3b7e952d 13SHA1 (patch-ai) = 4033dbd3b43015c17d370d88cf3918c330ddce23
14SHA1 (patch-ai) = a9c82e80ac288f7a3316cf3fb671d5a680012054 14SHA1 (patch-aj) = 4c3adff7a08196dffd846b95690f5865ba4e3131
15SHA1 (patch-aj) = 800210a1143b37e6cb14bc0fdda7ada3b36692e1 15SHA1 (patch-ak) = 845d4eb472a803e8ad66dce524a8e10084b62b96
16SHA1 (patch-ak) = 8cc2ee6177c633b2e1913790ab63016c19cf5eef 16SHA1 (patch-al) = 42e3d05a052b9b00f3da9a9e157035ccd670a73c
17SHA1 (patch-al) = d9fd8a2b59ef6b4a8cae57815ff339de6df8567d 17SHA1 (patch-am) = 9ec2e25fe28be98908d3cf3e4b42fff937730f1d
18SHA1 (patch-am) = 89803aa4d0db6a9dcbb95832193ce19e25d7ff29 18SHA1 (patch-an) = 3b3a5167920d49ca7b3432250357010eb781b880
19SHA1 (patch-an) = c706aeeadb59d4b21053518d1c5dcb970be7aaae 

cvs diff -r1.2 -r1.3 pkgsrc/devel/noweb/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-aa 2001/04/13 17:58:52 1.2
+++ pkgsrc/devel/noweb/patches/patch-aa 2008/03/08 13:02:40 1.3
@@ -1,153 +1,99 @@ @@ -1,153 +1,99 @@
1$NetBSD: patch-aa,v 1.2 2001/04/13 17:58:52 jtb Exp $ 1$NetBSD: patch-aa,v 1.3 2008/03/08 13:02:40 tnn Exp $
2 2
3--- Makefile.orig Mon Aug 17 00:54:11 1998 3--- src/Makefile.orig 2006-06-12 22:14:20.000000000 +0200
4+++ Makefile 4+++ src/Makefile
5@@ -2,13 +2,13 @@ 5@@ -2,13 +2,13 @@
6 # See file COPYRIGHT for more information. 6 # See file COPYRIGHT for more information.
7 # 7 #
8 # Adjust these two lines for your ANSI C compiler 8 # Adjust these two lines for your ANSI C compiler
9-CC=gcc -ansi -pedantic 9-CC=gcc -ansi -pedantic
10-CFLAGS= 10-CFLAGS=
11+# CC=gcc -ansi -pedantic 11+# CC=gcc -ansi -pedantic
12+#CFLAGS= 12+#CFLAGS=
13 # If you have Icon, you should use the Icon versions of the noweb pipeline. 13 # If you have Icon, you should use the Icon versions of the noweb pipeline.
14 # Set LIBSRC=icon 14 # Set LIBSRC=icon
15-LIBSRC=awk 15-LIBSRC=awk
16+LIBSRC=icon 16+LIBSRC=icon
17 # If you have no Icon compiler, but do have icont, make ICONC=icont 17 # If you have no Icon compiler, but do have icont, make ICONC=icont
18-ICONC=iconc 18-ICONC=iconc
19+ICONC=icont 19+ICONC=icont
20 ICONT=icont 20 ICONT=icont
21  21
22 # BIN is where the commands (notangle, noweave, nountangle, noroots) land 22 # BIN is where the commands (notangle, noweave, nountangle, noroots) land
23@@ -18,13 +18,13 @@ 23@@ -18,13 +18,13 @@ ICONT=icont
24 # MAN7EXT is the extension for the nowebstyle man page (usually 7) 24 # MAN7EXT is the extension for the nowebstyle man page (usually 7)
25 # TEXINPUTS is the directory for TeX macro files 25 # TEXINPUTS is the directory for TeX macro files
26 # ELISP is the directory for emacs lisp files, or /dev/null not to install 26 # ELISP is the directory for emacs lisp files, or /dev/null not to install
27-BIN=/usr/local/noweb 27-BIN=/usr/local/noweb
28-LIB=/usr/local/noweb/lib 28-LIB=/usr/local/noweb/lib
29-MAN=/usr/local/noweb/man 29-MAN=/usr/local/noweb/man
30+BIN=${PREFIX}/bin 30+BIN=${PREFIX}/bin
31+LIB=${PREFIX}/share/noweb 31+LIB=${PREFIX}/share/noweb
32+MAN=${PREFIX}/man 32+MAN=${PREFIX}/man
33 MANEXT=1 33 MANEXT=1
34 MAN7EXT=7 34 MAN7EXT=7
35-TEXINPUTS=/usr/local/tex/inputs 35-TEXINPUTS=/usr/local/tex/inputs
36-ELISP=/dev/null 36-ELISP=/dev/null
37+TEXINPUTS=${PREFIX}/share/texmf/tex/noweb 37+TEXINPUTS=${PREFIX}/share/texmf/tex/noweb
38+ELISP=${PREFIX}/share/emacs/site-lisp 38+ELISP=${PREFIX}/share/emacs/site-lisp
39  39
40 # change WEAVE if you want a different version of noweave to be installed 40 # change WEAVE if you want a different version of noweave to be installed
41 WEAVE=noweave  41 WEAVE=noweave
42@@ -41,14 +41,14 @@ 42@@ -40,10 +40,10 @@ CAT7DIR=$(MAN)/cat$(MAN7EXT)
 43 LIBNAME=$(LIB)
43 TEXNAME=$(TEXINPUTS) 44 TEXNAME=$(TEXINPUTS)
44  45
45 all: 46-all:
46- cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all  47- cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
47+ cd c; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all  48+all:
 49+ cd c; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all
48 for i in shell lib xdoc tex; do (cd $$i; make all); done 50 for i in shell lib xdoc tex; do (cd $$i; make all); done
49- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all 51- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
50+ cd $(LIBSRC); make ICONT="$(ICONT)" ICONC="$(ICONC)" all 52+ cd $(LIBSRC); make ICONT="$(ICONT)" ICONC="$(ICONC)" all
51  53
52 install: install-code install-man install-tex install-elisp 54 FAQ: FAQ.html
53  55 sleep 1; html2ascii FAQ.html > FAQ
54 install-shell: 56@@ -98,7 +98,6 @@ uninstall-shell:
55- -mkdir $(BIN) $(LIB) 2>/dev/null 57 rm $(LIB)/tmac.w
56+ -mkdir -p $(BIN) $(LIB) 2>/dev/null 
57 sed "s@|LIBDIR|@$(LIBNAME)@" shell/noweb > $(BIN)/noweb 
58 chmod +x $(BIN)/noweb 
59 sed "s@|LIBDIR|@$(LIBNAME)@" shell/notangle > $(BIN)/notangle 
60@@ -74,13 +74,13 @@ 
61 cp shell/tmac.w $(LIB) 
62  58
63 install-code: install-shell 59 install-code: install-shell
64- -mkdir $(BIN) $(LIB) 2>/dev/null 60- -mkdir $(BIN) $(LIB) 2>/dev/null
65+ -mkdir -p $(BIN) $(LIB) 2>/dev/null 
66 strip c/nt c/markup c/mnt c/finduses 61 strip c/nt c/markup c/mnt c/finduses
67 cp c/nt c/markup c/mnt c/finduses $(LIB) 62 cp c/nt c/markup c/mnt c/finduses $(LIB)
68 cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install 63 cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
69 cd lib; make LIB=$(LIB) install 64@@ -109,7 +108,7 @@ uninstall-code: uninstall-shell
 65 cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
 66 cd lib; make LIB=$(LIB) uninstall
70 install-man: 67 install-man:
71- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null 68- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
72+ -mkdir -p $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null 69+ -mkdir -p $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
73 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT) 70 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
74 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(MANDIR)/nodefs.$(MANEXT) 71 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(MANDIR)/nodefs.$(MANEXT)
75 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT) 72 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT)
76@@ -98,49 +98,49 @@ 73@@ -142,6 +141,8 @@ uninstall-man:
 74 rm -f $(MANDIR)/noweave.$(MANEXT)
77 rm -f $(MANDIR)/nountangle.$(MANEXT) 75 rm -f $(MANDIR)/nountangle.$(MANEXT)
78 (cd $(MANDIR); ln notangle.$(MANEXT) nountangle.$(MANEXT)) 
79 install-gzipped-man: 76 install-gzipped-man:
80- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null 77+ # nothing
81- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 | gzip -9 > $(MANDIR)/cpif.$(MANEXT).gz 78+dont-install-gzipped-man:
82- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 | gzip -9 > $(MANDIR)/nodefs.$(MANEXT).gz 79 -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
83- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 | gzip -9 > $(MANDIR)/noroots.$(MANEXT).gz 80 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 | gzip -9 > $(MANDIR)/cpif.$(MANEXT).gz
84- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1 | gzip -9 > $(MANDIR)/noweb.$(MANEXT).gz 81 sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 | gzip -9 > $(MANDIR)/nodefs.$(MANEXT).gz
85- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 | gzip -9 > $(MANDIR)/noindex.$(MANEXT).gz 82@@ -179,7 +180,7 @@ install-preformat-man:
86- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1 | gzip -9 > $(MANDIR)/nuweb2noweb.$(MANEXT).gz 
87- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 | gzip -9 > $(MANDIR)/notangle.$(MANEXT).gz 
88- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 | gzip -9 > $(MANDIR)/noroff.$(MANEXT).gz 
89- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1 | gzip -9 > $(MANDIR)/sl2h.$(MANEXT).gz 
90- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 | gzip -9 > $(MANDIR)/htmltoc.$(MANEXT).gz 
91- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 | gzip -9 > $(MAN7DIR)/nowebstyle.$(MAN7EXT).gz 
92- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 | gzip -9 > $(MAN7DIR)/nowebfilters.$(MAN7EXT).gz 
93+ -mkdir -p $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null 
94+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT) 
95+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(MANDIR)/nodefs.$(MANEXT) 
96+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT) 
97+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1 > $(MANDIR)/noweb.$(MANEXT) 
98+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 > $(MANDIR)/noindex.$(MANEXT) 
99+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1 > $(MANDIR)/nuweb2noweb.$(MANEXT) 
100+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 > $(MANDIR)/notangle.$(MANEXT) 
101+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 > $(MANDIR)/noroff.$(MANEXT) 
102+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1 > $(MANDIR)/sl2h.$(MANEXT) 
103+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 > $(MANDIR)/htmltoc.$(MANEXT) 
104+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 > $(MAN7DIR)/nowebstyle.$(MAN7EXT) 
105+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 > $(MAN7DIR)/nowebfilters.$(MAN7EXT) 
106 rm -f $(MANDIR)/noweave.$(MANEXT).gz 
107 (cd $(MANDIR); ln notangle.$(MANEXT).gz noweave.$(MANEXT).gz) 
108 rm -f $(MANDIR)/nountangle.$(MANEXT).gz 
109 (cd $(MANDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz) 
110 install-preformat-man: 
111 -echo "Warning: install-preformat-man is obsolete, even on Slackware systems" 1>&2 
112- -mkdir $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null 
113- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt | gzip > $(CATDIR)/cpif.$(MANEXT).gz 
114- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt | gzip > $(CATDIR)/nodefs.$(MANEXT).gz 
115- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt | gzip > $(CATDIR)/noroots.$(MANEXT).gz 
116- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.txt | gzip > $(CATDIR)/noweb.$(MANEXT).gz 
117- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.txt | gzip > $(CATDIR)/noindex.$(MANEXT).gz 
118- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.txt | gzip > $(CATDIR)/nuweb2noweb.$(MANEXT).gz 
119- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.txt | gzip > $(CATDIR)/notangle.$(MANEXT).gz 
120- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.txt | gzip > $(CATDIR)/noroff.$(MANEXT).gz 
121- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.txt | gzip > $(CATDIR)/sl2h.$(MANEXT).gz 
122- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.txt | gzip > $(CATDIR)/htmltoc.$(MANEXT).gz 
123- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.txt | gzip > $(CAT7DIR)/nowebstyle.$(MAN7EXT).gz 
124- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.txt | gzip > $(CAT7DIR)/nowebfilters.$(MAN7EXT).gz 
125+ -mkdir -p $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null 
126+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt > $(CATDIR)/cpif.$(MANEXT) 
127+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt > $(CATDIR)/nodefs.$(MANEXT) 
128+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt > $(CATDIR)/noroots.$(MANEXT) 
129+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.txt > $(CATDIR)/noweb.$(MANEXT) 
130+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.txt > $(CATDIR)/noindex.$(MANEXT) 
131+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.txt > $(CATDIR)/nuweb2noweb.$(MANEXT) 
132+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.txt > $(CATDIR)/notangle.$(MANEXT) 
133+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.txt > $(CATDIR)/noroff.$(MANEXT) 
134+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.txt > $(CATDIR)/sl2h.$(MANEXT) 
135+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.txt > $(CATDIR)/htmltoc.$(MANEXT) 
136+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.txt > $(CAT7DIR)/nowebstyle.$(MAN7EXT) 
137+ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.txt > $(CAT7DIR)/nowebfilters.$(MAN7EXT) 
138 rm -f $(CATDIR)/noweave.$(MANEXT).gz 
139 (cd $(CATDIR); ln notangle.$(MANEXT).gz noweave.$(MANEXT).gz) 
140 rm -f $(CATDIR)/nountangle.$(MANEXT).gz 83 rm -f $(CATDIR)/nountangle.$(MANEXT).gz
141 (cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz) 84 (cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
142 install-tex: 85 install-tex:
143- -mkdir $(TEXINPUTS) 2>/dev/null 86- -mkdir $(TEXINPUTS) 2>/dev/null
144+ -mkdir -p $(TEXINPUTS) 2>/dev/null 87+ -mkdir -p $(TEXINPUTS) 2>/dev/null
145 cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS) 88 cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
146 -texhash 89 -texhash || echo "Program texhash not found or failed"
 90
 91@@ -187,7 +188,7 @@ uninstall-tex:
 92 rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty
147  93
148 install-elisp: 94 install-elisp:
149- -mkdir $(ELISP) 2>/dev/null 95- -mkdir $(ELISP) 2>/dev/null
150+ -mkdir -p $(ELISP) 2>/dev/null 96+ -mkdir -p $(ELISP) 2>/dev/null
151 cp elisp/noweb-mode.el $(ELISP) 97 cp elisp/noweb-mode.el $(ELISP)
152  98
153 checkin: 99 uninstall-elisp:

File Deleted: pkgsrc/devel/noweb/patches/patch-ab

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ac 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ac 2008/03/08 13:02:40 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- awkname.orig 1995-05-26 02:49:07.000000000 +0200 3--- src/awkname.orig 2000-06-16 22:26:42.000000000 +0200
4+++ awkname 4+++ src/awkname
5@@ -5,7 +5,7 @@ case $# in 5@@ -5,7 +5,7 @@ case $# in
6 esac 6 esac
7  7
8 rc=0 8 rc=0
9-new=/tmp/$$.new; old=/tmp/$$.old 9-new=/tmp/$$.new; old=/tmp/$$.old
10+new=$(@MKTEMP@ -t noweb_new) || exit 1; old=$(@MKTEMP@ -t noweb_old) || exit 1 10+new=$(@MKTEMP@ -t noweb_new) || exit 1; old=$(@MKTEMP@ -t noweb_old) || exit 1
11  11
12 for file in lib/emptydefn lib/unmarkup lib/toascii \ 12 for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \
13 awk/noidx awk/totex awk/tohtml awk/noindex \ 13 awk/noidx awk/totex awk/tohtml awk/noindex \

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ad 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ad 2008/03/08 13:02:40 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ad,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- shell/cpif.orig 1993-03-01 23:22:02.000000000 +0100 3--- src/shell/cpif.orig 1993-03-01 23:22:02.000000000 +0100
4+++ shell/cpif 4+++ src/shell/cpif
5@@ -17,7 +17,7 @@ case $# in 5@@ -17,7 +17,7 @@ case $# in
6 0) echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2 6 0) echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2
7 esac 7 esac
8  8
9-new=/tmp/$$ 9-new=/tmp/$$
10+new=$(@MKTEMP@ noweb) || exit 1 10+new=$(@MKTEMP@ noweb) || exit 1
11 trap 'rm -f $new; exit 1' 1 2 15 # clean up files 11 trap 'rm -f $new; exit 1' 1 2 15 # clean up files
12  12
13 cat >$new 13 cat >$new

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ae 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ae 2008/03/08 13:02:40 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ae,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ae,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- shell/nonu.orig 1993-08-19 20:46:04.000000000 +0200 3--- src/shell/nonu.orig 1993-08-19 20:46:04.000000000 +0200
4+++ shell/nonu 4+++ src/shell/nonu
5@@ -2,7 +2,7 @@ 5@@ -2,7 +2,7 @@
6 LIB=/usr/public/pkg/noweb/lib 6 LIB=/usr/public/pkg/noweb/lib
7 # attempt to convert nuweb to noweb using sam 7 # attempt to convert nuweb to noweb using sam
8  8
9-tmp=/tmp/nonu$$ 9-tmp=/tmp/nonu$$
10+tmp=$(@MKTEMP@ -t nonu) || exit 1 10+tmp=$(@MKTEMP@ -t nonu) || exit 1
11 trap '/bin/rm -f $tmp; exit 1' 1 2 15 # clean up files 11 trap '/bin/rm -f $tmp; exit 1' 1 2 15 # clean up files
12 cp $1 $tmp || exit 1 12 cp $1 $tmp || exit 1
13  13

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-af 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-af 2008/03/08 13:02:40 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-af,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-af,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- shell/noroff.orig 1999-02-16 22:58:52.000000000 +0100 3--- src/shell/noroff.orig 1999-02-16 22:58:52.000000000 +0100
4+++ shell/noroff 4+++ src/shell/noroff
5@@ -35,9 +35,10 @@ fi 5@@ -35,9 +35,10 @@ fi
6  6
7 base="`basename $1 | sed '/\./s/\.[^.]*$//'`" 7 base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
8 tagsfile="$base.nwt" 8 tagsfile="$base.nwt"
9+tmpfile=$(@MKTEMP@ tags) || exit 1 9+tmpfile=$(@MKTEMP@ tags) || exit 1
10 (echo ".so $macrodir/tmac.w" 10 (echo ".so $macrodir/tmac.w"
11 if [ -r "$tagsfile" ]; then  11 if [ -r "$tagsfile" ]; then
12- cp $tagsfile /tmp/tags.$$ 12- cp $tagsfile /tmp/tags.$$
13+ cp $tagsfile $tmpfile 13+ cp $tagsfile $tmpfile
14 $AWK '{ 14 $AWK '{
15 if (sub(/^###TAG### / , "")) tags[$1] = $2 15 if (sub(/^###TAG### / , "")) tags[$1] = $2
16 else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n" 16 else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n"
17@@ -88,8 +89,8 @@ if [ -r "$tagsfile" ]; then  17@@ -88,8 +89,8 @@ if [ -r "$tagsfile" ]; then

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ag 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ag 2008/03/08 13:02:40 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ag,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ag,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- shell/toroff.orig 1999-02-16 22:58:52.000000000 +0100 3--- src/shell/toroff.orig 1999-02-16 22:58:52.000000000 +0100
4+++ shell/toroff 4+++ src/shell/toroff
5@@ -9,7 +9,7 @@ for i do 5@@ -9,7 +9,7 @@ for i do
6 exit 1;; 6 exit 1;;
7 esac 7 esac
8 done 8 done
9-awkfile="/tmp/noweb$$.awk" 9-awkfile="/tmp/noweb$$.awk"
10+awkfile=$(@MKTEMP@ -t noweb) || exit 1 10+awkfile=$(@MKTEMP@ -t noweb) || exit 1
11 trap 'rm -f $awkfile' 0 1 2 10 14 15 11 trap 'rm -f $awkfile' 0 1 2 10 14 15
12 cat > $awkfile << 'EOF' 12 cat > $awkfile << 'EOF'
13 /^@begin docs 0$/ { if (delay) next } 13 /^@begin docs 0$/ { if (delay) next }

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ah 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ah 2008/03/08 13:02:40 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ah,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ah,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- lib/toascii.orig 1999-02-16 22:58:52.000000000 +0100 3--- src/lib/toascii.orig 1999-02-16 22:58:52.000000000 +0100
4+++ lib/toascii 4+++ src/lib/toascii
5@@ -7,9 +7,9 @@ for i do 5@@ -7,9 +7,9 @@ for i do
6 *) echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;; 6 *) echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
7 esac 7 esac
8 done 8 done
9-awkfile="tmp/awk$$.tmp" 9-awkfile="tmp/awk$$.tmp"
10-textfile="/tmp/text$$.tmp" 10-textfile="/tmp/text$$.tmp"
11-tagsfile="/tmp/tags$$.tmp" 11-tagsfile="/tmp/tags$$.tmp"
12+awkfile=$(@MKTEMP@ -t awk -s) || exit 1 12+awkfile=$(@MKTEMP@ -t awk -s) || exit 1
13+textfile=$(@MKTEMP@ -t text -s) || exit 1 13+textfile=$(@MKTEMP@ -t text -s) || exit 1
14+tagsfile=$(@MKTEMP@ -t tags -s) || exit 1 14+tagsfile=$(@MKTEMP@ -t tags -s) || exit 1
15 export awkfile textfile tagsfile 15 export awkfile textfile tagsfile
16 trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15 16 trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
17 nawk 'BEGIN { textfile=ENVIRON["textfile"] 17 nawk 'BEGIN { textfile=ENVIRON["textfile"]

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ai 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ai 2008/03/08 13:02:40 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ai,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ai,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- awk/totex.nw.orig 1996-05-31 21:04:15.000000000 +0200 3--- src/awk/totex.nw.orig 1996-05-31 21:04:15.000000000 +0200
4+++ awk/totex.nw 4+++ src/awk/totex.nw
5@@ -24,7 +24,7 @@ nawk '<<awk program for conversion to {\ 5@@ -24,7 +24,7 @@ nawk '<<awk program for conversion to {\
6 @ 6 @
7 On an ugly system, we have to put it in a file. 7 On an ugly system, we have to put it in a file.
8 <<invoke awk program using file>>= 8 <<invoke awk program using file>>=
9-awkfile=/tmp/totex$$.awk 9-awkfile=/tmp/totex$$.awk
10+awkfile=$(@MKTEMP@ -t totex) || exit 1 10+awkfile=$(@MKTEMP@ -t totex) || exit 1
11 trap 'rm -f $awkfile; exit 1' 0 1 2 15 # clean up files 11 trap 'rm -f $awkfile; exit 1' 0 1 2 15 # clean up files
12 cat > $awkfile << 'EOF' 12 cat > $awkfile << 'EOF'
13 <<awk program for conversion to {\TeX}>> 13 <<awk program for conversion to {\TeX}>>

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-aj 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-aj 2008/03/08 13:02:40 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aj,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-aj,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- ../contrib/norman/htmlgif/pstopbm.orig 1998-08-07 20:29:32.000000000 +0200 3--- contrib/norman/htmlgif/pstopbm.orig 1998-08-07 20:29:32.000000000 +0200
4+++ ../contrib/norman/htmlgif/pstopbm 4+++ contrib/norman/htmlgif/pstopbm
5@@ -36,8 +36,8 @@ while [ $# -gt 0 ]; do 5@@ -36,8 +36,8 @@ while [ $# -gt 0 ]; do
6 shift 6 shift
7 done 7 done
8  8
9-tmp=/tmp/pstopbm$$ 9-tmp=/tmp/pstopbm$$
10-tmpa=$tmp.a 10-tmpa=$tmp.a
11+tmp=$(@MKTEMP@ -t pstopbm) || exit 1 11+tmp=$(@MKTEMP@ -t pstopbm) || exit 1
12+tmpa=$(@MKTEMP@ -t pstopbm_a -s) || exit 1 12+tmpa=$(@MKTEMP@ -t pstopbm_a -s) || exit 1
13 if [ $# -eq 0 ]; then cat > $tmp; else cat "$@" > $tmp; fi 13 if [ $# -eq 0 ]; then cat > $tmp; else cat "$@" > $tmp; fi
14  14
15 if echo "$@" | fgrep .eps > /dev/null; then 15 if echo "$@" | fgrep .eps > /dev/null; then
16@@ -76,7 +76,7 @@ exit 0 16@@ -76,7 +76,7 @@ exit 0
17  17

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-ak 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-ak 2008/03/08 13:02:40 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ak,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-ak,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- ../contrib/jobling/correct-refs.nw.orig 1995-05-24 20:12:48.000000000 +0200 3--- contrib/jobling/correct-refs.nw.orig 1995-05-24 20:12:48.000000000 +0200
4+++ ../contrib/jobling/correct-refs.nw 4+++ contrib/jobling/correct-refs.nw
5@@ -332,11 +332,12 @@ gawk -f $LIB/awk-scripts.awk anchor-list 5@@ -332,11 +332,12 @@ gawk -f $LIB/awk-scripts.awk anchor-list
6 echo Processing HTML nodes 6 echo Processing HTML nodes
7 foreach f (*.awk) 7 foreach f (*.awk)
8 set root=$f:r 8 set root=$f:r
9+ set tmpfile=`@MKTEMP@ -t noweb` || exit 1 9+ set tmpfile=`@MKTEMP@ -t noweb` || exit 1
10 echo -n Processing $root.html 10 echo -n Processing $root.html
11- gawk -f $f < $root.html >! /tmp/$root.html 11- gawk -f $f < $root.html >! /tmp/$root.html
12+ gawk -f $f < $root.html >! $tmpfile 12+ gawk -f $f < $root.html >! $tmpfile
13 echo "..." Done 13 echo "..." Done
14 cp $root.html $root.html.bak 14 cp $root.html $root.html.bak
15- cp /tmp/$root.html $root.html 15- cp /tmp/$root.html $root.html
16+ cp $tmpfile $root.html 16+ cp $tmpfile $root.html
17 end 17 end

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-al 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-al 2008/03/08 13:02:40 1.2
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: patch-al,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-al,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- ../contrib/conrado/d2tex.orig 1993-10-27 18:37:11.000000000 +0100 3--- contrib/conrado/d2tex.orig 1993-10-27 18:37:11.000000000 +0100
4+++ ../contrib/conrado/d2tex 4+++ contrib/conrado/d2tex
5@@ -1,5 +1,5 @@ 5@@ -1,5 +1,5 @@
6 #! /bin/sh 6 #! /bin/sh
7-KEYGEN=/tmp/d2tex$$ 7-KEYGEN=/tmp/d2tex$$
8+KEYGEN=$(@MKTEMP@ -t d2tex) || exit 1 8+KEYGEN=$(@MKTEMP@ -t d2tex) || exit 1
9 trap "rm -f $KEYGEN; exit 1" 1 2 3 15 9 trap "rm -f $KEYGEN; exit 1" 1 2 3 15
10 cat > $KEYGEN <<END_OF_FILE 10 cat > $KEYGEN <<END_OF_FILE
11 COMMENT#1 11 COMMENT#1

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-am (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-am 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-am 2008/03/08 13:02:40 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-am,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-am,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- shell/roff.mm.orig 1998-08-18 21:33:04.000000000 +0200 3--- src/shell/roff.mm.orig 1998-08-18 21:33:04.000000000 +0200
4+++ shell/roff.mm 4+++ src/shell/roff.mm
5@@ -214,7 +214,7 @@ copy the awk program into a temporary fi 5@@ -214,7 +214,7 @@ copy the awk program into a temporary fi
6 .ADDLIST 1a 6 .ADDLIST 1a
7 .PRINTLIST 7 .PRINTLIST
8  8
9-awkfile="/tmp/noweb$$.awk" 9-awkfile="/tmp/noweb$$.awk"
10+awkfile=$(@MKTEMP@ -t noweb) || { echo "$0: Cannot create temporary file" >&2; exit 1; } 10+awkfile=$(@MKTEMP@ -t noweb) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
11 trap 'rm -f $awkfile' 0 1 2 10 14 15 11 trap 'rm -f $awkfile' 0 1 2 10 14 15
12 cat > $awkfile \&<< 'EOF' 12 cat > $awkfile \&<< 'EOF'
13 \c 13 \c
14@@ -1628,14 +1628,15 @@ base="`basename $1 | sed '/\./s/\.[^.]*$ 14@@ -1628,14 +1628,15 @@ base="`basename $1 | sed '/\./s/\.[^.]*$
15 tagsfile="$base.nwt" 15 tagsfile="$base.nwt"
16 (echo ".so $macrodir/tmac.w" 16 (echo ".so $macrodir/tmac.w"
17 if [ -r "$tagsfile" ]; then  17 if [ -r "$tagsfile" ]; then

cvs diff -r1.1 -r1.2 pkgsrc/devel/noweb/patches/patch-an (expand / switch to unified diff)

--- pkgsrc/devel/noweb/patches/patch-an 2006/05/23 16:07:04 1.1
+++ pkgsrc/devel/noweb/patches/patch-an 2008/03/08 13:02:40 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-an,v 1.1 2006/05/23 16:07:04 joerg Exp $ 1$NetBSD: patch-an,v 1.2 2008/03/08 13:02:40 tnn Exp $
2 2
3--- shell/roff.nw.orig 1998-08-17 02:27:09.000000000 +0200 3--- src/shell/roff.nw.orig 1998-08-17 02:27:09.000000000 +0200
4+++ shell/roff.nw 4+++ src/shell/roff.nw
5@@ -80,7 +80,8 @@ single quotes and double quotes, so neit 5@@ -80,7 +80,8 @@ single quotes and double quotes, so neit
6 other, and quoting each quote is ugly. The pragmatic solution is to 6 other, and quoting each quote is ugly. The pragmatic solution is to
7 copy the awk program into a temporary file, using a shell here-document. 7 copy the awk program into a temporary file, using a shell here-document.
8 <<invoke awk program>>= 8 <<invoke awk program>>=
9-awkfile="/tmp/noweb$$.awk" 9-awkfile="/tmp/noweb$$.awk"
10+awkfile=$(@MKTEMP@ -t noweb) || { echo "$0: Cannot create temporary file" >&2; exit 1; } 10+awkfile=$(@MKTEMP@ -t noweb) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
11+ 11+
12 trap 'rm -f $awkfile' 0 1 2 10 14 15 12 trap 'rm -f $awkfile' 0 1 2 10 14 15
13 cat > $awkfile << 'EOF' 13 cat > $awkfile << 'EOF'
14 <<awk program>> 14 <<awk program>>
15@@ -664,10 +665,11 @@ base="`basename $1 | sed '/\./s/\.[^.]*$ 15@@ -664,10 +665,11 @@ base="`basename $1 | sed '/\./s/\.[^.]*$
16 tagsfile="$base.nwt" 16 tagsfile="$base.nwt"
17 (echo ".so $macrodir/tmac.w" 17 (echo ".so $macrodir/tmac.w"