Attachment #252146 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/biology/libneurosim/Makefile (-6 / +4 lines)
1	PORTNAME= libneurosim	1	PORTNAME= libneurosim
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.2.0	3	DISTVERSION= 1.2.0
		4	PORTREVISION= 1
4	CATEGORIES= biology	5	CATEGORIES= biology
5		6
6	MAINTAINER= yuri@FreeBSD.org	7	MAINTAINER= yuri@FreeBSD.org
Lines 10-16 WWW= https://github.com/INCF/libneurosim Link Here
10	LICENSE= GPLv3	11	LICENSE= GPLv3
11	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
12		13
13	USES= autoreconf gmake libtool	14	LIB_DEPENDS= libltdl.so:devel/libltdl
		15
		16	USES= autoreconf libtool localbase
14	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
15		18
16	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
Lines 20-27 GH_ACCOUNT= INCF Link Here
20		23
21	INSTALL_TARGET= install-strip	24	INSTALL_TARGET= install-strip
22		25
23	BINARY_ALIAS= aclocal-1.15=aclocal automake-1.15=automake # workaround for the outdated aclocal-1.15 & automake-1.15 somehow placed into libltdl/Makefile
24
25	OPTIONS_DEFINE= PYTHON	26	OPTIONS_DEFINE= PYTHON
26	OPTIONS_DEFAULT= PYTHON	27	OPTIONS_DEFAULT= PYTHON
27	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
Lines 29-35 OPTIONS_SUB= yes Link Here
29	PYTHON_CONFIGURE_ON= --with-python=${PYTHON_VER:R}	30	PYTHON_CONFIGURE_ON= --with-python=${PYTHON_VER:R}
30	PYTHON_USES= python	31	PYTHON_USES= python
31		32
32	pre-build: # ignore failure of the first run of the build command that always fails first, see https://github.com/INCF/libneurosim/issues/21
33	@cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \|\| ${TRUE}
34
35	.include <bsd.port.mk>	33	.include <bsd.port.mk>




--- configure.ac.orig	2020-11-11 16:11:31 UTC
+++ configure.ac
@@ -1,7 +1,8 @@ AC_INIT(libneurosim, 1.2.0, [https://github.com/INCF/l
 dnl Process this file with autoconf to produce configure.
 AC_INIT(libneurosim, 1.2.0, [https://github.com/INCF/libneurosim/issues])
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([subdir-objects])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_MAINTAINER_MODE
 
 # Obtain host system type
@@ -203,21 +204,10 @@ LDFLAGS=
 NS_SET_LDFLAGS
 LDFLAGS=
 
-LT_PATH_LD
 LT_CONFIG_LTDL_DIR([libltdl])
-_LTDL_CONVENIENCE                 ## put libltdl into a convenience library
 LT_INIT([dlopen])                 ## use libtool
-m4_pattern_allow([LT_LIBEXT])     ## supress false positive message by autoconf
+LTDL_INIT([recursive])
 
-if test "x$BUILD_SHARED" != xno ; then
-  if test "x$LIBLTDL" != x ; then
-    AC_DEFINE(HAVE_LIBLTDL, 1, [Havel libltdl, can load dynamic modules])
-  fi
-fi
-
-AC_CONFIG_SUBDIRS(libltdl)        ## also configure subdir containing libltdl
-AC_PROG_LIBTOOL
-
 #-- Set the language to C++
 AC_LANG_CPLUSPLUS
 
@@ -237,15 +227,13 @@ AC_SUBST(PYTHON_INCLUDE)
 AC_SUBST(MPI_LIBS)
 AC_SUBST(MPI_INCLUDE)
 AC_SUBST(PYTHON_INCLUDE)
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_SUBST(HAVE_LIBLTDL)
 AC_SUBST(HAVE_MPI)
 AC_SUBST(NEUROSIM_HAVE_MPI)
 AC_SUBST(LIBADD_DL)
 
 AC_CONFIG_FILES([
   Makefile
+  libltdl/Makefile
   neurosim/Makefile
   neurosim/config.h
   neurosim/version.h

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

Added Link Here

(-)b/dns/ddclient/files/patch-configure.ac (+11 lines)
1	--- configure.ac.orig 2023-11-23 12:06:21 UTC
2	+++ configure.ac
3	@@ -11,7 +11,7 @@ AC_REQUIRE_AUX_FILE([tap-driver.sh])
4	# tap-driver.sh, so build-aux/tap-driver.sh is checked in to keep the
5	# above AC_REQUIRE_AUX_FILE line from causing configure to complain
6	# about a mising file if the user has Automake 1.11.)
7	-AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects parallel-tests])
8	+AM_INIT_AUTOMAKE([1.11 -Wall foreign subdir-objects parallel-tests])
9	AM_SILENT_RULES
10
11	AC_PROG_MKDIR_P




PORTNAME=	sdcc
PORTVERSION=	4.0.0
DISTVERSIONPREFIX=src-
PORTREVISION=	5
CATEGORIES=	lang
MASTER_SITES=	SF


		${WRKSRC}/support/sdbinutils/libiberty/Makefile.in
	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' \
		${WRKSRC}/support/sdbinutils/bfd/Makefile.in
	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/PICARCH/g' \
		${WRKSRC}/device/lib/pic14/Makefile.common \
		${WRKSRC}/device/lib/pic14/Makefile.in \
		${WRKSRC}/device/lib/pic14/configure \
		${WRKSRC}/device/lib/pic14/configure.ac \
		${WRKSRC}/device/lib/pic14/libc/Makefile.in \
		${WRKSRC}/device/lib/pic14/libm/Makefile.in \
		${WRKSRC}/device/lib/pic14/libsdcc/enhanced/Makefile.in \
		${WRKSRC}/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in \
		${WRKSRC}/device/lib/pic14/libsdcc/regular/Makefile.in \
		${WRKSRC}/device/lib/pic16/Makefile.in \
		${WRKSRC}/device/lib/pic16/configure \
		${WRKSRC}/device/lib/pic16/configure.ac \
		${WRKSRC}/device/lib/pic16/debug/Makefile.in \
		${WRKSRC}/device/lib/pic16/libc/Makefile.in \
		${WRKSRC}/device/lib/pic16/libio/Makefile.in \
		${WRKSRC}/device/lib/pic16/libm/Makefile.in \
		${WRKSRC}/device/lib/pic16/libsdcc/Makefile.in \
		${WRKSRC}/device/lib/pic16/startup/Makefile.in \
		${WRKSRC}/device/non-free/lib/pic14/Makefile.common.in \
		${WRKSRC}/device/non-free/lib/pic14/Makefile.rules \
		${WRKSRC}/device/non-free/lib/pic16/Makefile.in \
		${WRKSRC}/device/non-free/lib/pic16/configure \
		${WRKSRC}/device/non-free/lib/pic16/configure.ac \
		${WRKSRC}/device/non-free/lib/pic16/libdev/Makefile.in \
		${WRKSRC}/device/non-free/lib/pic16/libdev/mkmk.sh
	@${REINPLACE_CMD} 's/[[:<:]]arch[[:>:]]/picarch/g' \
		${WRKSRC}/device/non-free/lib/pic16/libdev/mkmk.sh

post-patch-DOCS-off:
	@${REINPLACE_CMD} 's, [a-z-]*doc,,' \
		${WRKSRC}/Makefile.in \
		${WRKSRC}/sim/ucsim/packages_in.mk

pre-configure:
	cd ${WRKSRC}/device/lib/pic14 && ${AUTORECONF} -f -i

post-install:
	${FIND} -d ${STAGEDIR}${DATADIR} -type d -empty -delete


Lines 243-248 bin/sdranlib Link Here

(-)b/lang/sdcc/pkg-plist (+1 lines)
243	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libm.lib	243	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libm.lib
244	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libme.lib	244	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libme.lib
245	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libsdcc.lib	245	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libsdcc.lib
		246	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libsdcce.lib
246	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0.o	247	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0.o
247	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0i.o	248	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0i.o
248	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0iz.o	249	%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0iz.o

Lines 15-21 LIB_DEPENDS= libexpat.so:textproc/expat2 \ Link Here

(-)b/net/rpki-client/Makefile (-1 / +1 lines)
15	libtls.so:security/libretls	15	libtls.so:security/libretls
16	RUN_DEPENDS= rsync>0:net/rsync	16	RUN_DEPENDS= rsync>0:net/rsync
17		17
18	USES= autoreconf:build libtool pkgconfig ssl	18	USES= libtool pkgconfig ssl
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share	21	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

Lines 1-6 Link Here

(-)b/net/rpki-client/files/patch-Makefile.in (-3 / +5 lines)
1	--- Makefile.am.orig 2023-12-18 09:15:10 UTC	1	--- Makefile.in.orig 2024-03-02 20:52:00 UTC
2	+++ Makefile.am	2	+++ Makefile.in
3	@@ -25,20 +25,8 @@ install-data-hook:	3	@@ -889,22 +889,10 @@ install-data-hook:
4		4
5	install-data-hook:	5	install-data-hook:
6	-@if [ ! -d "$(DESTDIR)$(RPKI_BASE_DIR)" ]; then \	6	-@if [ ! -d "$(DESTDIR)$(RPKI_BASE_DIR)" ]; then \
Lines 23-25 Link Here
23	- fi \	23	- fi \
24	+ $(INSTALL) -m 755 -d "$(DESTDIR)$(RPKI_OUT_DIR)"; \	24	+ $(INSTALL) -m 755 -d "$(DESTDIR)$(RPKI_OUT_DIR)"; \
25	fi	25	fi
		26
		27	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Lines 19-24 USE_GITHUB= yes Link Here

(-)b/sysutils/genimage/Makefile (-1 / +1 lines)
19	GH_ACCOUNT= pengutronix	19	GH_ACCOUNT= pengutronix
20		20
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
		22	CONFIGURE_ARGS= --disable-silent-rules
22		23
23	PLIST_FILES= bin/genimage	24	PLIST_FILES= bin/genimage
24		25
25	-

Return to bug 280277

Added Link Here

(-)b/biology/libneurosim/files/patch-configure.ac (+53 lines)
1	--- configure.ac.orig 2020-11-11 16:11:31 UTC
2	+++ configure.ac
3	@@ -1,7 +1,8 @@ AC_INIT(libneurosim, 1.2.0, [https://github.com/INCF/l
4	dnl Process this file with autoconf to produce configure.
5	AC_INIT(libneurosim, 1.2.0, [https://github.com/INCF/libneurosim/issues])
6	-AM_INIT_AUTOMAKE
7	-AM_CONFIG_HEADER([config.h])
8	+AM_INIT_AUTOMAKE([subdir-objects])
9	+AC_CONFIG_HEADERS([config.h])
10	+AC_CONFIG_MACRO_DIRS([m4])
11	AM_MAINTAINER_MODE
12
13	# Obtain host system type
14	@@ -203,21 +204,10 @@ LDFLAGS=
15	NS_SET_LDFLAGS
16	LDFLAGS=
17
18	-LT_PATH_LD
19	LT_CONFIG_LTDL_DIR([libltdl])
20	-_LTDL_CONVENIENCE ## put libltdl into a convenience library
21	LT_INIT([dlopen]) ## use libtool
22	-m4_pattern_allow([LT_LIBEXT]) ## supress false positive message by autoconf
23	+LTDL_INIT([recursive])
24
25	-if test "x$BUILD_SHARED" != xno ; then
26	- if test "x$LIBLTDL" != x ; then
27	- AC_DEFINE(HAVE_LIBLTDL, 1, [Havel libltdl, can load dynamic modules])
28	- fi
29	-fi
30	-
31	-AC_CONFIG_SUBDIRS(libltdl) ## also configure subdir containing libltdl
32	-AC_PROG_LIBTOOL
33	-
34	#-- Set the language to C++
35	AC_LANG_CPLUSPLUS
36
37	@@ -237,15 +227,13 @@ AC_SUBST(PYTHON_INCLUDE)
38	AC_SUBST(MPI_LIBS)
39	AC_SUBST(MPI_INCLUDE)
40	AC_SUBST(PYTHON_INCLUDE)
41	-AC_SUBST(INCLTDL)
42	-AC_SUBST(LIBLTDL)
43	-AC_SUBST(HAVE_LIBLTDL)
44	AC_SUBST(HAVE_MPI)
45	AC_SUBST(NEUROSIM_HAVE_MPI)
46	AC_SUBST(LIBADD_DL)
47
48	AC_CONFIG_FILES([
49	Makefile
50	+ libltdl/Makefile
51	neurosim/Makefile
52	neurosim/config.h
53	neurosim/version.h

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 (-8 / +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
		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

Lines 1-7 Link Here

(-)b/lang/sdcc/Makefile (-29 / +4 lines)
1	PORTNAME= sdcc	1	PORTNAME= sdcc
2	PORTVERSION= 4.0.0	2	PORTVERSION= 4.0.0
3	DISTVERSIONPREFIX=src-	3	DISTVERSIONPREFIX=src-
4	PORTREVISION= 4	4	PORTREVISION= 5
5	CATEGORIES= lang	5	CATEGORIES= lang
6	MASTER_SITES= SF	6	MASTER_SITES= SF
7		7
Lines 76-115 post-patch: Link Here
76	${WRKSRC}/support/sdbinutils/libiberty/Makefile.in	76	${WRKSRC}/support/sdbinutils/libiberty/Makefile.in
77	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' \	77	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' \
78	${WRKSRC}/support/sdbinutils/bfd/Makefile.in	78	${WRKSRC}/support/sdbinutils/bfd/Makefile.in
79	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/PICARCH/g' \
80	${WRKSRC}/device/lib/pic14/Makefile.common \
81	${WRKSRC}/device/lib/pic14/Makefile.in \
82	${WRKSRC}/device/lib/pic14/configure \
83	${WRKSRC}/device/lib/pic14/configure.ac \
84	${WRKSRC}/device/lib/pic14/libc/Makefile.in \
85	${WRKSRC}/device/lib/pic14/libm/Makefile.in \
86	${WRKSRC}/device/lib/pic14/libsdcc/enhanced/Makefile.in \
87	${WRKSRC}/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in \
88	${WRKSRC}/device/lib/pic14/libsdcc/regular/Makefile.in \
89	${WRKSRC}/device/lib/pic16/Makefile.in \
90	${WRKSRC}/device/lib/pic16/configure \
91	${WRKSRC}/device/lib/pic16/configure.ac \
92	${WRKSRC}/device/lib/pic16/debug/Makefile.in \
93	${WRKSRC}/device/lib/pic16/libc/Makefile.in \
94	${WRKSRC}/device/lib/pic16/libio/Makefile.in \
95	${WRKSRC}/device/lib/pic16/libm/Makefile.in \
96	${WRKSRC}/device/lib/pic16/libsdcc/Makefile.in \
97	${WRKSRC}/device/lib/pic16/startup/Makefile.in \
98	${WRKSRC}/device/non-free/lib/pic14/Makefile.common.in \
99	${WRKSRC}/device/non-free/lib/pic14/Makefile.rules \
100	${WRKSRC}/device/non-free/lib/pic16/Makefile.in \
101	${WRKSRC}/device/non-free/lib/pic16/configure \
102	${WRKSRC}/device/non-free/lib/pic16/configure.ac \
103	${WRKSRC}/device/non-free/lib/pic16/libdev/Makefile.in \
104	${WRKSRC}/device/non-free/lib/pic16/libdev/mkmk.sh
105	@${REINPLACE_CMD} 's/[[:<:]]arch[[:>:]]/picarch/g' \
106	${WRKSRC}/device/non-free/lib/pic16/libdev/mkmk.sh
107		79
108	post-patch-DOCS-off:	80	post-patch-DOCS-off:
109	@${REINPLACE_CMD} 's, [a-z-]*doc,,' \	81	@${REINPLACE_CMD} 's, [a-z-]*doc,,' \
110	${WRKSRC}/Makefile.in \	82	${WRKSRC}/Makefile.in \
111	${WRKSRC}/sim/ucsim/packages_in.mk	83	${WRKSRC}/sim/ucsim/packages_in.mk
112		84
		85	pre-configure:
		86	cd ${WRKSRC}/device/lib/pic14 && ${AUTORECONF} -f -i
		87
113	post-install:	88	post-install:
114	${FIND} -d ${STAGEDIR}${DATADIR} -type d -empty -delete	89	${FIND} -d ${STAGEDIR}${DATADIR} -type d -empty -delete
115		90