Index: head/devel/automake/Makefile
===================================================================
--- head/devel/automake/Makefile	(revision 452573)
+++ head/devel/automake/Makefile	(revision 452574)
@@ -1,25 +1,30 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	automake
 PORTVERSION=	1.15.1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator
 
+LICENSE=	GPLv2+ GFDL
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
+
 BUILD_DEPENDS=	autoconf-2.69:devel/autoconf
 RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
 		automake-wrapper:devel/automake-wrapper
 
 BUILD_VERSION=	1.15
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USES=		cpe makeinfo perl5 tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 MAKE_ENV+=	MAKEINFOFLAGS=--no-split
 INFO=		automake
 CPE_VENDOR=	gnu
 
 .include <bsd.port.mk>
Index: head/devel/automake/files/patch-Makefile.in
===================================================================
--- head/devel/automake/files/patch-Makefile.in	(revision 452573)
+++ head/devel/automake/files/patch-Makefile.in	(revision 452574)
@@ -1,27 +1,47 @@
---- 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 @@
+--- Makefile.in.orig	2017-06-18 17:35:04 UTC
++++ Makefile.in
+@@ -211,8 +211,7 @@ am__v_texidevnull_ = $(am__v_texidevnull
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
  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
-@@ -690,3 +689,3 @@
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
+ DVIS = doc/automake.dvi doc/automake-history.dvi
+@@ -697,7 +696,7 @@ aclocal_in = $(srcdir)/bin/aclocal.in
+ automake_script = bin/automake
+ aclocal_script = bin/aclocal
  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
-@@ -723,3 +722,3 @@
+ doc_automake_history_TEXINFOS = doc/fdl.texi
+ man1_MANS = \
+@@ -730,7 +729,7 @@ amhello_configury = \
+   missing \
+   src/Makefile.in
  
 -dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
 +dist_doc_DATA = 
  setup_autotools_paths = { \
-@@ -860,3 +859,3 @@
+   $(extend_PATH) \
+     && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
+@@ -866,7 +865,7 @@ dist_automake_ac_DATA = \
+   m4/upc.m4 \
+   m4/vala.m4
  
 -dist_system_ac_DATA = m4/acdir/README
 +dist_system_ac_DATA = 
  automake_internal_acdir = $(automake_acdir)/internal
-@@ -3478,3 +3477,2 @@
+ dist_automake_internal_ac_DATA = m4/internal/ac-config-macro-dirs.m4
+ 
+@@ -3456,7 +3455,6 @@ install-dvi-am: $(DVIS)
+ 	done
+ install-exec-am: install-binSCRIPTS
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  install-html: install-html-am
+ 
+ install-html-am: $(HTMLS)
Index: head/devel/automake/files/patch-doc__automake.texi
===================================================================
--- head/devel/automake/files/patch-doc__automake.texi	(revision 452573)
+++ head/devel/automake/files/patch-doc__automake.texi	(revision 452574)
@@ -1,16 +1,21 @@
---- doc/automake.texi.orig	2012-04-21 07:38:05.000000000 -0700
-+++ doc/automake.texi	2012-04-26 11:05:39.000000000 -0700
-@@ -38,3 +38,3 @@
+--- doc/automake.texi.orig	2017-06-17 01:28:31 UTC
++++ doc/automake.texi
+@@ -38,17 +38,11 @@ section entitled ``GNU Free Documentatio
+ @end quotation
+ @end copying
  
 -@dircategory Software development
 +@dircategory Programming & development toolS
  @direntry
-@@ -43,8 +43,2 @@
+ * Automake: (automake).         Making GNU standards-compliant Makefiles.
+ @end direntry
  
 -@dircategory Individual utilities
 -@direntry
 -* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
 -* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
 -@end direntry
 -
  @titlepage
+ @title GNU Automake
+ @subtitle For version @value{VERSION}, @value{UPDATED}