diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 010f566383f7..f760bd57337b 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	m4
 PORTVERSION=	1.4.17
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
diff --git a/devel/m4/pkg-plist b/devel/m4/pkg-plist
index ebe1ded8f517..c6d4adb03ff5 100644
--- a/devel/m4/pkg-plist
+++ b/devel/m4/pkg-plist
@@ -1,47 +1,47 @@
 bin/gm4
 man/man1/gm4.1.gz
-%%EXAMPLESDIR%%/capitalize.m4
-%%EXAMPLESDIR%%/capitalize2.m4
-%%EXAMPLESDIR%%/comments.m4
-%%EXAMPLESDIR%%/curry.m4
-%%EXAMPLESDIR%%/ddivert.m4
-%%EXAMPLESDIR%%/debug.m4
-%%EXAMPLESDIR%%/esyscmd.m4
-%%EXAMPLESDIR%%/exp.m4
-%%EXAMPLESDIR%%/file.m4
-%%EXAMPLESDIR%%/foreach.m4
-%%EXAMPLESDIR%%/foreach2.m4
-%%EXAMPLESDIR%%/foreachq.m4
-%%EXAMPLESDIR%%/foreachq2.m4
-%%EXAMPLESDIR%%/foreachq3.m4
-%%EXAMPLESDIR%%/foreachq4.m4
-%%EXAMPLESDIR%%/forloop.m4
-%%EXAMPLESDIR%%/forloop2.m4
-%%EXAMPLESDIR%%/forloop3.m4
-%%EXAMPLESDIR%%/fstab.m4
-%%EXAMPLESDIR%%/hanoi.m4
-%%EXAMPLESDIR%%/incl-test.m4
-%%EXAMPLESDIR%%/incl.m4
-%%EXAMPLESDIR%%/include.m4
-%%EXAMPLESDIR%%/indir.m4
-%%EXAMPLESDIR%%/join.m4
-%%EXAMPLESDIR%%/loop.m4
-%%EXAMPLESDIR%%/misc.m4
-%%EXAMPLESDIR%%/multiquotes.m4
-%%EXAMPLESDIR%%/patsubst.m4
-%%EXAMPLESDIR%%/pushpop.m4
-%%EXAMPLESDIR%%/quote.m4
-%%EXAMPLESDIR%%/regexp.m4
-%%EXAMPLESDIR%%/reverse.m4
-%%EXAMPLESDIR%%/stack.m4
-%%EXAMPLESDIR%%/stack_sep.m4
-%%EXAMPLESDIR%%/sync-lines.m4
-%%EXAMPLESDIR%%/sysv-args.m4
-%%EXAMPLESDIR%%/trace.m4
-%%EXAMPLESDIR%%/translit.m4
-%%EXAMPLESDIR%%/undivert.m4
-%%EXAMPLESDIR%%/wrap.m4
-%%EXAMPLESDIR%%/wrapfifo.m4
-%%EXAMPLESDIR%%/wraplifo.m4
-%%EXAMPLESDIR%%/wraplifo2.m4
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/capitalize.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/capitalize2.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/comments.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curry.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ddivert.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/esyscmd.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exp.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foreach.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foreach2.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foreachq.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foreachq2.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foreachq3.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foreachq4.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forloop.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forloop2.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forloop3.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fstab.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hanoi.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/incl-test.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/incl.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/include.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/indir.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/join.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiquotes.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/patsubst.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pushpop.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quote.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/regexp.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reverse.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stack.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stack_sep.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sync-lines.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sysv-args.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trace.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/translit.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/undivert.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrap.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrapfifo.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wraplifo.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wraplifo2.m4
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%