4 files changed, 71 insertions, 92 deletions

diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 045d69f642ba..1a16058d2329 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,25 +1,25 @@
 # New ports collection makefile for:	noweb
-# Version required:	noweb-2.7d
+# Version required:	noweb-2.8
 # Date created:		29 July 1995
-# Whom:			thomas@ghpc8.ihf.rwth-aachen.de
+# Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.7 1996/11/18 11:23:26 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/20 03:01:20 asami Exp $
 #
 
-DISTNAME=	noweb-2.7d
+DISTNAME=	noweb-2.8
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/nr/
+MASTER_SITES=	ftp://ftp.cs.virginia.edu/pub/nr/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
+MAINTAINER=	tg@freebsd.org
 
 BUILD_DEPENDS=	icont:${PORTSDIR}/lang/icon
 RUN_DEPENDS=	iconx:${PORTSDIR}/lang/icon
 
 WRKSRC=		${WRKDIR}/src
-MAN1=		htmltoc.1 nodefs.1 noindex.1 noroots.1 notangle.1 \
-		noweb.1 cpif.1 sl2h.1 nowebstyle.1 nuweb2noweb.1 \
-		nowebfilters.1
+MAN1=		cpif.1 nodefs.1 noroots.1 noweb.1 noindex.1 \
+		nuweb2noweb.1 notangle.1 sl2h.1 htmltoc.1
+MAN7=		nowebstyle.7 nowebfilters.7
 
 .if !defined(NOMANCOMPRESS)
 post-install:
diff --git a/devel/noweb/distinfo b/devel/noweb/distinfo
index 9c39c082c2f0..20f535e682d9 100644
--- a/devel/noweb/distinfo
+++ b/devel/noweb/distinfo
@@ -1 +1 @@
-MD5 (noweb-2.7d.tgz) = ead37d445edc98f6cad6d820b3547a4e
+MD5 (noweb-2.8.tgz) = 9f4e52ff7ab0f9dc52de44809dd54690
diff --git a/devel/noweb/files/patch-a b/devel/noweb/files/patch-a
index e4d6f0fcd229..e7532515b58c 100644
--- a/devel/noweb/files/patch-a
+++ b/devel/noweb/files/patch-a
@@ -1,74 +1,47 @@
-diff -cr Makefile.orig Makefile
-*** Makefile.orig	Fri May 26 02:37:09 1995
---- Makefile	Sat Jul 15 16:21:45 1995
-***************
-*** 2,14 ****
-  # See file COPYRIGHT for more information.
-  #
-  # Adjust these two lines for your ANSI C compiler
-! CC=gcc
-! CFLAGS=
-  # If you have Icon, you should use the Icon versions of the noweb pipeline.
-! # Set LIBSRC=icon
-! LIBSRC=awk
-  # If you have no Icon compiler, but do have icont, make ICONC=icont
-! ICONC=iconc
-  ICONT=icont
-  
-  # BIN is where the commands (notangle, noweave, nountangle, noroots) land
---- 2,14 ----
-  # See file COPYRIGHT for more information.
-  #
-  # Adjust these two lines for your ANSI C compiler
-! #CC=gcc
-! #CFLAGS=
-  # If you have Icon, you should use the Icon versions of the noweb pipeline.
-! LIBSRC=icon
-! #LIBSRC=awk
-  # If you have no Icon compiler, but do have icont, make ICONC=icont
-! ICONC=icont
-  ICONT=icont
-  
-  # BIN is where the commands (notangle, noweave, nountangle, noroots) land
-***************
-*** 16,26 ****
-  # MAN is the root of your local man pages directory
-  # MANEXT is the extension for your commands' man pages (usually 1 or l)
-  # TEXINPUTS is the directory for TeX macro files
-! BIN=/usr/local/noweb
-! LIB=/usr/local/noweb/lib
-! MAN=/usr/local/noweb/man
-  MANEXT=1
-! TEXINPUTS=/usr/local/tex/inputs
-  
-  # change WEAVE if you want a different version of noweave to be installed
-  WEAVE=noweave		
---- 16,26 ----
-  # MAN is the root of your local man pages directory
-  # MANEXT is the extension for your commands' man pages (usually 1 or l)
-  # TEXINPUTS is the directory for TeX macro files
-! BIN=${PREFIX}/bin
-! LIB=${PREFIX}/share/noweb
-! MAN=${PREFIX}/man
-  MANEXT=1
-! TEXINPUTS=${LIB}/tex
-  
-  # change WEAVE if you want a different version of noweave to be installed
-  WEAVE=noweave		
-***************
-*** 96,102 ****
-  	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
-  	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
-  install-tex:
-! 	-mkdir $(TEXINPUTS) 2>/dev/null
-  	cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
-  
-  checkin:
---- 96,102 ----
-  	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
-  	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
-  install-tex:
-! 	-mkdir -p $(TEXINPUTS) 2>/dev/null
-  	cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
-  
-  checkin:
+--- Makefile.orig	Sat Apr  5 03:17:19 1997
++++ Makefile	Fri Jun 20 08:28:38 1997
+@@ -2,13 +2,13 @@
+ # See file COPYRIGHT for more information.
+ #
+ # Adjust these two lines for your ANSI C compiler
+-CC=gcc
+-CFLAGS=
++#CC=gcc
++#CFLAGS=
+ # If you have Icon, you should use the Icon versions of the noweb pipeline.
+-# Set LIBSRC=icon
+-LIBSRC=awk
++LIBSRC=icon
++#LIBSRC=awk
+ # If you have no Icon compiler, but do have icont, make ICONC=icont
+-ICONC=iconc
++ICONC=icont
+ ICONT=icont
+ 
+ # BIN is where the commands (notangle, noweave, nountangle, noroots) land
+@@ -17,12 +17,12 @@
+ # MANEXT is the extension for your commands' man pages (usually 1 or l)
+ # MAN7EXT is the extension for the nowebstyle man page (usually 7)
+ # TEXINPUTS is the directory for TeX macro files
+-BIN=/usr/local/noweb
+-LIB=/usr/local/noweb/lib
+-MAN=/usr/local/noweb/man
++BIN=${PREFIX}/bin
++LIB=${PREFIX}/share/noweb
++MAN=${PREFIX}/man
+ MANEXT=1
+ MAN7EXT=7
+-TEXINPUTS=/usr/local/tex/inputs
++TEXINPUTS=${LIB}/tex
+ 
+ # change WEAVE if you want a different version of noweave to be installed
+ WEAVE=noweave		
+@@ -109,7 +109,7 @@
+ 	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)
+ 
+ checkin:
diff --git a/devel/noweb/pkg-plist b/devel/noweb/pkg-plist
index c3ea55ba26a8..c237560a4b15 100644
--- a/devel/noweb/pkg-plist
+++ b/devel/noweb/pkg-plist
@@ -1,6 +1,7 @@
 bin/htmltoc
 bin/nodefs
 bin/noindex
+bin/noroff
 bin/noroots
 bin/notangle
 bin/nountangle
@@ -12,6 +13,7 @@ bin/sl2h
 share/noweb/autodefs.c
 share/noweb/autodefs.icon
 share/noweb/autodefs.pascal
+share/noweb/autodefs.promela
 share/noweb/autodefs.sml
 share/noweb/autodefs.tex
 share/noweb/autodefs.yacc
@@ -24,22 +26,26 @@ share/noweb/markup
 share/noweb/mnt
 share/noweb/noidx
 share/noweb/nt
+share/noweb/tmac.w
 share/noweb/toascii
 share/noweb/tohtml
 share/noweb/totex
+share/noweb/toroff
 share/noweb/unmarkup
 share/noweb/tex/noweb.sty
 share/noweb/tex/nwmac.tex
-man/man1/htmltoc.1.gz
+man/man1/cpif.1.gz
 man/man1/nodefs.1.gz
-man/man1/noindex.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/man1/noweb.1.gz
-man/man1/cpif.1.gz
-man/man1/sl2h.1.gz
-man/man1/nowebstyle.1.gz
-man/man1/nuweb2noweb.1.gz
-man/man1/nowebfilters.1.gz
+man/man7/nowebstyle.7.gz
+man/man7/nowebfilters.7.gz
+@dirrm share/noweb/tex
+@dirrm share/noweb