5 files changed, 51 insertions, 55 deletions

diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 1de87a523af7..7ef6e0401dbb 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cweb
-PORTVERSION=	3.63
+PORTVERSION=	3.64
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	web/c_cpp/cweb
@@ -14,20 +14,27 @@ MASTER_SITE_SUBDIR=	web/c_cpp/cweb
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Literate programming tools for the C language
 
-USE_REINPLACE=	yes
 NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
+
 MAN1=		cweb.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|cc|${CC}|' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cweb.1
 
-pre-install:
-	@${MKDIR} ${PREFIX}/share/cweb
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ctangle ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cweave ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/cweb.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/c++lib.w ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/cweb.el ${PREFIX}/share/emacs/site-lisp
 	@${MKDIR} ${PREFIX}/share/texmf/tex/generic/misc
-
+	${INSTALL_DATA} ${WRKSRC}/cwebmac.tex \
+		${PREFIX}/share/texmf/tex/generic/misc
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/cweb
-	@${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${PREFIX}/share/doc/cweb
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/cweb/distinfo b/devel/cweb/distinfo
index 0cc6b32a5387..e20814aa86a5 100644
--- a/devel/cweb/distinfo
+++ b/devel/cweb/distinfo
@@ -1,2 +1,2 @@
-MD5 (cweb-3.63.tar.gz) = 0031d59172c5001f105902d9926ff51f
-SIZE (cweb-3.63.tar.gz) = 207885
+MD5 (cweb-3.64.tar.gz) = 49e2abe401ebf1ab008193063b88af2b
+SIZE (cweb-3.64.tar.gz) = 212010
diff --git a/devel/cweb/files/patch-aa b/devel/cweb/files/patch-aa
index 3dd4db80dbbc..1ee17f332c9a 100644
--- a/devel/cweb/files/patch-aa
+++ b/devel/cweb/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Jan  1 04:13:48 2001
-+++ Makefile	Mon Jan  7 14:28:39 2002
+--- Makefile.orig	Sat Jul 13 07:33:16 2002
++++ Makefile	Tue Dec 14 23:47:23 2004
 @@ -18,23 +18,23 @@
  #
  
@@ -31,7 +31,7 @@
  
  # Set DESTPREF to null if you want to call the executables "tangle" and "weave"
  # (probably NOT a good idea; we recommend leaving DESTPREF=c)
-@@ -50,9 +50,9 @@
+@@ -50,13 +50,13 @@
  WCHANGES=
  
  # We keep debugging info around, for fun, but most users don't need it
@@ -43,25 +43,8 @@
  #LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems
  
  # What C compiler are you using?
-@@ -162,21 +162,16 @@
- 	  *.log *.dvi *.toc *.idx *.scn *.pdf core cweave ctangle
- 
- install: all
--	- mkdir $(DESTDIR)
- 	$(CP) cweave $(DESTDIR)$(DESTPREF)weave
- 	chmod 755 $(DESTDIR)$(DESTPREF)weave
- 	$(CP) ctangle $(DESTDIR)$(DESTPREF)tangle
- 	chmod 755 $(DESTDIR)$(DESTPREF)tangle
--	- mkdir $(MANDIR)
- 	$(CP) cweb.1 $(MANDIR)/cweb.$(MANEXT)
- 	chmod 644 $(MANDIR)/cweb.$(MANEXT)
--	- mkdir $(MACROSDIR)
- 	$(CP) cwebmac.tex $(MACROSDIR)
- 	chmod 644 $(MACROSDIR)/cwebmac.tex
--	- mkdir $(EMACSDIR)
- 	$(CP) cweb.el $(EMACSDIR)
- 	chmod 644 $(EMACSDIR)/cweb.el
--	- mkdir $(CWEBINPUTS)
- 	$(CP) c++lib.w $(CWEBINPUTS)
- 	chmod 644 $(CWEBINPUTS)/c++lib.w
+-CC = cc
++#CC = cc
  
+ # RM and CP are used below in case rm and cp are aliased
+ RM= /bin/rm
diff --git a/devel/cweb/files/patch-ab b/devel/cweb/files/patch-ab
index a7b8b3c1926e..0f7d00145c22 100644
--- a/devel/cweb/files/patch-ab
+++ b/devel/cweb/files/patch-ab
@@ -1,19 +1,25 @@
---- cweb.1.orig	Tue Jul  3 21:44:09 2001
-+++ cweb.1	Mon Jan  7 14:19:06 2002
-@@ -85,13 +85,11 @@
- means omit the index and table of contents.
- .PP
+--- cweb.1.orig	Wed Apr 24 07:10:46 2002
++++ cweb.1	Tue Dec 14 23:44:49 2004
+@@ -100,19 +100,13 @@
+ .
  .SH FILES
--/usr/local/lib/tex/inputs/cwebmac.tex   TeX macros used by cweave output.
-+/usr/local/share/texmf/tex/generic/misc/cwebmac.tex   TeX macros used by cweave output.
- .br
--/usr/local/src/cweb/cwebman.tex      The user manual.
-+/usr/local/share/doc/cweb/cwebman.tex      The user manual.
- .br
--/usr/local/src/cweb/examples/wc.w   An introductory example.
--.br
--/usr/local/lib/cweb    Directory for cweb "include" files.
-+/usr/local/share/cweb   Directory for cweb "include" files.
+ .TP
+-/usr/local/lib/tex/inputs/cwebmac.tex
++%%PREFIX%%/share/texmf/tex/generic/misc/cwebmac.tex
+ TeX macros used by cweave output.
+ .TP
+-/usr/local/src/cweb/cwebman.tex
++%%PREFIX%%/share/doc/cweb/cwebman.tex
+ The user manual.
+ .TP
+-/usr/local/src/cweb/examples/wc.w
+-An introductory example.
+-.TP
+-/usr/local/src/cweb/examples/wmerge.w
+-Patch program based on CWEB-style change files.
+-.TP
+-/usr/local/lib/cweb
++%%PREFIX%%/share/cweb
+ Directory for cweb "include" files.
+ .
  .SH "SEE ALSO"
- .I Literate Programming
- by D.E. Knuth.
diff --git a/devel/cweb/pkg-plist b/devel/cweb/pkg-plist
index 3ce8664a1e13..f61984e46e28 100644
--- a/devel/cweb/pkg-plist
+++ b/devel/cweb/pkg-plist
@@ -1,11 +1,11 @@
 bin/ctangle
 bin/cweave
-share/cweb/c++lib.w
-share/doc/cweb/cwebman.tex
+%%DATADIR%%/c++lib.w
+%%PORTDOCS%%%%DOCSDIR%%/cwebman.tex
 share/emacs/site-lisp/cweb.el
 share/texmf/tex/generic/misc/cwebmac.tex
-@dirrm share/cweb
-@dirrm share/doc/cweb
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/share/texmf/tex/generic/misc 2>/dev/null || true
 @unexec rmdir %D/share/texmf/tex/generic 2>/dev/null || true
 @unexec rmdir %D/share/texmf/tex 2>/dev/null || true