Update to 1.4.8

5 files changed, 25 insertions, 25 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 2f1baec9548b..cd8ef73ce9cd 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	m4
-PORTVERSION=	1.4.4
+PORTVERSION=	1.4.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	m4
@@ -16,7 +16,8 @@ COMMENT=	GNU m4
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g
+CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
+		--program-prefix=g
 
 .if defined(WITH_CHANGEWORD)
 CONFIGURE_ARGS+=	--enable-changeword
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index fe513f5ffb60..041925c5573d 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,3 +1,3 @@
-MD5 (m4-1.4.4.tar.bz2) = eb93bfbcb12cf00165583302bb31a822
-SHA256 (m4-1.4.4.tar.bz2) = 5a06ae07a7c7b6e9895be14015468947ef3f95182e60400e840efb25feea4b8f
-SIZE (m4-1.4.4.tar.bz2) = 306737
+MD5 (m4-1.4.8.tar.bz2) = 6bbf917e5d8fab20b38d43868c3944d3
+SHA256 (m4-1.4.8.tar.bz2) = d0e6734743f9eca530ea90c289c0f1770bdf37f846561557f0b0db7f87b7d7cc
+SIZE (m4-1.4.8.tar.bz2) = 580222
diff --git a/devel/m4/files/patch-aa b/devel/m4/files/patch-aa
index d115919e806a..380659e79c72 100644
--- a/devel/m4/files/patch-aa
+++ b/devel/m4/files/patch-aa
@@ -1,11 +1,7 @@
---- doc/Makefile.in.orig	Sun Nov  6 05:52:26 1994
-+++ doc/Makefile.in	Mon Jun 16 16:08:39 1997
-@@ -40,7 +40,7 @@
- info: m4.info
- 
- m4.info: m4.texinfo version.texi
--	cd $(srcdir) && $(MAKEINFO) m4.texinfo
-+	cd $(srcdir) && rm -f m4.info* && $(MAKEINFO) --no-split m4.texinfo
- 
- dvi: m4.dvi
- 
+--- doc/Makefile.in.orig	Mon Nov 20 06:25:48 2006
++++ doc/Makefile.in	Sun Dec  3 17:13:56 2006
+@@ -158,3 +158,3 @@
+ M4_LTLIBOBJS = @M4_LTLIBOBJS@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKDIR_P = @MKDIR_P@
diff --git a/devel/m4/files/patch-ab b/devel/m4/files/patch-ab
index 002f831a9339..3426464886b4 100644
--- a/devel/m4/files/patch-ab
+++ b/devel/m4/files/patch-ab
@@ -1,11 +1,7 @@
---- doc/m4.texinfo.orig	Thu Mar 31 15:17:00 2005
-+++ doc/m4.texinfo	Tue Apr  5 11:36:34 2005
-@@ -18,7 +18,7 @@
- 
- @dircategory GNU programming tools
+--- doc/m4.texinfo.orig	Mon Nov 20 05:55:43 2006
++++ doc/m4.texinfo	Sun Dec  3 17:15:41 2006
+@@ -60,3 +60,3 @@
  @direntry
--* m4: (m4).			A powerful macro processor.
-+* Gm4: (m4).			A powerful macro processor.
+-* M4: (m4).                     A powerful macro processor.
++* GM4: (m4).                     A powerful macro processor.
  @end direntry
- 
- @ifnottex
diff --git a/devel/m4/pkg-plist b/devel/m4/pkg-plist
index 42be385ce320..ebf883bbdc90 100644
--- a/devel/m4/pkg-plist
+++ b/devel/m4/pkg-plist
@@ -7,9 +7,14 @@ bin/gm4
 %%EXAMPLESDIR%%/exp.m4
 %%EXAMPLESDIR%%/file.m4
 %%EXAMPLESDIR%%/foreach.m4
+%%EXAMPLESDIR%%/foreach2.m4
+%%EXAMPLESDIR%%/foreachq.m4
+%%EXAMPLESDIR%%/foreachq2.m4
 %%EXAMPLESDIR%%/forloop.m4
+%%EXAMPLESDIR%%/forloop2.m4
 %%EXAMPLESDIR%%/fstab.m4
 %%EXAMPLESDIR%%/hanoi.m4
+%%EXAMPLESDIR%%/incl.m4
 %%EXAMPLESDIR%%/incl-test.m4
 %%EXAMPLESDIR%%/include.m4
 %%EXAMPLESDIR%%/indir.m4
@@ -17,6 +22,7 @@ bin/gm4
 %%EXAMPLESDIR%%/multiquotes.m4
 %%EXAMPLESDIR%%/patsubst.m4
 %%EXAMPLESDIR%%/pushpop.m4
+%%EXAMPLESDIR%%/quote.m4
 %%EXAMPLESDIR%%/regexp.m4
 %%EXAMPLESDIR%%/reverse.m4
 %%EXAMPLESDIR%%/sync-lines.m4
@@ -25,4 +31,5 @@ bin/gm4
 %%EXAMPLESDIR%%/translit.m4
 %%EXAMPLESDIR%%/undivert.m4
 %%EXAMPLESDIR%%/wrap.m4
+%%EXAMPLESDIR%%/wrapfifo.m4
 @dirrm %%EXAMPLESDIR%%