- Update devel/automake to 1.14

- Update devel/gettext to 0.18.3
- Fix known-broken (from exp-runs) ports
- Clean up a lot of cruft in the devel/gettext port itself,
  based on work from tijl@

PR:		178883
Submitted by:	ade
Sponsored by:	Wadsworth 6X

4 files changed, 22 insertions, 24 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 58903b2d068e..0a125de541ca 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.12.6
+PORTVERSION=	1.14
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
 		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
 
 USE_AUTOTOOLS=	autoconf:env
-BUILD_VERSION=	1.12
+BUILD_VERSION=	1.14
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USE_XZ=		yes
 USE_PERL5=	yes
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index 409171e05018..b643cf80d596 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (automake-1.12.6.tar.xz) = f834ab2145b1ee24bd85387950044f5cb418dd0af2b84c52e60c2bf29162dbfa
-SIZE (automake-1.12.6.tar.xz) = 1400336
+SHA256 (automake-1.14.tar.xz) = e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059
+SIZE (automake-1.14.tar.xz) = 1485516
diff --git a/devel/automake/files/patch-Makefile.in b/devel/automake/files/patch-Makefile.in
index 4930afd8a81c..ec534cf238b0 100644
--- a/devel/automake/files/patch-Makefile.in
+++ b/devel/automake/files/patch-Makefile.in
@@ -1,27 +1,27 @@
---- Makefile.in.orig	2012-04-25 08:49:53.000000000 -0700
-+++ Makefile.in	2012-04-26 11:27:28.000000000 -0700
-@@ -173,4 +173,3 @@
+--- Makefile.in.orig	2013-06-20 11:37:56.000000000 +0000
++++ Makefile.in	2013-06-26 18:43:25.000000000 +0000
+@@ -221,4 +221,3 @@
  am__dirstamp = $(am__leading_dot)dirstamp
 -INFO_DEPS = $(srcdir)/doc/automake.info \
 -	$(srcdir)/doc/automake-history.info
 +INFO_DEPS = $(srcdir)/doc/automake.info
  TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
-@@ -626,3 +625,3 @@
- 
--dist_system_ac_DATA = m4/acdir/README
-+dist_system_ac_DATA = 
- 
-@@ -2165,3 +2164,3 @@
- am__tdf = diff-in-tests-lists.tmp
+@@ -690,3 +689,3 @@
+ AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
 -info_TEXINFOS = doc/automake.texi doc/automake-history.texi
 +info_TEXINFOS = doc/automake.texi
  doc_automake_TEXINFOS = doc/fdl.texi
-@@ -2200,3 +2199,3 @@
- dist_noinst_DATA = $(amhello_sources)
+@@ -723,3 +722,3 @@
+ 
 -dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
 +dist_doc_DATA = 
+ setup_autotools_paths = { \
+@@ -860,3 +859,3 @@
  
-@@ -3247,3 +3246,2 @@
+-dist_system_ac_DATA = m4/acdir/README
++dist_system_ac_DATA = 
+ automake_internal_acdir = $(automake_acdir)/internal
+@@ -3478,3 +3477,2 @@
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  install-html: install-html-am
diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 225bcde3935f..b51d6a92b6bf 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -4,14 +4,13 @@ share/aclocal-%%BUILD_VERSION%%/amversion.m4
 share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
 share/aclocal-%%BUILD_VERSION%%/as.m4
 share/aclocal-%%BUILD_VERSION%%/auxdir.m4
-share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
 share/aclocal-%%BUILD_VERSION%%/cond.m4
 share/aclocal-%%BUILD_VERSION%%/cond-if.m4
 share/aclocal-%%BUILD_VERSION%%/depend.m4
 share/aclocal-%%BUILD_VERSION%%/depout.m4
 share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal-%%BUILD_VERSION%%/extra-recurs.m4
 share/aclocal-%%BUILD_VERSION%%/gcj.m4
-share/aclocal-%%BUILD_VERSION%%/header.m4
 share/aclocal-%%BUILD_VERSION%%/init.m4
 share/aclocal-%%BUILD_VERSION%%/install-sh.m4
 share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
@@ -19,14 +18,11 @@ share/aclocal-%%BUILD_VERSION%%/lex.m4
 share/aclocal-%%BUILD_VERSION%%/lispdir.m4
 share/aclocal-%%BUILD_VERSION%%/maintainer.m4
 share/aclocal-%%BUILD_VERSION%%/make.m4
-share/aclocal-%%BUILD_VERSION%%/minuso.m4
 share/aclocal-%%BUILD_VERSION%%/missing.m4
 share/aclocal-%%BUILD_VERSION%%/mkdirp.m4
-share/aclocal-%%BUILD_VERSION%%/obsol-gt.m4
-share/aclocal-%%BUILD_VERSION%%/obsol-lt.m4
 share/aclocal-%%BUILD_VERSION%%/obsolete.m4
 share/aclocal-%%BUILD_VERSION%%/options.m4
-share/aclocal-%%BUILD_VERSION%%/protos.m4
+share/aclocal-%%BUILD_VERSION%%/prog-cc-c-o.m4
 share/aclocal-%%BUILD_VERSION%%/python.m4
 share/aclocal-%%BUILD_VERSION%%/runlog.m4
 share/aclocal-%%BUILD_VERSION%%/sanity.m4
@@ -36,6 +32,7 @@ share/aclocal-%%BUILD_VERSION%%/substnot.m4
 share/aclocal-%%BUILD_VERSION%%/tar.m4
 share/aclocal-%%BUILD_VERSION%%/upc.m4
 share/aclocal-%%BUILD_VERSION%%/vala.m4
+share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.m4
 share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
 share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
 share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
@@ -47,6 +44,7 @@ share/automake-%%BUILD_VERSION%%/Automake/General.pm
 share/automake-%%BUILD_VERSION%%/Automake/Getopt.pm
 share/automake-%%BUILD_VERSION%%/Automake/Item.pm
 share/automake-%%BUILD_VERSION%%/Automake/ItemDef.pm
+share/automake-%%BUILD_VERSION%%/Automake/Language.pm
 share/automake-%%BUILD_VERSION%%/Automake/Location.pm
 share/automake-%%BUILD_VERSION%%/Automake/Options.pm
 share/automake-%%BUILD_VERSION%%/Automake/Rule.pm
@@ -102,7 +100,6 @@ share/automake-%%BUILD_VERSION%%/compile
 share/automake-%%BUILD_VERSION%%/config.guess
 share/automake-%%BUILD_VERSION%%/config.sub
 share/automake-%%BUILD_VERSION%%/depcomp
-share/automake-%%BUILD_VERSION%%/elisp-comp
 share/automake-%%BUILD_VERSION%%/install-sh
 share/automake-%%BUILD_VERSION%%/mdate-sh
 share/automake-%%BUILD_VERSION%%/missing
@@ -113,6 +110,7 @@ share/automake-%%BUILD_VERSION%%/tap-driver.sh
 share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
+@dirrm share/aclocal-%%BUILD_VERSION%%/internal
 @dirrm share/aclocal-%%BUILD_VERSION%%
 @dirrm share/automake-%%BUILD_VERSION%%/Automake
 @dirrm share/automake-%%BUILD_VERSION%%/am