Attachment #249170 for bug #277046

Lines 88-95 _INCLUDE_USES_AUTORECONF_POST_MK= yes Link Here

(-)b/Mk/Uses/autoreconf.mk (-2 / +3 lines)
88	_AUTORECONF= 2.69	88	_AUTORECONF= 2.69
89	BUILD_DEPENDS+= autoconf2.69>=2.69:devel/autoconf2.69	89	BUILD_DEPENDS+= autoconf2.69>=2.69:devel/autoconf2.69
90	. else	90	. else
91	_AUTORECONF= 2.71	91	_AUTORECONF= 2.72
92	BUILD_DEPENDS+= autoconf>=2.71: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.16.5:devel/automake
Lines 101-106 BUILD_DEPENDS+= libtoolize:devel/libtool Link Here
101	# In case autoconf-switch wrapper scripts are used during build.	101	# In case autoconf-switch wrapper scripts are used during build.
102	CONFIGURE_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF}	102	CONFIGURE_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF}
103	MAKE_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF}	103	MAKE_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF}
		104	WRK_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF}
104		105
105	. if ${autoreconf_ARGS:Nbuild:N2.69}	106	. if ${autoreconf_ARGS:Nbuild:N2.69}
106	IGNORE= incorrect 'USES+=autoreconf:${autoreconf_ARGS}'\	107	IGNORE= incorrect 'USES+=autoreconf:${autoreconf_ARGS}'\

Added Link Here

(-)b/archivers/lha-ac/files/patch-configure.ac (+10 lines)
1	--- configure.ac.orig 2021-11-25 09:41:46 UTC
2	+++ configure.ac
3	@@ -11,6 +11,7 @@ AC_DEFINE_UNQUOTED(PLATFORM, "$ac_cv_host",
4	[the type of system on which the package will run.])
5
6	# Checks for programs.
7	+AC_PROG_CPP
8	AC_PROG_CC
9	AC_PROG_GCC_TRADITIONAL
10	AC_PROG_INSTALL




PORTNAME=	autoconf
DISTVERSION=	2.72
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	GNU


RUN_DEPENDS=	autoconf-switch>=0:devel/autoconf-switch \
		gm4:devel/m4

VERSION=	2.71
USES=		perl5 tar:xz

VERSION=	${DISTVERSION}

GNU_CONFIGURE=	yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS=	--program-suffix=${VERSION} \

Lines 1-3 Link Here

(-)b/devel/autoconf/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1651493393	1	TIMESTAMP = 1709723659
2	SHA256 (autoconf-2.71.tar.xz) = f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4	2	SHA256 (autoconf-2.72.tar.xz) = ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a
3	SIZE (autoconf-2.71.tar.xz) = 1292296	3	SIZE (autoconf-2.72.tar.xz) = 1389680

Lines 58-61 share/man/man1/ifnames%%VERSION%%.1.gz Link Here

(-)b/devel/autoconf/pkg-plist (-1 / +1 lines)
58	%%DATADIR%%/m4sugar/m4sh.m4f	58	%%DATADIR%%/m4sugar/m4sh.m4f
59	%%DATADIR%%/m4sugar/m4sugar.m4	59	%%DATADIR%%/m4sugar/m4sugar.m4
60	%%DATADIR%%/m4sugar/m4sugar.m4f	60	%%DATADIR%%/m4sugar/m4sugar.m4f
61	%%DATADIR%%/m4sugar/version.m4	61	%%DATADIR%%/version.m4




--- configure.ac.orig	2022-12-06 08:23:41 UTC
+++ configure.ac
@@ -134,13 +134,13 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
 m4_ifndef([PKG_PROG_PKG_CONFIG],
    [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
 PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
-AS_IF([test -z "$PKG_CONFIG"],
+AS_IF([test -z "$PKG_CONFIG"],[
    AC_MSG_ERROR([
    *** pkg-config with version >= 0.28 could not be found.
    ***
    *** Make sure it is in your path, or set the PKG_CONFIG environment variable
    *** to the full path to pkg-config.])
-)
+])
 
 # glib2?
 PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)

Lines 38-44 post-extract: Link Here

(-)b/mail/mu4e/Makefile (-1 / +1 lines)
38	${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \	38	${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \
39	${WRKSRC}/mu4e/org-mu4e.el	39	${WRKSRC}/mu4e/org-mu4e.el
40		40
41	pre-build:	41	post-configure:
42	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \	42	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
43	${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \	43	${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
44	>> ${BUILD_WRKSRC}/Makefile	44	>> ${BUILD_WRKSRC}/Makefile




 
 # asan is somewhat similar to valgrind, but has low enough overhead so it
 # can be used during normal operation.
@@ -134,52 +134,22 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
 m4_ifndef([PKG_PROG_PKG_CONFIG],
    [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
 PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
-AS_IF([test -z "$PKG_CONFIG"],
+AS_IF([test -z "$PKG_CONFIG"],[
    AC_MSG_ERROR([
    *** pkg-config with version >= 0.28 could not be found.
    ***
    *** Make sure it is in your path, or set the PKG_CONFIG environment variable
    *** to the full path to pkg-config.])
-)
+])
 
 # glib2?
-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)

 ###############################################################################
 # we set the set the version of the MuStore (Xapian database) layout
 # here; it will become part of the db name, so we can automatically
@@ -247,24 +217,10 @@ Makefile
 
 AC_CONFIG_FILES([
 Makefile

Added Link Here

(-)b/multimedia/bino/files/patch-configure.ac (+10 lines)
1	--- configure.ac.orig 2016-12-16 08:05:02 UTC
2	+++ configure.ac
3	@@ -35,6 +35,7 @@ AC_PROG_CXX
4	AM_INIT_AUTOMAKE([1.11.1 color-tests silent-rules tar-pax no-texinfo.tex -Wall -Wno-portability])
5	AM_SILENT_RULES([yes])
6	AC_PROG_CXX
7	+AC_PROG_GREP
8	AC_PROG_INSTALL
9	AC_PROG_RANLIB
10	AC_PROG_LN_S

Lines 19-25 LIB_DEPENDS= liblz4.so:archivers/liblz4 \ Link Here

(-)b/net/rsync/Makefile (-2 / +4 lines)
19	libxxhash.so:devel/xxhash \	19	libxxhash.so:devel/xxhash \
20	libzstd.so:archivers/zstd	20	libzstd.so:archivers/zstd
21		21
22	USES= cpe python shebangfix ssl autoreconf	22	USES= autoreconf:build cpe python shebangfix ssl
23	PYTHON_NO_DEPENDS= yes	23	PYTHON_NO_DEPENDS= yes
24	CPE_VENDOR= samba	24	CPE_VENDOR= samba
25	CPE_PRODUCT= rsync	25	CPE_PRODUCT= rsync
Lines 94-99 post-patch: Link Here
94	${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5	94	${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
95	@${REINPLACE_CMD} -e 's\|/usr/bin/rsync\|${PREFIX}/bin/rsync\|g' ${WRKSRC}/support/rrsync	95	@${REINPLACE_CMD} -e 's\|/usr/bin/rsync\|${PREFIX}/bin/rsync\|g' ${WRKSRC}/support/rrsync
96		96
		97	pre-configure:
		98	@(cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_CMD} -f prepare-source.mak)
		99
97	post-install:	100	post-install:
98	@${MKDIR} ${STAGEDIR}${ETCDIR}	101	@${MKDIR} ${STAGEDIR}${ETCDIR}
99	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/	102	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
100	-

Return to bug 277046

Lines 1-6 Link Here

(-)b/devel/autoconf/Makefile (-3 / +3 lines)
1	PORTNAME= autoconf	1	PORTNAME= autoconf
2	PORTVERSION= 2.71	2	DISTVERSION= 2.72
3	PORTREVISION= 1
4	CATEGORIES= devel	3	CATEGORIES= devel
5	MASTER_SITES= GNU	4	MASTER_SITES= GNU
6		5
Lines 21-29 BUILD_DEPENDS= gm4:devel/m4 Link Here
21	RUN_DEPENDS= autoconf-switch>=0:devel/autoconf-switch \	20	RUN_DEPENDS= autoconf-switch>=0:devel/autoconf-switch \
22	gm4:devel/m4	21	gm4:devel/m4
23		22
24	VERSION= 2.71
25	USES= perl5 tar:xz	23	USES= perl5 tar:xz
26		24
		25	VERSION= ${DISTVERSION}
		26
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
28	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share	28	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
29	CONFIGURE_ARGS= --program-suffix=${VERSION} \	29	CONFIGURE_ARGS= --program-suffix=${VERSION} \

Added Link Here

(-)b/mail/mu/files/patch-configure.ac (+18 lines)
1	--- configure.ac.orig 2022-12-06 08:23:41 UTC
2	+++ configure.ac
3	@@ -134,13 +134,13 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
4	m4_ifndef([PKG_PROG_PKG_CONFIG],
5	[m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
6	PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
7	-AS_IF([test -z "$PKG_CONFIG"],
8	+AS_IF([test -z "$PKG_CONFIG"],[
9	AC_MSG_ERROR([
10	*** pkg-config with version >= 0.28 could not be found.
11	***
12	*** Make sure it is in your path, or set the PKG_CONFIG environment variable
13	*** to the full path to pkg-config.])
14	-)
15	+])
16
17	# glib2?
18	PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)

Lines 46-53 Link Here

(-)b/mail/mu4e/files/patch-configure.ac (-3 / +14 lines)
46		46
47	# asan is somewhat similar to valgrind, but has low enough overhead so it	47	# asan is somewhat similar to valgrind, but has low enough overhead so it
48	# can be used during normal operation.	48	# can be used during normal operation.
49	@@ -143,43 +143,13 @@ AS_IF([test -z "$PKG_CONFIG"],	49	@@ -134,52 +134,22 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
50	)	50	m4_ifndef([PKG_PROG_PKG_CONFIG],
		51	[m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
		52	PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
		53	-AS_IF([test -z "$PKG_CONFIG"],
		54	+AS_IF([test -z "$PKG_CONFIG"],[
		55	AC_MSG_ERROR([
		56	*** pkg-config with version >= 0.28 could not be found.
		57	***
		58	*** Make sure it is in your path, or set the PKG_CONFIG environment variable
		59	*** to the full path to pkg-config.])
		60	-)
		61	+])
51		62
52	# glib2?	63	# glib2?
53	-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)	64	-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
Lines 94-100 Link Here
94	###############################################################################	105	###############################################################################
95	# we set the set the version of the MuStore (Xapian database) layout	106	# we set the set the version of the MuStore (Xapian database) layout
96	# here; it will become part of the db name, so we can automatically	107	# here; it will become part of the db name, so we can automatically
97	@@ -247,24 +217,10 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")	108	@@ -247,24 +217,10 @@ Makefile
98		109
99	AC_CONFIG_FILES([	110	AC_CONFIG_FILES([
100	Makefile	111	Makefile