sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

devel/automake: Update to 1.17

Browse source 
biology/libneurosim: Fix use of libltdl.

dns/ddclient: Take out -Werror.

lang/sdcc:
- Patching ARCH is no longer needed.  Remove it because it touched some
  configure.ac files and that causes other autotools files to appear
  out-of-date.
- Run autoreconf in WRKSRC/device/lib/pic14 because aclocal.m4 and
  config.h.in appear out-of-date.

net/rpki-client: Patch Makefile.in instead of Makefile.am to avoid
autotools.

sysutils/genimage: Run configure with --disable-silent-rules because
upstream changed the default to silent and when silent rules are
enabled it also runs make with --no-print-directory which is a gmake
flag.  Patch Makefile.am so it uses --no-print-directory depending on
the actual verbosity instead of the default.

PR:		280277
Exp-run by:	antoine
This commit is contained in:
Tijl Coosemans 2024-07-14 16:14:05 +02:00
parent 129f7128df
commit c8eeb158e4
16 changed files with 126 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Uses/autoreconf.mk
View file

@ -92,7 +92,7 @@ _AUTORECONF= 2.72
BUILD_DEPENDS+= autoconf>=${_AUTORECONF}:devel/autoconf
. endif
BUILD_DEPENDS+= automake>=1.16.5:devel/automake
BUILD_DEPENDS+= automake>=1.17:devel/automake
. if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:devel/libtool

10
biology/libneurosim/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= libneurosim
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= biology
MAINTAINER= yuri@FreeBSD.org
@ -10,7 +11,9 @@ WWW= https://github.com/INCF/libneurosim
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf gmake libtool
LIB_DEPENDS= libltdl.so:devel/libltdl
USES= autoreconf libtool localbase
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@ -20,8 +23,6 @@ GH_ACCOUNT= INCF
INSTALL_TARGET= install-strip
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
OPTIONS_DEFINE= PYTHON
OPTIONS_DEFAULT= PYTHON
OPTIONS_SUB= yes
@ -29,7 +30,4 @@ OPTIONS_SUB= yes
PYTHON_CONFIGURE_ON= --with-python=${PYTHON_VER:R}
PYTHON_USES= python
pre-build: # ignore failure of the first run of the build command that always fails first, see https://github.com/INCF/libneurosim/issues/21
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} || ${TRUE}
.include <bsd.port.mk>

53
biology/libneurosim/files/patch-configure.ac Normal file
View file

@ -0,0 +1,53 @@
--- 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

17
devel/automake/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= automake
PORTVERSION= 1.16.5
PORTREVISION= 2
DISTVERSION= 1.17
CATEGORIES= devel
MASTER_SITES= GNU
@ -13,19 +12,19 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi
BUILD_DEPENDS= autoconf>=2.69:devel/autoconf
RUN_DEPENDS= autoconf>=2.69:devel/autoconf
BUILD_DEPENDS= autoconf>=2.72:devel/autoconf
RUN_DEPENDS= autoconf>=2.72:devel/autoconf
BUILD_VERSION= 1.16
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
USES= cpe perl5 tar:xz
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
INFO= automake automake-history
CPE_VENDOR= gnu
GNU_CONFIGURE= yes
NO_ARCH= yes
INFO= automake automake-history
PLIST_SUB= BUILD_VERSION=${DISTVERSION:C/(\.[^.]*).*/\1/}
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>

6
devel/automake/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1638700499
SHA256 (automake-1.16.5.tar.xz) = f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469
SIZE (automake-1.16.5.tar.xz) = 1601740
TIMESTAMP = 1720960384
SHA256 (automake-1.17.tar.xz) = 8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990
SIZE (automake-1.17.tar.xz) = 1652632

14
devel/automake/files/patch-Makefile.in
View file

@ -1,14 +0,0 @@
--- 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)

16
devel/automake/files/patch-m4_python.m4
View file

@ -1,16 +0,0 @@
--- 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])

18
devel/automake/pkg-plist
View file

@ -2,17 +2,12 @@ bin/aclocal
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
@ -20,6 +15,7 @@ share/aclocal-%%BUILD_VERSION%%/extra-recurs.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
@ -31,6 +27,7 @@ share/aclocal-%%BUILD_VERSION%%/obsolete.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
@ -39,7 +36,8 @@ share/aclocal-%%BUILD_VERSION%%/substnot.m4
share/aclocal-%%BUILD_VERSION%%/tar.m4
share/aclocal-%%BUILD_VERSION%%/upc.m4
share/aclocal-%%BUILD_VERSION%%/vala.m4
share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.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
@ -77,8 +75,8 @@ share/automake-%%BUILD_VERSION%%/am/distdir.am
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
@ -117,3 +115,7 @@ share/automake-%%BUILD_VERSION%%/test-driver
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

11
dns/ddclient/files/patch-configure.ac Normal file
View file

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

33
lang/sdcc/Makefile
View file

@ -1,7 +1,7 @@
PORTNAME= sdcc
PORTVERSION= 4.0.0
DISTVERSIONPREFIX=src-
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= lang
MASTER_SITES= SF
@ -76,40 +76,15 @@ post-patch:
${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

1
lang/sdcc/pkg-plist
View file

@ -243,6 +243,7 @@ bin/sdranlib
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libm.lib
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libme.lib
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libsdcc.lib
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic14/libsdcce.lib
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0.o
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0i.o
%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic16/crt0iz.o

2
net/rpki-client/Makefile
View file

@ -15,7 +15,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libtls.so:security/libretls
RUN_DEPENDS= rsync>0:net/rsync
USES= autoreconf:build libtool pkgconfig ssl
USES= libtool pkgconfig ssl
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

8
net/rpki-client/files/patch-Makefile.am → net/rpki-client/files/patch-Makefile.in
View file

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

1
sysutils/genimage/Makefile
View file

@ -19,6 +19,7 @@ USE_GITHUB= yes
GH_ACCOUNT= pengutronix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
PLIST_FILES= bin/genimage

12
sysutils/genimage/files/patch-Makefile.am Normal file
View file

@ -0,0 +1,12 @@
--- Makefile.am.orig 2024-07-04 14:07:20 UTC
+++ Makefile.am
@@ -1,6 +1,6 @@
-if BUILD_SILENTLY
-AM_MAKEFLAGS = --no-print-directory
-endif
+AM_MAKEFLAGS = $(AM_MAKEFLAGS_@AM_V@)
+AM_MAKEFLAGS_ = $(AM_MAKEFLAGS_@AM_DEFAULT_V@)
+AM_MAKEFLAGS_0 = --no-print-directory
EXTRA_DIST = \
README.rst \

12
sysutils/genimage/files/patch-configure.ac Normal file
View file

@ -0,0 +1,12 @@
--- configure.ac.orig 2024-07-04 14:07:20 UTC
+++ configure.ac
@@ -123,9 +123,6 @@ AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_CFLAGS)
-# be very silent on request
-AM_CONDITIONAL(BUILD_SILENTLY, test "x$AM_DEFAULT_VERBOSITY" = x0)
-
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_FILES([
Makefile