Attachment #252046 for bug #280277

Lines 92-98 _AUTORECONF= 2.72 Link Here

(-)b/Mk/Uses/autoreconf.mk (-1 / +1 lines)
92	BUILD_DEPENDS+= autoconf>=${_AUTORECONF}:devel/autoconf	92	BUILD_DEPENDS+= autoconf>=${_AUTORECONF}:devel/autoconf
93	. endif	93	. endif
94		94
95	BUILD_DEPENDS+= automake>=1.16.5:devel/automake	95	BUILD_DEPENDS+= automake>=1.17:devel/automake
96		96
97	. if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)	97	. if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
98	BUILD_DEPENDS+= libtoolize:devel/libtool	98	BUILD_DEPENDS+= libtoolize:devel/libtool

Lines 1-6 Link Here

(-)b/devel/automake/Makefile (-9 / +8 lines)
1	PORTNAME= automake	1	PORTNAME= automake
2	PORTVERSION= 1.16.5	2	DISTVERSION= 1.17
3	PORTREVISION= 2
4	CATEGORIES= devel	3	CATEGORIES= devel
5	MASTER_SITES= GNU	4	MASTER_SITES= GNU
6		5
Lines 13-31 LICENSE_COMB= multi Link Here
13	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING	12	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
14	LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi	13	LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi
15		14
16	BUILD_DEPENDS= autoconf>=2.69:devel/autoconf	15	BUILD_DEPENDS= autoconf>=2.72:devel/autoconf
17	RUN_DEPENDS= autoconf>=2.69:devel/autoconf	16	RUN_DEPENDS= autoconf>=2.72:devel/autoconf
18		17
19	BUILD_VERSION= 1.16
20	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
21	USES= cpe perl5 tar:xz	18	USES= cpe perl5 tar:xz
22	GNU_CONFIGURE= yes
23	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
24	INFO= automake automake-history
25	CPE_VENDOR= gnu	19	CPE_VENDOR= gnu
26		20
		21	GNU_CONFIGURE= yes
		22
27	NO_ARCH= yes	23	NO_ARCH= yes
28		24
		25	INFO= automake automake-history
		26	PLIST_SUB= BUILD_VERSION=${DISTVERSION:C/(\.[^.])./\1/}
		27
29	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOCS
30		29
31	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/automake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1638700499	1	TIMESTAMP = 1720960384
2	SHA256 (automake-1.16.5.tar.xz) = f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469	2	SHA256 (automake-1.17.tar.xz) = 8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990
3	SIZE (automake-1.16.5.tar.xz) = 1601740	3	SIZE (automake-1.17.tar.xz) = 1652632




--- Makefile.in.orig	2020-11-19 01:24:20 UTC
+++ Makefile.in
@@ -3744,9 +3744,9 @@ doc/aclocal.1 doc/automake.1:
 	  && echo ".so man1/$$f-$(APIVERSION).1" > $@
 
 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)
 .PHONY: checklinkx
 checklinkx:
 	$(checklinkx) $(chlx_args) $(chlx_excludes) $(chlx_file)




--- m4/python.m4.orig	2021-10-04 02:51:12 UTC
+++ m4/python.m4
@@ -37,9 +37,12 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 dnl
+[python python3 dnl
+ python3.20 python3.19 python3.18 python3.17 python3.16 dnl
+ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl
  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
  python3.2 python3.1 python3.0 dnl
+ python2 dnl
  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
  python2.0])
 




bin/aclocal-%%BUILD_VERSION%%
bin/automake
bin/automake-%%BUILD_VERSION%%
share/man/man1/aclocal.1.gz
share/man/man1/aclocal-%%BUILD_VERSION%%.1.gz
share/man/man1/automake.1.gz
share/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
share/aclocal-%%BUILD_VERSION%%/auxdir.m4
share/aclocal-%%BUILD_VERSION%%/cond.m4
share/aclocal-%%BUILD_VERSION%%/cond-if.m4
share/aclocal-%%BUILD_VERSION%%/cond.m4
share/aclocal-%%BUILD_VERSION%%/depend.m4
share/aclocal-%%BUILD_VERSION%%/depout.m4
share/aclocal-%%BUILD_VERSION%%/dmalloc.m4

share/aclocal-%%BUILD_VERSION%%/gcj.m4
share/aclocal-%%BUILD_VERSION%%/init.m4
share/aclocal-%%BUILD_VERSION%%/install-sh.m4
share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.m4
share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
share/aclocal-%%BUILD_VERSION%%/lex.m4
share/aclocal-%%BUILD_VERSION%%/lispdir.m4

share/aclocal-%%BUILD_VERSION%%/options.m4
share/aclocal-%%BUILD_VERSION%%/prog-cc-c-o.m4
share/aclocal-%%BUILD_VERSION%%/python.m4
share/aclocal-%%BUILD_VERSION%%/rmf.m4
share/aclocal-%%BUILD_VERSION%%/runlog.m4
share/aclocal-%%BUILD_VERSION%%/sanity.m4
share/aclocal-%%BUILD_VERSION%%/silent.m4

share/aclocal-%%BUILD_VERSION%%/tar.m4
share/aclocal-%%BUILD_VERSION%%/upc.m4
share/aclocal-%%BUILD_VERSION%%/vala.m4
share/aclocal-%%BUILD_VERSION%%/xargsn.m4
share/aclocal/README
share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
share/automake-%%BUILD_VERSION%%/Automake/Condition.pm

share/automake-%%BUILD_VERSION%%/am/footer.am
share/automake-%%BUILD_VERSION%%/am/header-vars.am
share/automake-%%BUILD_VERSION%%/am/header.am
share/automake-%%BUILD_VERSION%%/am/install.am
share/automake-%%BUILD_VERSION%%/am/inst-vars.am
share/automake-%%BUILD_VERSION%%/am/install.am
share/automake-%%BUILD_VERSION%%/am/java.am
share/automake-%%BUILD_VERSION%%/am/lang-compile.am
share/automake-%%BUILD_VERSION%%/am/lex.am

share/automake-%%BUILD_VERSION%%/texinfo.tex
share/automake-%%BUILD_VERSION%%/ylwrap
%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz
share/man/man1/aclocal-%%BUILD_VERSION%%.1.gz
share/man/man1/aclocal.1.gz
share/man/man1/automake-%%BUILD_VERSION%%.1.gz
share/man/man1/automake.1.gz

Return to bug 280277

Removed Link Here

(-)a/devel/automake/files/patch-Makefile.in (-14 lines)
1	--- Makefile.in.orig 2020-11-19 01:24:20 UTC
2	+++ Makefile.in
3	@@ -3744,9 +3744,9 @@ doc/aclocal.1 doc/automake.1:
4	&& echo ".so man1/$$f-$(APIVERSION).1" > $@
5
6	doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
7	- $(update_mans) aclocal-$(APIVERSION)
8	+ $(update_mans) $(aclocal_script)
9	doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
10	- $(update_mans) automake-$(APIVERSION)
11	+ $(update_mans) $(automake_script)
12	.PHONY: checklinkx
13	checklinkx:
14	$(checklinkx) $(chlx_args) $(chlx_excludes) $(chlx_file)

Removed Link Here

(-)a/devel/automake/files/patch-m4_python.m4 (-16 lines)
1	--- m4/python.m4.orig 2021-10-04 02:51:12 UTC
2	+++ m4/python.m4
3	@@ -37,9 +37,12 @@ AC_DEFUN([AM_PATH_PYTHON],
4	dnl Find a Python interpreter. Python versions prior to 2.0 are not
5	dnl supported. (2.0 was released on October 16, 2000).
6	m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
7	-[python python2 python3 dnl
8	+[python python3 dnl
9	+ python3.20 python3.19 python3.18 python3.17 python3.16 dnl
10	+ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl
11	python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
12	python3.2 python3.1 python3.0 dnl
13	+ python2 dnl
14	python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
15	python2.0])
16

Lines 2-18 bin/aclocal Link Here

(-)b/devel/automake/pkg-plist (-9 / +10 lines)
2	bin/aclocal-%%BUILD_VERSION%%	2	bin/aclocal-%%BUILD_VERSION%%
3	bin/automake	3	bin/automake
4	bin/automake-%%BUILD_VERSION%%	4	bin/automake-%%BUILD_VERSION%%
5	share/man/man1/aclocal.1.gz
6	share/man/man1/aclocal-%%BUILD_VERSION%%.1.gz
7	share/man/man1/automake.1.gz
8	share/man/man1/automake-%%BUILD_VERSION%%.1.gz
9	share/aclocal/README
10	share/aclocal-%%BUILD_VERSION%%/amversion.m4	5	share/aclocal-%%BUILD_VERSION%%/amversion.m4
11	share/aclocal-%%BUILD_VERSION%%/ar-lib.m4	6	share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
12	share/aclocal-%%BUILD_VERSION%%/as.m4	7	share/aclocal-%%BUILD_VERSION%%/as.m4
13	share/aclocal-%%BUILD_VERSION%%/auxdir.m4	8	share/aclocal-%%BUILD_VERSION%%/auxdir.m4
14	share/aclocal-%%BUILD_VERSION%%/cond.m4
15	share/aclocal-%%BUILD_VERSION%%/cond-if.m4	9	share/aclocal-%%BUILD_VERSION%%/cond-if.m4
		10	share/aclocal-%%BUILD_VERSION%%/cond.m4
16	share/aclocal-%%BUILD_VERSION%%/depend.m4	11	share/aclocal-%%BUILD_VERSION%%/depend.m4
17	share/aclocal-%%BUILD_VERSION%%/depout.m4	12	share/aclocal-%%BUILD_VERSION%%/depout.m4
18	share/aclocal-%%BUILD_VERSION%%/dmalloc.m4	13	share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
Lines 20-25 share/aclocal-%%BUILD_VERSION%%/extra-recurs.m4 Link Here
20	share/aclocal-%%BUILD_VERSION%%/gcj.m4	15	share/aclocal-%%BUILD_VERSION%%/gcj.m4
21	share/aclocal-%%BUILD_VERSION%%/init.m4	16	share/aclocal-%%BUILD_VERSION%%/init.m4
22	share/aclocal-%%BUILD_VERSION%%/install-sh.m4	17	share/aclocal-%%BUILD_VERSION%%/install-sh.m4
		18	share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.m4
23	share/aclocal-%%BUILD_VERSION%%/lead-dot.m4	19	share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
24	share/aclocal-%%BUILD_VERSION%%/lex.m4	20	share/aclocal-%%BUILD_VERSION%%/lex.m4
25	share/aclocal-%%BUILD_VERSION%%/lispdir.m4	21	share/aclocal-%%BUILD_VERSION%%/lispdir.m4
Lines 31-36 share/aclocal-%%BUILD_VERSION%%/obsolete.m4 Link Here
31	share/aclocal-%%BUILD_VERSION%%/options.m4	27	share/aclocal-%%BUILD_VERSION%%/options.m4
32	share/aclocal-%%BUILD_VERSION%%/prog-cc-c-o.m4	28	share/aclocal-%%BUILD_VERSION%%/prog-cc-c-o.m4
33	share/aclocal-%%BUILD_VERSION%%/python.m4	29	share/aclocal-%%BUILD_VERSION%%/python.m4
		30	share/aclocal-%%BUILD_VERSION%%/rmf.m4
34	share/aclocal-%%BUILD_VERSION%%/runlog.m4	31	share/aclocal-%%BUILD_VERSION%%/runlog.m4
35	share/aclocal-%%BUILD_VERSION%%/sanity.m4	32	share/aclocal-%%BUILD_VERSION%%/sanity.m4
36	share/aclocal-%%BUILD_VERSION%%/silent.m4	33	share/aclocal-%%BUILD_VERSION%%/silent.m4
Lines 39-45 share/aclocal-%%BUILD_VERSION%%/substnot.m4 Link Here
39	share/aclocal-%%BUILD_VERSION%%/tar.m4	36	share/aclocal-%%BUILD_VERSION%%/tar.m4
40	share/aclocal-%%BUILD_VERSION%%/upc.m4	37	share/aclocal-%%BUILD_VERSION%%/upc.m4
41	share/aclocal-%%BUILD_VERSION%%/vala.m4	38	share/aclocal-%%BUILD_VERSION%%/vala.m4
42	share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.m4	39	share/aclocal-%%BUILD_VERSION%%/xargsn.m4
		40	share/aclocal/README
43	share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm	41	share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
44	share/automake-%%BUILD_VERSION%%/Automake/Channels.pm	42	share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
45	share/automake-%%BUILD_VERSION%%/Automake/Condition.pm	43	share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
Lines 77-84 share/automake-%%BUILD_VERSION%%/am/distdir.am Link Here
77	share/automake-%%BUILD_VERSION%%/am/footer.am	75	share/automake-%%BUILD_VERSION%%/am/footer.am
78	share/automake-%%BUILD_VERSION%%/am/header-vars.am	76	share/automake-%%BUILD_VERSION%%/am/header-vars.am
79	share/automake-%%BUILD_VERSION%%/am/header.am	77	share/automake-%%BUILD_VERSION%%/am/header.am
80	share/automake-%%BUILD_VERSION%%/am/install.am
81	share/automake-%%BUILD_VERSION%%/am/inst-vars.am	78	share/automake-%%BUILD_VERSION%%/am/inst-vars.am
		79	share/automake-%%BUILD_VERSION%%/am/install.am
82	share/automake-%%BUILD_VERSION%%/am/java.am	80	share/automake-%%BUILD_VERSION%%/am/java.am
83	share/automake-%%BUILD_VERSION%%/am/lang-compile.am	81	share/automake-%%BUILD_VERSION%%/am/lang-compile.am
84	share/automake-%%BUILD_VERSION%%/am/lex.am	82	share/automake-%%BUILD_VERSION%%/am/lex.am
Lines 117-119 share/automake-%%BUILD_VERSION%%/test-driver Link Here
117	share/automake-%%BUILD_VERSION%%/texinfo.tex	115	share/automake-%%BUILD_VERSION%%/texinfo.tex
118	share/automake-%%BUILD_VERSION%%/ylwrap	116	share/automake-%%BUILD_VERSION%%/ylwrap
119	%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz	117	%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz
120	-	118	share/man/man1/aclocal-%%BUILD_VERSION%%.1.gz
		119	share/man/man1/aclocal.1.gz
		120	share/man/man1/automake-%%BUILD_VERSION%%.1.gz
		121	share/man/man1/automake.1.gz