Attachment #227431 for bug #258046




# Created by: ade@FreeBSD.org

PORTNAME=	autoconf
PORTVERSION=	2.71
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	GNU

MAINTAINER=	tijl@FreeBSD.org
COMMENT=	Automatically configure source code on many Un*x platforms

LICENSE=	AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION GFDL GPLv2+ GPLv3+
LICENSE_COMB=	multi
LICENSE_NAME_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION=	AUTOCONF CONFIGURE SCRIPT EXCEPTION
LICENSE_FILE_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION=	${WRKSRC}/COPYING.EXCEPTION
LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYINGv3
LICENSE_PERMS_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION=	dist-mirror dist-sell \
							pkg-mirror pkg-sell \
							auto-accept

BUILD_DEPENDS=	gm4:devel/m4 \
		help2man:misc/help2man
RUN_DEPENDS=	autoconf-wrapper:devel/autoconf-wrapper \
		gm4:devel/m4

BUILD_VERSION=	2.69
PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
USES=		gmake makeinfo perl5 tar:xz
INFO=		autoconf

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION} \
		--without-lispdir
CONFIGURE_ENV=	ac_cv_prog_TEST_EMACS=no \
		AWK=${AWK} \
		M4=${LOCALBASE}/bin/gm4
GENERIC_LINKS=	autoconf autoheader autom4te autoreconf autoscan autoupdate \
		ifnames

NO_ARCH=	yes

INFO=		autoconf
PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
BUILD_VERSION=	2.71

post-patch:
	@(cd ${WRKSRC}/man && \
		for file in *.[1x]; do \

	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
		's|@PACKAGE@$$|@PACKAGE@-@VERSION@|'

post-install:
.for FILE in ${GENERIC_TOOLS}
	${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/devel/autoconf/distinfo (-2 / +3 lines)
1	SHA256 (autoconf-2.69.tar.xz) = 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684	1	TIMESTAMP = 1629874094
2	SIZE (autoconf-2.69.tar.xz) = 1214744	2	SHA256 (autoconf-2.71.tar.xz) = f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4
		3	SIZE (autoconf-2.71.tar.xz) = 1292296




--- Makefile.in.orig	2021-08-25 07:33:58 UTC
+++ Makefile.in
@@ -311,13 +311,13 @@ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V
 am__v_texidevnull_0 = > /dev/null
 am__v_texidevnull_1 = 
 am__dirstamp = $(am__leading_dot)dirstamp
-INFO_DEPS = $(srcdir)/doc/autoconf.info $(srcdir)/doc/standards.info
+INFO_DEPS = $(srcdir)/doc/autoconf.info
 am__TEXINFO_TEX_DIR = $(srcdir)/build-aux
-DVIS = doc/autoconf.dvi doc/standards.dvi
-PDFS = doc/autoconf.pdf doc/standards.pdf
-PSS = doc/autoconf.ps doc/standards.ps
-HTMLS = doc/autoconf.html doc/standards.html
-TEXINFOS = doc/autoconf.texi doc/standards.texi
+DVIS = doc/autoconf.dvi
+PDFS = doc/autoconf.pdf
+PSS = doc/autoconf.ps
+HTMLS = doc/autoconf.html
+TEXINFOS = doc/autoconf.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -691,7 +691,7 @@ ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\
 AM_MAKEINFOFLAGS = --no-split
 TEXI2HTML_FLAGS = -split_chapter
 TEXINFO_TEX = build-aux/texinfo.tex
-info_TEXINFOS = doc/autoconf.texi doc/standards.texi
+info_TEXINFOS = doc/autoconf.texi
 doc_autoconf_TEXINFOS = doc/fdl.texi doc/install.texi
 doc_standards_TEXINFOS = doc/fdl.texi doc/gnu-oids.texi doc/make-stds.texi
 TAGS_FILES = $(dist_perllib_DATA) $(dist_autoconflib_DATA) \
@@ -1083,50 +1083,6 @@ mostlyclean-vti:
 
 maintainer-clean-vti:
 	-rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi
-
-$(srcdir)/doc/standards.info: doc/standards.texi $(doc_standards_TEXINFOS)
-	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
-	rm -rf $$backupdir && mkdir $$backupdir && \
-	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-	  done; \
-	else :; fi && \
-	cd "$$am__cwd"; \
-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
-	 -o $@ $(srcdir)/doc/standards.texi; \
-	then \
-	  rc=0; \
-	  $(am__cd) $(srcdir); \
-	else \
-	  rc=$$?; \
-	  $(am__cd) $(srcdir) && \
-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-	fi; \
-	rm -rf $$backupdir; exit $$rc
-
-doc/standards.dvi: doc/standards.texi $(doc_standards_TEXINFOS) doc/$(am__dirstamp)
-	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
-	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
-	`test -f 'doc/standards.texi' || echo '$(srcdir)/'`doc/standards.texi
-
-doc/standards.pdf: doc/standards.texi $(doc_standards_TEXINFOS) doc/$(am__dirstamp)
-	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
-	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
-	`test -f 'doc/standards.texi' || echo '$(srcdir)/'`doc/standards.texi
-
-doc/standards.html: doc/standards.texi $(doc_standards_TEXINFOS) doc/$(am__dirstamp)
-	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
-	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
-	 -o $(@:.html=.htp) `test -f 'doc/standards.texi' || echo '$(srcdir)/'`doc/standards.texi; \
-	then \
-	  rm -rf $@ && mv $(@:.html=.htp) $@; \
-	else \
-	  rm -rf $(@:.html=.htp); exit 1; \
-	fi
 .dvi.ps:
 	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) $(AM_V_texinfo) -o $@ $<
@@ -1208,16 +1164,11 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -rf doc/autoconf.t2d doc/autoconf.t2p doc/standards.t2d \
-	  doc/standards.t2p
+	-rm -rf doc/autoconf.t2d doc/autoconf.t2p
 
 clean-aminfo:
-	-test -z "doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html \
-	  doc/standards.dvi doc/standards.pdf doc/standards.ps \
-	  doc/standards.html" \
-	|| rm -rf doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html \
-	  doc/standards.dvi doc/standards.pdf doc/standards.ps \
-	  doc/standards.html
+	-test -z "doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html" \
+	|| rm -rf doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \

Removed Link Here

(-)a/devel/autoconf/files/patch-bin-autoscan.in (-11 lines)
1	--- bin/autoscan.in.orig 2012-04-25 02:37:26 UTC
2	+++ bin/autoscan.in
3	@@ -358,7 +358,7 @@ sub scan_sh_file ($)
4	{
5	# Strip out comments and variable references.
6	s/#.*//;
7	- s/\${[^\}]*}//g;
8	+ s/\$\{[^\}]*}//g;
9	s/@[^@]*@//g;
10
11	# Tokens in the code.




--- doc/Makefile.in.orig	2012-04-25 02:40:26 UTC
+++ doc/Makefile.in
@@ -65,13 +65,13 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
+INFO_DEPS = $(srcdir)/autoconf.info
 am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
 DVIS = autoconf.dvi standards.dvi
 PDFS = autoconf.pdf standards.pdf
 PSS = autoconf.ps standards.ps
 HTMLS = autoconf.html standards.html
-TEXINFOS = autoconf.texi standards.texi
+TEXINFOS = autoconf.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html




--- doc/autoconf.texi.orig	2021-01-28 20:46:48 UTC
+++ doc/autoconf.texi
@@ -225,29 +225,9 @@ entitled ``GNU Free Documentation License.''
 @c The ARG is an optional argument.  To be used for macro arguments in
 @c their documentation (@defmac).
 @macro ovar{varname}
-@r{[}@var{\varname\}@r{]}@c
+@r{[}@var{\varname\}@r{]}
 @end macro
 
 @c @dvar(ARG, DEFAULT)
@@ -23,7 +23,7 @@
 @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
 @c for macro arguments in their documentation (@defmac).
 @macro dvar{varname, default}
-@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
+@r{[}@var{\varname\} = @samp{\default\}@r{]}
 @end macro
 
 @c Handling the indexes with Texinfo yields several different problems.
@@ -217,31 +217,11 @@ entitled ``GNU Free Documentation Licens
 
 
 

+@dircategory Programming & development tools
 @direntry
 * Autoconf: (autoconf).         Create source code configuration scripts.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
-* autoscan: (autoconf)autoscan Invocation.

-                                Automatic update of @file{configure.ac}
-* config.status: (autoconf)config.status Invocation. Recreating configurations.
-* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
 @end direntry
 
 @titlepage
 @title Autoconf
 @subtitle Creating Automatic Configuration Scripts




--- doc/autoconf.texi.orig	2012-04-25 02:14:19 UTC
+++ doc/autoconf.texi
@@ -5,9 +5,6 @@
 @include version.texi
 @settitle Autoconf
 @setchapternewpage odd
-@ifnothtml
-@setcontentsaftertitlepage
-@end ifnothtml
 @finalout
 
 @c @ovar(ARG)




bin/autoscan-%%BUILD_VERSION%%
bin/autoupdate-%%BUILD_VERSION%%
bin/ifnames-%%BUILD_VERSION%%
man/man1/autoconf-%%BUILD_VERSION%%.1.gz
man/man1/autoheader-%%BUILD_VERSION%%.1.gz
man/man1/autom4te-%%BUILD_VERSION%%.1.gz
man/man1/autoreconf-%%BUILD_VERSION%%.1.gz
man/man1/autoscan-%%BUILD_VERSION%%.1.gz
man/man1/autoupdate-%%BUILD_VERSION%%.1.gz
man/man1/ifnames-%%BUILD_VERSION%%.1.gz
man/man1/config.sub-2.69.1.gz
man/man1/ifnames-2.69.1.gz
share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm
share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm
share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm
share/autoconf-%%BUILD_VERSION%%/Autom4te/Config.pm
share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm
share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm
share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm

share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4
share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4
share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4
share/autoconf-%%BUILD_VERSION%%/autoconf/trailer.m4
share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4
share/autoconf-%%BUILD_VERSION%%/autom4te.cfg
share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list

share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f
share/autoconf-%%BUILD_VERSION%%/autotest/general.m4
share/autoconf-%%BUILD_VERSION%%/autotest/specific.m4
share/autoconf-%%BUILD_VERSION%%/build-aux/config.guess
share/autoconf-%%BUILD_VERSION%%/build-aux/config.sub
share/autoconf-%%BUILD_VERSION%%/build-aux/install-sh
share/autoconf-%%BUILD_VERSION%%/install-sh
share/autoconf-%%BUILD_VERSION%%/m4sugar/foreach.m4
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4
share/autoconf-%%BUILD_VERSION%%/mdate-sh
share/autoconf-%%BUILD_VERSION%%/missing
- 

Return to bug 258046

Lines 1-44 Link Here

(-)b/devel/autoconf/Makefile (-23 / +18 lines)
1	# Created by: ade@FreeBSD.org	1	# Created by: ade@FreeBSD.org
2		2
3	PORTNAME= autoconf	3	PORTNAME= autoconf
4	PORTVERSION= 2.69	4	PORTVERSION= 2.71
5	PORTREVISION= 3
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= GNU	6	MASTER_SITES= GNU
8		7
9	MAINTAINER= tijl@FreeBSD.org	8	MAINTAINER= tijl@FreeBSD.org
10	COMMENT= Automatically configure source code on many Un*x platforms	9	COMMENT= Automatically configure source code on many Un*x platforms
11		10
12	LICENSE= GPLv2+ GPLv3+ GFDL AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION	11	LICENSE= AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION GFDL GPLv2+ GPLv3+
13	LICENSE_COMB= multi	12	LICENSE_COMB= multi
14	LICENSE_NAME_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= AUTOCONF CONFIGURE SCRIPT EXCEPTION	13	LICENSE_NAME_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= AUTOCONF CONFIGURE SCRIPT EXCEPTION
		14	LICENSE_FILE_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= ${WRKSRC}/COPYING.EXCEPTION
		15	LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi
15	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING	16	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
16	LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYINGv3	17	LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYINGv3
17	LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi	18	LICENSE_PERMS_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= dist-mirror dist-sell \
18	LICENSE_FILE_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= ${WRKSRC}/COPYING.EXCEPTION	19	pkg-mirror pkg-sell \
19	LICENSE_PERMS_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	20	auto-accept
20		21
21	BUILD_DEPENDS= gm4:devel/m4 \	22	BUILD_DEPENDS= gm4:devel/m4 \
22	help2man:misc/help2man	23	help2man:misc/help2man
23	RUN_DEPENDS= gm4:devel/m4 \	24	RUN_DEPENDS= autoconf-wrapper:devel/autoconf-wrapper \
24	autoconf-wrapper:devel/autoconf-wrapper	25	gm4:devel/m4
25		26
26	BUILD_VERSION= 2.69
27	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
28	USES= gmake makeinfo perl5 tar:xz	27	USES= gmake makeinfo perl5 tar:xz
29	INFO= autoconf
30		28
31	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
32	CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 AWK=${AWK} \	30	CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} \
33	ac_cv_prog_TEST_EMACS=no	31	--without-lispdir
34	CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} --without-lispdir	32	CONFIGURE_ENV= ac_cv_prog_TEST_EMACS=no \
35		33	AWK=${AWK} \
36	GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing	34	M4=${LOCALBASE}/bin/gm4
37	GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \
38	ifnames
39		35
40	NO_ARCH= yes	36	NO_ARCH= yes
41		37
		38	INFO= autoconf
		39	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
		40	BUILD_VERSION= 2.71
		41
42	post-patch:	42	post-patch:
43	@(cd ${WRKSRC}/man && \	43	@(cd ${WRKSRC}/man && \
44	for file in *.[1x]; do \	44	for file in *.[1x]; do \
Lines 49-57 post-patch: Link Here
49	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} -e \	49	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} -e \
50	's\|@PACKAGE@$$\|@PACKAGE@-@VERSION@\|'	50	's\|@PACKAGE@$$\|@PACKAGE@-@VERSION@\|'
51		51
52	post-install:
53	.for FILE in ${GENERIC_TOOLS}
54	${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}
55	.endfor
56
57	.include <bsd.port.mk>	52	.include <bsd.port.mk>

Added Link Here

(-)b/devel/autoconf/files/patch-Makefile.in (+102 lines)
1	--- Makefile.in.orig 2021-08-25 07:33:58 UTC
2	+++ Makefile.in
3	@@ -311,13 +311,13 @@ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V
4	am__v_texidevnull_0 = > /dev/null
5	am__v_texidevnull_1 =
6	am__dirstamp = $(am__leading_dot)dirstamp
7	-INFO_DEPS = $(srcdir)/doc/autoconf.info $(srcdir)/doc/standards.info
8	+INFO_DEPS = $(srcdir)/doc/autoconf.info
9	am__TEXINFO_TEX_DIR = $(srcdir)/build-aux
10	-DVIS = doc/autoconf.dvi doc/standards.dvi
11	-PDFS = doc/autoconf.pdf doc/standards.pdf
12	-PSS = doc/autoconf.ps doc/standards.ps
13	-HTMLS = doc/autoconf.html doc/standards.html
14	-TEXINFOS = doc/autoconf.texi doc/standards.texi
15	+DVIS = doc/autoconf.dvi
16	+PDFS = doc/autoconf.pdf
17	+PSS = doc/autoconf.ps
18	+HTMLS = doc/autoconf.html
19	+TEXINFOS = doc/autoconf.texi
20	TEXI2DVI = texi2dvi
21	TEXI2PDF = $(TEXI2DVI) --pdf --batch
22	MAKEINFOHTML = $(MAKEINFO) --html
23	@@ -691,7 +691,7 @@ ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\
24	AM_MAKEINFOFLAGS = --no-split
25	TEXI2HTML_FLAGS = -split_chapter
26	TEXINFO_TEX = build-aux/texinfo.tex
27	-info_TEXINFOS = doc/autoconf.texi doc/standards.texi
28	+info_TEXINFOS = doc/autoconf.texi
29	doc_autoconf_TEXINFOS = doc/fdl.texi doc/install.texi
30	doc_standards_TEXINFOS = doc/fdl.texi doc/gnu-oids.texi doc/make-stds.texi
31	TAGS_FILES = $(dist_perllib_DATA) $(dist_autoconflib_DATA) \
32	@@ -1083,50 +1083,6 @@ mostlyclean-vti:
33
34	maintainer-clean-vti:
35	-rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi
36	-
37	-$(srcdir)/doc/standards.info: doc/standards.texi $(doc_standards_TEXINFOS)
38	- $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
39	- am__cwd=`pwd` && $(am__cd) $(srcdir) && \
40	- rm -rf $$backupdir && mkdir $$backupdir && \
41	- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
42	- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
43	- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
44	- done; \
45	- else :; fi && \
46	- cd "$$am__cwd"; \
47	- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
48	- -o $@ $(srcdir)/doc/standards.texi; \
49	- then \
50	- rc=0; \
51	- $(am__cd) $(srcdir); \
52	- else \
53	- rc=$$?; \
54	- $(am__cd) $(srcdir) && \
55	- $$restore $$backupdir/* `echo "./$@" \| sed 's\|[^/]*$$\|\|'`; \
56	- fi; \
57	- rm -rf $$backupdir; exit $$rc
58	-
59	-doc/standards.dvi: doc/standards.texi $(doc_standards_TEXINFOS) doc/$(am__dirstamp)
60	- $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
61	- MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
62	- $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
63	- `test -f 'doc/standards.texi' \|\| echo '$(srcdir)/'`doc/standards.texi
64	-
65	-doc/standards.pdf: doc/standards.texi $(doc_standards_TEXINFOS) doc/$(am__dirstamp)
66	- $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
67	- MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
68	- $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
69	- `test -f 'doc/standards.texi' \|\| echo '$(srcdir)/'`doc/standards.texi
70	-
71	-doc/standards.html: doc/standards.texi $(doc_standards_TEXINFOS) doc/$(am__dirstamp)
72	- $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
73	- $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
74	- -o $(@:.html=.htp) `test -f 'doc/standards.texi' \|\| echo '$(srcdir)/'`doc/standards.texi; \
75	- then \
76	- rm -rf $@ && mv $(@:.html=.htp) $@; \
77	- else \
78	- rm -rf $(@:.html=.htp); exit 1; \
79	- fi
80	.dvi.ps:
81	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
82	$(DVIPS) $(AM_V_texinfo) -o $@ $<
83	@@ -1208,16 +1164,11 @@ dist-info: $(INFO_DEPS)
84	done
85
86	mostlyclean-aminfo:
87	- -rm -rf doc/autoconf.t2d doc/autoconf.t2p doc/standards.t2d \
88	- doc/standards.t2p
89	+ -rm -rf doc/autoconf.t2d doc/autoconf.t2p
90
91	clean-aminfo:
92	- -test -z "doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html \
93	- doc/standards.dvi doc/standards.pdf doc/standards.ps \
94	- doc/standards.html" \
95	- \|\| rm -rf doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html \
96	- doc/standards.dvi doc/standards.pdf doc/standards.ps \
97	- doc/standards.html
98	+ -test -z "doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html" \
99	+ \|\| rm -rf doc/autoconf.dvi doc/autoconf.pdf doc/autoconf.ps doc/autoconf.html
100
101	maintainer-clean-aminfo:
102	@list='$(INFO_DEPS)'; for i in $$list; do \

Removed Link Here

(-)a/devel/autoconf/files/patch-doc-Makefile.in (-18 lines)
1	--- doc/Makefile.in.orig 2012-04-25 02:40:26 UTC
2	+++ doc/Makefile.in
3	@@ -65,13 +65,13 @@ CONFIG_CLEAN_FILES =
4	CONFIG_CLEAN_VPATH_FILES =
5	SOURCES =
6	DIST_SOURCES =
7	-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
8	+INFO_DEPS = $(srcdir)/autoconf.info
9	am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
10	DVIS = autoconf.dvi standards.dvi
11	PDFS = autoconf.pdf standards.pdf
12	PSS = autoconf.ps standards.ps
13	HTMLS = autoconf.html standards.html
14	-TEXINFOS = autoconf.texi standards.texi
15	+TEXINFOS = autoconf.texi
16	TEXI2DVI = texi2dvi
17	TEXI2PDF = $(TEXI2DVI) --pdf --batch
18	MAKEINFOHTML = $(MAKEINFO) --html

Lines 1-24 Link Here

(-)b/devel/autoconf/files/patch-doc_autoconf.texi (-26 / +6 lines)
1	--- doc/autoconf.texi.orig 2012-04-25 02:14:19 UTC	1	--- doc/autoconf.texi.orig 2021-01-28 20:46:48 UTC
2	+++ doc/autoconf.texi	2	+++ doc/autoconf.texi
3	@@ -15,7 +15,7 @@	3	@@ -225,29 +225,9 @@ entitled ``GNU Free Documentation License.''
4	@c The ARG is an optional argument. To be used for macro arguments in
5	@c their documentation (@defmac).
6	@macro ovar{varname}
7	-@r{[}@var{\varname\}@r{]}@c
8	+@r{[}@var{\varname\}@r{]}
9	@end macro
10
11	@c @dvar(ARG, DEFAULT)
12	@@ -23,7 +23,7 @@
13	@c The ARG is an optional argument, defaulting to DEFAULT. To be used
14	@c for macro arguments in their documentation (@defmac).
15	@macro dvar{varname, default}
16	-@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
17	+@r{[}@var{\varname\} = @samp{\default\}@r{]}
18	@end macro
19
20	@c Handling the indexes with Texinfo yields several different problems.
21	@@ -217,31 +217,11 @@ entitled ``GNU Free Documentation Licens
22		4
23		5
24		6
Lines 26-33 Link Here
26	+@dircategory Programming & development tools	8	+@dircategory Programming & development tools
27	@direntry	9	@direntry
28	* Autoconf: (autoconf). Create source code configuration scripts.	10	* Autoconf: (autoconf). Create source code configuration scripts.
29	@end direntry	11	-@end direntry
30		12	-
31	-@dircategory Individual utilities	13	-@dircategory Individual utilities
32	-@direntry	14	-@direntry
33	-* autoscan: (autoconf)autoscan Invocation.	15	-* autoscan: (autoconf)autoscan Invocation.
Lines 46-53 Link Here
46	- Automatic update of @file{configure.ac}	28	- Automatic update of @file{configure.ac}
47	-* config.status: (autoconf)config.status Invocation. Recreating configurations.	29	-* config.status: (autoconf)config.status Invocation. Recreating configurations.
48	-* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite.	30	-* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite.
49	-@end direntry	31	@end direntry
50	-	32
51	@titlepage	33	@titlepage
52	@title Autoconf
53	@subtitle Creating Automatic Configuration Scripts

Removed Link Here

(-)a/devel/autoconf/files/patch-texinfo (-12 lines)
1	--- doc/autoconf.texi.orig 2012-04-25 02:14:19 UTC
2	+++ doc/autoconf.texi
3	@@ -5,9 +5,6 @@
4	@include version.texi
5	@settitle Autoconf
6	@setchapternewpage odd
7	-@ifnothtml
8	-@setcontentsaftertitlepage
9	-@end ifnothtml
10	@finalout
11
12	@c @ovar(ARG)

Lines 5-22 bin/autoreconf-%%BUILD_VERSION%% Link Here

(-)b/devel/autoconf/pkg-plist (-16 / +12 lines)
5	bin/autoscan-%%BUILD_VERSION%%	5	bin/autoscan-%%BUILD_VERSION%%
6	bin/autoupdate-%%BUILD_VERSION%%	6	bin/autoupdate-%%BUILD_VERSION%%
7	bin/ifnames-%%BUILD_VERSION%%	7	bin/ifnames-%%BUILD_VERSION%%
8	man/man1/autoconf-2.69.1.gz	8	man/man1/autoconf-%%BUILD_VERSION%%.1.gz
9	man/man1/autoheader-2.69.1.gz	9	man/man1/autoheader-%%BUILD_VERSION%%.1.gz
10	man/man1/autom4te-2.69.1.gz	10	man/man1/autom4te-%%BUILD_VERSION%%.1.gz
11	man/man1/autoreconf-2.69.1.gz	11	man/man1/autoreconf-%%BUILD_VERSION%%.1.gz
12	man/man1/autoscan-2.69.1.gz	12	man/man1/autoscan-%%BUILD_VERSION%%.1.gz
13	man/man1/autoupdate-2.69.1.gz	13	man/man1/autoupdate-%%BUILD_VERSION%%.1.gz
14	man/man1/config.guess-2.69.1.gz	14	man/man1/ifnames-%%BUILD_VERSION%%.1.gz
15	man/man1/config.sub-2.69.1.gz
16	man/man1/ifnames-2.69.1.gz
17	share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm	15	share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm
18	share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm	16	share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm
19	share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm	17	share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm
		18	share/autoconf-%%BUILD_VERSION%%/Autom4te/Config.pm
20	share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm	19	share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm
21	share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm	20	share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm
22	share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm	21	share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm
Lines 43-48 share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 Link Here
43	share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4	42	share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4
44	share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4	43	share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4
45	share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4	44	share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4
		45	share/autoconf-%%BUILD_VERSION%%/autoconf/trailer.m4
46	share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4	46	share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4
47	share/autoconf-%%BUILD_VERSION%%/autom4te.cfg	47	share/autoconf-%%BUILD_VERSION%%/autom4te.cfg
48	share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list	48	share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list
Lines 50-64 share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 Link Here
50	share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f	50	share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f
51	share/autoconf-%%BUILD_VERSION%%/autotest/general.m4	51	share/autoconf-%%BUILD_VERSION%%/autotest/general.m4
52	share/autoconf-%%BUILD_VERSION%%/autotest/specific.m4	52	share/autoconf-%%BUILD_VERSION%%/autotest/specific.m4
53	share/autoconf-%%BUILD_VERSION%%/config.guess	53	share/autoconf-%%BUILD_VERSION%%/build-aux/config.guess
54	share/autoconf-%%BUILD_VERSION%%/config.sub	54	share/autoconf-%%BUILD_VERSION%%/build-aux/config.sub
55	share/autoconf-%%BUILD_VERSION%%/elisp-comp	55	share/autoconf-%%BUILD_VERSION%%/build-aux/install-sh
56	share/autoconf-%%BUILD_VERSION%%/install-sh
57	share/autoconf-%%BUILD_VERSION%%/m4sugar/foreach.m4	56	share/autoconf-%%BUILD_VERSION%%/m4sugar/foreach.m4
58	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4	57	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4
59	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f	58	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f
60	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4	59	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4
61	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f	60	share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
62	share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4	61	share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4
63	share/autoconf-%%BUILD_VERSION%%/mdate-sh
64	share/autoconf-%%BUILD_VERSION%%/missing
65	-