[Midnightbsd-cvs] mports [24065] trunk/devel: update automake

[laffer1 at midnightbsd.org]

Revision: 24065
          http://svnweb.midnightbsd.org/mports/?rev=24065
Author:   laffer1
Date:     2018-09-02 17:13:10 -0400 (Sun, 02 Sep 2018)
Log Message:
-----------
update automake

Modified Paths:
--------------
    trunk/devel/Makefile
    trunk/devel/automake/Makefile
    trunk/devel/automake/distinfo
    trunk/devel/automake/files/patch-Makefile.in
    trunk/devel/automake/pkg-plist

Removed Paths:
-------------
    trunk/devel/automake-wrapper/
    trunk/devel/automake14/

Modified: trunk/devel/Makefile
===================================================================
--- trunk/devel/Makefile	2018-09-02 19:54:13 UTC (rev 24064)
+++ trunk/devel/Makefile	2018-09-02 21:13:10 UTC (rev 24065)
@@ -17,7 +17,6 @@
 SUBDIR += autoconf213
 SUBDIR += autogen
 SUBDIR += automake
-SUBDIR += automake-wrapper
 SUBDIR += automake14
 SUBDIR += automoc4
 SUBDIR += autotools

Modified: trunk/devel/automake/Makefile
===================================================================
--- trunk/devel/automake/Makefile	2018-09-02 19:54:13 UTC (rev 24064)
+++ trunk/devel/automake/Makefile	2018-09-02 21:13:10 UTC (rev 24065)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	automake
-PORTVERSION=	1.15.1
+PORTVERSION=	1.16.1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -11,14 +11,12 @@
 LICENSE=	gpl3
 
 BUILD_DEPENDS=	autoconf-2.69:devel/autoconf
-RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
-		automake-wrapper:devel/automake-wrapper
+RUN_DEPENDS=	autoconf-2.69:devel/autoconf
 
-BUILD_VERSION=	1.15
+BUILD_VERSION=	1.16
 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

Modified: trunk/devel/automake/distinfo
===================================================================
--- trunk/devel/automake/distinfo	2018-09-02 19:54:13 UTC (rev 24064)
+++ trunk/devel/automake/distinfo	2018-09-02 21:13:10 UTC (rev 24065)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507400378
-SHA256 (automake-1.15.1.tar.xz) = af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
-SIZE (automake-1.15.1.tar.xz) = 1509496
+TIMESTAMP = 1535922417
+SHA256 (automake-1.16.1.tar.xz) = 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921
+SIZE (automake-1.16.1.tar.xz) = 1534936

Modified: trunk/devel/automake/files/patch-Makefile.in
===================================================================
--- trunk/devel/automake/files/patch-Makefile.in	2018-09-02 19:54:13 UTC (rev 24064)
+++ trunk/devel/automake/files/patch-Makefile.in	2018-09-02 21:13:10 UTC (rev 24065)
@@ -1,27 +1,14 @@
---- 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
-@@ -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
-@@ -723,3 +722,3 @@
+--- Makefile.in.orig	2018-03-11 21:21:08 UTC
++++ Makefile.in
+@@ -3690,9 +3690,9 @@ doc/aclocal.1 doc/automake.1:
+ 	  && echo ".so man1/$$f-$(APIVERSION).1" > $@
  
--dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
-+dist_doc_DATA = 
- setup_autotools_paths = { \
-@@ -860,3 +859,3 @@
+ doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
+-	$(update_mans) aclocal-$(APIVERSION)
++	$(update_mans) $(aclocal_script)
+ doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
+-	$(update_mans) automake-$(APIVERSION)
++	$(update_mans) $(automake_script)
  
--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
+ # We depend on configure.ac so that we regenerate the tarball
+ # whenever the Automake version changes.

Modified: trunk/devel/automake/pkg-plist
===================================================================
--- trunk/devel/automake/pkg-plist	2018-09-02 19:54:13 UTC (rev 24064)
+++ trunk/devel/automake/pkg-plist	2018-09-02 21:13:10 UTC (rev 24065)
@@ -1,9 +1,12 @@
+bin/aclocal
 bin/aclocal-%%BUILD_VERSION%%
+bin/automake
 bin/automake-%%BUILD_VERSION%%
-man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
+man/man1/aclocal.1.gz
 man/man1/aclocal-%%BUILD_VERSION%%.1.gz
-man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
+man/man1/automake.1.gz
 man/man1/automake-%%BUILD_VERSION%%.1.gz
+share/aclocal/README
 share/aclocal-%%BUILD_VERSION%%/amversion.m4
 share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
 share/aclocal-%%BUILD_VERSION%%/as.m4
@@ -113,4 +116,4 @@
 share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
- at dir share/aclocal
+%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz