Major autotools-related update:

	automake	1.10   -> 1.10.1
	gettext		0.16.1 -> 0.17
	libtool		1.5.24 -> 1.5.26
	m4		1.4.9  -> 1.4.11

Please see ports/UPDATING entry 20080605 for further information.

PR:		123450
Tested by:	Full -exp package building run
Thanks to:	linimon, pav
Approved by:	portmgr

19 files changed, 75 insertions, 71 deletions

diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 52924271c01f..221e2c39a859 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -28,6 +28,9 @@ MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 PLIST_FILES=	bin/aldo
 MAN1=	aldo.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|1.10|1.10.1|g' ${WRKSRC}/aclocal.m4
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/aldo ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/aldo.1 ${MANPREFIX}/man/man1
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 2da67773f0af..e4b1e04bfc82 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.10
-PORTREVISION=	3
+PORTVERSION=	1.10.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo
index 01eab3d20e98..9b27341b40e6 100644
--- a/devel/automake110/distinfo
+++ b/devel/automake110/distinfo
@@ -1,3 +1,3 @@
-MD5 (automake-1.10.tar.bz2) = 0e2e0f757f9e1e89b66033905860fded
-SHA256 (automake-1.10.tar.bz2) = 2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
-SIZE (automake-1.10.tar.bz2) = 893866
+MD5 (automake-1.10.1.tar.bz2) = 4510391e6b3edaa4cffb3ced87c9560c
+SHA256 (automake-1.10.1.tar.bz2) = b26a3499672b0eddcbd87c8e61dfb60ae74d9ee0cc181a5d924fb73db62a25ec
+SIZE (automake-1.10.1.tar.bz2) = 918341
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 57d1c2c79f1c..699f3bdb243d 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gettext
-PORTVERSION=	0.16.1
-PORTREVISION=	3
+PORTVERSION=	0.17
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
@@ -33,10 +33,10 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-MAN1=		autopoint.1 gettext.1 gettextize.1 msgattrib.1 msgcat.1 \
-		msgcmp.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 \
+MAN1=		autopoint.1 envsubst.1 gettext.1 gettextize.1 msgattrib.1 \
+		msgcat.1 msgcmp.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 \
 		msgfilter.1 msgfmt.1 msggrep.1 msginit.1 msgmerge.1 \
-		msgunfmt.1 msguniq.1 ngettext.1 xgettext.1 envsubst.1
+		msgunfmt.1 msguniq.1 ngettext.1 recode-sr-latin.1 xgettext.1
 MAN3=		bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
 		dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
 		textdomain.3
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index e24a57ca77c1..ebbb9721833a 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,3 +1,3 @@
-MD5 (gettext-0.16.1.tar.gz) = 3d9ad24301c6d6b17ec30704a13fe127
-SHA256 (gettext-0.16.1.tar.gz) = 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
-SIZE (gettext-0.16.1.tar.gz) = 8539634
+MD5 (gettext-0.17.tar.gz) = 58a2bc6d39c0ba57823034d55d65d606
+SHA256 (gettext-0.17.tar.gz) = 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
+SIZE (gettext-0.17.tar.gz) = 11640890
diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
index 48a26872a4ad..823552253a8b 100644
--- a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
+++ b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
@@ -1,16 +1,16 @@
---- gettext-runtime/intl/Makefile.in.orig	Mon Nov 27 09:02:00 2006
-+++ gettext-runtime/intl/Makefile.in	Sun Dec  3 17:48:38 2006
-@@ -78,3 +78,3 @@
+--- gettext-runtime/intl/Makefile.in.orig	2007-11-04 21:21:12.000000000 +0000
++++ gettext-runtime/intl/Makefile.in	2007-12-12 03:28:44.000000000 +0000
+@@ -79,3 +79,3 @@
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
 --DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
 +-DLIBDIR=\"$(prefix)/libdata\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
  -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
-@@ -191,3 +191,3 @@
+@@ -195,3 +195,3 @@
  	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
--	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
+-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \
 +	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ \
- 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-@@ -346,18 +346,2 @@
+ 	  $(OBJECTS_RES_@WOE32@) \
+@@ -369,18 +369,2 @@
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 -	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
 -	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -29,7 +29,7 @@
 -	    fi; \
 -	  fi; \
  	  $(mkdir_p) $(DESTDIR)$(localedir); \
-@@ -447,5 +431,5 @@
+@@ -472,5 +456,5 @@
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 -	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 -	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
diff --git a/devel/gettext/files/patch-gettext-tools_Makefile.in b/devel/gettext/files/patch-gettext-tools_Makefile.in
index e96c41c38209..73174661ba6f 100644
--- a/devel/gettext/files/patch-gettext-tools_Makefile.in
+++ b/devel/gettext/files/patch-gettext-tools_Makefile.in
@@ -1,7 +1,7 @@
---- gettext-tools/Makefile.in.orig	Mon Nov 27 09:34:56 2006
-+++ gettext-tools/Makefile.in	Sun Dec  3 17:50:43 2006
-@@ -486,3 +486,3 @@
+--- gettext-tools/Makefile.in.orig	2007-11-06 23:40:19.000000000 +0000
++++ gettext-tools/Makefile.in	2007-12-12 03:30:36.000000000 +0000
+@@ -726,3 +726,3 @@
  ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
  
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index ef9a2969d298..6283b5e11a1b 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -36,7 +36,7 @@ lib/libgettextlib.so
 lib/libgettextpo.a
 lib/libgettextpo.la
 lib/libgettextpo.so
-lib/libgettextpo.so.3
+lib/libgettextpo.so.4
 lib/libgettextsrc.la
 lib/libgettextsrc-%%VERSION%%.so
 lib/libgettextsrc.so
@@ -56,6 +56,7 @@ share/aclocal/iconv.m4
 share/aclocal/intdiv0.m4
 share/aclocal/intl.m4
 share/aclocal/intldir.m4
+share/aclocal/intlmacosx.m4
 share/aclocal/intmax.m4
 share/aclocal/inttypes-pri.m4
 share/aclocal/inttypes_h.m4
@@ -64,7 +65,6 @@ share/aclocal/lib-ld.m4
 share/aclocal/lib-link.m4
 share/aclocal/lib-prefix.m4
 share/aclocal/lock.m4
-share/aclocal/longdouble.m4
 share/aclocal/longlong.m4
 share/aclocal/nls.m4
 share/aclocal/po.m4
@@ -73,7 +73,6 @@ share/aclocal/progtest.m4
 share/aclocal/size_max.m4
 share/aclocal/stdint_h.m4
 share/aclocal/uintmax_t.m4
-share/aclocal/ulonglong.m4
 share/aclocal/visibility.m4
 share/aclocal/wchar_t.m4
 share/aclocal/wint_t.m4
@@ -122,33 +121,6 @@ share/aclocal/xsize.m4
 %%PORTDOCS%%%%DOCSDIR%%/gettext_25.html
 %%PORTDOCS%%%%DOCSDIR%%/gettext_foot.html
 %%PORTDOCS%%%%DOCSDIR%%/gettext_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/AllNames.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/gnu.gettext.GettextResource.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/blue-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/blue-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/class-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/constructor-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/constructors.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/cyan-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/cyan-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/error-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/exception-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/green-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/green-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/interface-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/magenta-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/magenta-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/method-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/methods.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/package-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/red-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/red-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/variable-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/variables.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/yellow-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/yellow-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/packages.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc1/tree.html
 %%PORTDOCS%%%%DOCSDIR%%/javadoc2/allclasses-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/javadoc2/deprecated-list.html
 %%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/GettextResource.html
@@ -197,6 +169,7 @@ share/emacs/site-lisp/po-mode.el
 %%DATADIR%%/intl/l10nflist.c
 %%DATADIR%%/intl/langprefs.c
 %%DATADIR%%/intl/libgnuintl.h.in
+%%DATADIR%%/intl/libintl.rc
 %%DATADIR%%/intl/loadinfo.h
 %%DATADIR%%/intl/loadmsgcat.c
 %%DATADIR%%/intl/localcharset.c
@@ -225,6 +198,8 @@ share/emacs/site-lisp/po-mode.el
 %%DATADIR%%/intl/relocatable.c
 %%DATADIR%%/intl/relocatable.h
 %%DATADIR%%/intl/textdomain.c
+%%DATADIR%%/intl/tsearch.c
+%%DATADIR%%/intl/tsearch.h
 %%DATADIR%%/intl/vasnprintf.c
 %%DATADIR%%/intl/vasnprintf.h
 %%DATADIR%%/intl/vasnwprintf.h
@@ -256,6 +231,12 @@ share/emacs/site-lisp/po-mode.el
 %%DATADIR%%/projects/TP/trigger
 %%DATADIR%%/projects/index
 %%DATADIR%%/projects/team-address
+%%DATADIR%%/styles/po-default.css
+%%DATADIR%%/styles/po-emacs-x.css
+%%DATADIR%%/styles/po-emacs-xterm.css
+%%DATADIR%%/styles/po-emacs-xterm16.css
+%%DATADIR%%/styles/po-emacs-xterm256.css
+%%DATADIR%%/styles/po-vim.css
 share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-tools.mo
 share/locale/ca/LC_MESSAGES/gettext-runtime.mo
@@ -277,6 +258,7 @@ share/locale/es/LC_MESSAGES/gettext-runtime.mo
 share/locale/es/LC_MESSAGES/gettext-tools.mo
 share/locale/et/LC_MESSAGES/gettext-runtime.mo
 share/locale/et/LC_MESSAGES/gettext-tools.mo
+share/locale/eu/LC_MESSAGES/gettext-tools.mo
 share/locale/fi/LC_MESSAGES/gettext-runtime.mo
 share/locale/fi/LC_MESSAGES/gettext-tools.mo
 share/locale/fr/LC_MESSAGES/gettext-runtime.mo
@@ -293,12 +275,12 @@ share/locale/ja/LC_MESSAGES/gettext-tools.mo
 share/locale/ko/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-tools.mo
 share/locale/locale.alias
+share/locale/nb/LC_MESSAGES/gettext-runtime.mo
+share/locale/nb/LC_MESSAGES/gettext-tools.mo
 share/locale/nl/LC_MESSAGES/gettext-runtime.mo
 share/locale/nl/LC_MESSAGES/gettext-tools.mo
 share/locale/nn/LC_MESSAGES/gettext-runtime.mo
 share/locale/nn/LC_MESSAGES/gettext-tools.mo
-share/locale/no/LC_MESSAGES/gettext-runtime.mo
-share/locale/no/LC_MESSAGES/gettext-tools.mo
 share/locale/pl/LC_MESSAGES/gettext-runtime.mo
 share/locale/pl/LC_MESSAGES/gettext-tools.mo
 share/locale/pt/LC_MESSAGES/gettext-runtime.mo
@@ -328,6 +310,7 @@ share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
 share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
+@dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/projects/TP
 @dirrm %%DATADIR%%/projects/KDE
 @dirrm %%DATADIR%%/projects/GNOME
@@ -339,8 +322,6 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2/gnu/gettext
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2/gnu
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc1/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc1
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/build-aux
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/csharpdoc
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index 6eb211e39d51..ec76b14994f9 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	1.5.24
+PORTVERSION=	1.5.26
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
@@ -15,7 +15,7 @@ DISTNAME=	libtool-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 COMMENT?=	Generic shared library support script
 
-GNU_CONFIGURE=	 yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?= --disable-ltdl-install
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo
index 8b6572e6db8c..b2248ec76640 100644
--- a/devel/libtool15/distinfo
+++ b/devel/libtool15/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtool-1.5.24.tar.gz) = d0071c890101fcf4f2be8934a37841b0
-SHA256 (libtool-1.5.24.tar.gz) = 1e54016a76e9704f11eccf9bb73e2faa0699f002b00b6630df82b8882ff2e5b2
-SIZE (libtool-1.5.24.tar.gz) = 2919557
+MD5 (libtool-1.5.26.tar.gz) = aa9c5107f3ec9ef4200eb6556f3b3c29
+SHA256 (libtool-1.5.26.tar.gz) = 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
+SIZE (libtool-1.5.26.tar.gz) = 2961939
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 8c43c9289a23..b83ad762c8c8 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	m4
-PORTVERSION=	1.4.9
+PORTVERSION=	1.4.11
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index 40aaf3153fce..c725e78b9092 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,3 +1,3 @@
-MD5 (m4-1.4.9.tar.bz2) = bcfaf47194491a7a8b8d3c2811570b93
-SHA256 (m4-1.4.9.tar.bz2) = a8e29386374ba0eacbd7b339b97f169603d63a736bd87eee85ed2771ed7c3d29
-SIZE (m4-1.4.9.tar.bz2) = 609666
+MD5 (m4-1.4.11.tar.bz2) = 96ec473c2a6f203976c028e896a01b28
+SHA256 (m4-1.4.11.tar.bz2) = 0b7c686525b3f4236670f9329387d2a59e807b6a83d2b5cb9bbeb7d6ab9f8aad
+SIZE (m4-1.4.11.tar.bz2) = 928910
diff --git a/devel/m4/files/patch-src-output.c b/devel/m4/files/patch-src-output.c
new file mode 100644
index 000000000000..5d97ec428d22
--- /dev/null
+++ b/devel/m4/files/patch-src-output.c
@@ -0,0 +1,11 @@
+--- src/output.c.orig	2007-07-05 03:56:06.000000000 +0000
++++ src/output.c	2007-12-12 03:48:25.000000000 +0000
+@@ -254,2 +254,8 @@
+ 	      "Warning: cannot protect diversion across forks"));
++  /* POSIX states that it is undefined whether an append stream starts
++   * at offset 0 or at the end.  We want the beginning.
++   */
++  else if (fseeko (file, 0, SEEK_SET) != 0)
++    M4ERROR ((EXIT_FAILURE, errno,
++	     "cannot seek to beginning of diversion"));
+   return file;
diff --git a/devel/m4/pkg-plist b/devel/m4/pkg-plist
index ebf883bbdc90..9f2d9ee9ac17 100644
--- a/devel/m4/pkg-plist
+++ b/devel/m4/pkg-plist
@@ -1,5 +1,6 @@
 bin/gm4
 %%EXAMPLESDIR%%/capitalize.m4
+%%EXAMPLESDIR%%/capitalize2.m4
 %%EXAMPLESDIR%%/comments.m4
 %%EXAMPLESDIR%%/ddivert.m4
 %%EXAMPLESDIR%%/debug.m4
@@ -10,6 +11,7 @@ bin/gm4
 %%EXAMPLESDIR%%/foreach2.m4
 %%EXAMPLESDIR%%/foreachq.m4
 %%EXAMPLESDIR%%/foreachq2.m4
+%%EXAMPLESDIR%%/foreachq3.m4
 %%EXAMPLESDIR%%/forloop.m4
 %%EXAMPLESDIR%%/forloop2.m4
 %%EXAMPLESDIR%%/fstab.m4
@@ -18,6 +20,8 @@ bin/gm4
 %%EXAMPLESDIR%%/incl-test.m4
 %%EXAMPLESDIR%%/include.m4
 %%EXAMPLESDIR%%/indir.m4
+%%EXAMPLESDIR%%/join.m4
+%%EXAMPLESDIR%%/loop.m4
 %%EXAMPLESDIR%%/misc.m4
 %%EXAMPLESDIR%%/multiquotes.m4
 %%EXAMPLESDIR%%/patsubst.m4
@@ -32,4 +36,6 @@ bin/gm4
 %%EXAMPLESDIR%%/undivert.m4
 %%EXAMPLESDIR%%/wrap.m4
 %%EXAMPLESDIR%%/wrapfifo.m4
+%%EXAMPLESDIR%%/wraplifo.m4
+%%EXAMPLESDIR%%/wraplifo2.m4
 @dirrm %%EXAMPLESDIR%%
diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile
index e5f499c518bc..a569f74a383c 100644
--- a/dns/dnswall/Makefile
+++ b/dns/dnswall/Makefile
@@ -24,6 +24,9 @@ AUTOFILES=	depcomp install-sh missing
 PORTDOCS=	README
 PLIST_FILES=	bin/dnswall
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|1.10|1.10.1|g' ${WRKSRC}/aclocal.m4
+
 pre-configure:
 .for f in ${AUTOFILES}
 	@${RM} ${WRKSRC}/${f}
diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile
index 7a2ec4124fca..e47e8934601b 100644
--- a/misc/iso-codes/Makefile
+++ b/misc/iso-codes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iso-codes
 DISTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/
 
diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist
index db41a1a54df7..b9eb8cfdee20 100644
--- a/misc/iso-codes/pkg-plist
+++ b/misc/iso-codes/pkg-plist
@@ -415,8 +415,6 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
 @dirrmtry share/locale/mr/LC_MESSAGES
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 3a3ce6f97f86..df4c8a48c608 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -37,6 +37,7 @@ pre-everything::
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|1.10|1.10.1|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.am
 	@@${REINPLACE_CMD} -e 's|:=|=|' ${WRKSRC}/Makefile.am \
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index 3a3ce6f97f86..df4c8a48c608 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -37,6 +37,7 @@ pre-everything::
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|1.10|1.10.1|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.am
 	@@${REINPLACE_CMD} -e 's|:=|=|' ${WRKSRC}/Makefile.am \