devel/gmake: Update to 4.4.1

Some ports required patches.

PR:		272216
Exp-run by:	antoine

Mk/Uses/gmake.mk

@@ -12,7 +12,7 @@ _INCLUDE_USES_GMAKE_MK=	yes
 IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
 .  endif
 
-BUILD_DEPENDS+=		gmake>=4.3:devel/gmake
+BUILD_DEPENDS+=		gmake>=4.4.1:devel/gmake
 CONFIGURE_ENV+=		MAKE=gmake
 MAKE_CMD=		gmake
 

audio/flite/files/patch-main_Makefile

@@ -1,6 +1,15 @@
 --- main/Makefile.orig	2017-10-21 14:01:07 UTC
 +++ main/Makefile
-@@ -133,15 +133,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o flite_lang_list
+@@ -49,7 +49,7 @@ ALL = shared_libs \
+       $(BINDIR)/flite$(EXEEXT) \
+       $(BINDIR)/t2p$(EXEEXT) $(BINDIR)/compile_regexes$(EXEEXT) \
+       $(BINDIR)/flitevox_info$(EXEEXT) \
+-      flite_voice_list.c each $(EXTRABINS)
++      each $(EXTRABINS)
+
+ VOICES=$(VOXES)
+ VOICELIBS=$(VOICES:%=flite_%)
+@@ -133,15 +133,15 @@ install:
 
  install:
  #       The basic binaries

devel/asmutils/Makefile

@@ -17,6 +17,7 @@ BUILD_DEPENDS=	nasm:devel/nasm
 USES=		gmake
 USE_GCC=	yes
 MAKE_ARGS=	OS="${OPSYS:tu}" KERNEL="${OSREL:S/.//g}" CC="${CC}" LD="${LD}"
+MAKE_JOBS_UNSAFE=yes
 
 # This will play merry hell with portlint(1)
 BINARIES=	bonus/asmutils basename cal cat chmod chown chroot cmp cp \

devel/cscout/files/patch-src_Makefile

@@ -1,6 +1,24 @@
 --- src/Makefile.orig	2019-11-04 16:42:35 UTC
 +++ src/Makefile
-@@ -207,12 +207,13 @@ mkerr:
+@@ -153,7 +153,7 @@ build/%.o: %.cpp
+
+ # Dependency generation rules
+ # See https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html
+-dep/%.d: %.cpp
++dep/%.d: %.cpp parse.tab.h
+ 	@set -e; rm -f $@; \
+ 	mkdir -p dep ; \
+ 	$(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
+@@ -167,6 +167,8 @@ dep/%.d: %.c
+ 	sed 's,\($*\)\.o[ :]*,build/\1.o $@ : ,g' < $@.$$$$ > $@; \
+ 	rm -f $@.$$$$
+
++dep/html.d: css.c
++
+ # Serialize execution order to ensure the dependencies are built before
+ # compiling the object files in make -j invocations
+ all:
+@@ -207,12 +209,13 @@ mkerr:
 
  # This ensures that the version.cpp is regenerated iff its SHA doesn't
  # match the current one.
@@ -17,7 +35,7 @@
 
 
  test:
-@@ -264,6 +265,7 @@ obfuscation:
+@@ -264,6 +267,7 @@ install: build/cscout
  	)
 
  install: build/cscout

devel/gdb/Makefile

@@ -141,8 +141,8 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin/gdb${VER}
 	${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/gdb${VER}.1
-	(cd ${INSTALL_WRKSRC}/gdb/data-directory ; \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls )
+	(cd ${INSTALL_WRKSRC}/gdb/data-directory ; ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls )
 
 do-install-KGDB-on:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gdb/kgdb \
@@ -162,18 +162,18 @@ do-install-GDB_LINK-on:
 .endif
 
 do-install-PYTHON-on:
-	(cd ${INSTALL_WRKSRC}/gdb ; \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
-	(cd ${INSTALL_WRKSRC}/gdb/data-directory ; \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
+	(cd ${INSTALL_WRKSRC}/gdb ; ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
+	(cd ${INSTALL_WRKSRC}/gdb/data-directory ; ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
 	@(cd ${STAGEDIR}${PREFIX}/share/gdb/python && \
 		${PYTHON_CMD} -m compileall .)
 . for f in gdb gdb/command gdb/function gdb/printer
 	@(cd ${STAGEDIR}${PREFIX}/share/gdb/python/${f} ; ${CHMOD} 644 *.py* )
 . endfor
 .if exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1)
-	@(cd ${WRKSRC_libcxx} ; \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} \
+	@(cd ${WRKSRC_libcxx} ; ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
 		    LIBCXX_DIR="${LIBCXX_DIR}" install )
 	@(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/${LIBCXX_DIR} && \
 		${PYTHON_CMD} -m compileall .)
@@ -187,9 +187,9 @@ do-install-PYTHON-on:
 # breakage at run time.
 
 do-install-GUILE-on:
-	(cd ${INSTALL_WRKSRC}/gdb ; \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
-	(cd ${INSTALL_WRKSRC}/gdb/data-directory ; \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
+	(cd ${INSTALL_WRKSRC}/gdb ; ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
+	(cd ${INSTALL_WRKSRC}/gdb/data-directory ; ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
 
 .include <bsd.port.post.mk>

devel/gmake/Makefile

@@ -1,9 +1,8 @@
-PORTNAME=	gmake
-PORTVERSION=	4.3
-PORTREVISION=	3
+PORTNAME=	make
+DISTVERSION=	4.4.1
 CATEGORIES=	devel
-MASTER_SITES=	GNU/make
-DISTNAME=	make-${PORTVERSION}
+MASTER_SITES=	GNU
+PKGNAMEPREFIX=	g
 
 # note: before committing to this port, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
@@ -15,21 +14,20 @@ WWW=		https://www.gnu.org/software/make/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		cpe tar:lz
+CPE_VENDOR=	gnu
+
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g \
 		--without-guile
 
-USES=		cpe tar:lz
-CPE_VENDOR=	gnu
-CPE_PRODUCT=	make
+INFO=		make
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
-INFO=		make
-
 .include <bsd.port.mk>

devel/gmake/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1587222848
-SHA256 (make-4.3.tar.lz) = de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
-SIZE (make-4.3.tar.lz) = 1266180
+TIMESTAMP = 1687757277
+SHA256 (make-4.4.1.tar.lz) = 8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
+SIZE (make-4.4.1.tar.lz) = 1305648

devel/gmake/files/patch-configure

@@ -0,0 +1,11 @@
+--- configure.orig	2023-02-26 18:46:38 UTC
++++ configure
+@@ -6741,7 +6741,7 @@ fi
+
+
+
+-printf "%s\n" "#define MAKE_CXX \"$CXX\"" >>confdefs.h
++printf "%s\n" "#define MAKE_CXX \"c++\"" >>confdefs.h
+
+
+ # Configure gnulib

devel/gmake/pkg-plist

@@ -21,6 +21,7 @@ include/gnumake.h
 %%NLS%%share/locale/pl/LC_MESSAGES/make.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/make.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/make.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/make.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/make.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/make.mo

games/jfsw/files/patch-jfaudiolib_Makefile.shared

@@ -0,0 +1,17 @@
+--- jfaudiolib/Makefile.shared.orig	2021-12-25 07:53:32 UTC
++++ jfaudiolib/Makefile.shared
+@@ -7,8 +7,12 @@ JFAUDIOLIB_LDFLAGS=
+ JFAUDIOLIB=libjfaudiolib.a
+ JFAUDIOLIB_LDFLAGS=
+
+-SDL2CONFIG?=$(shell which sdl2-config || which false)
+-PKGCONFIG?=$(shell which pkg-config || which false)
++ifndef SDL2CONFIG
++SDL2CONFIG!=which sdl2-config || which false
++endif
++ifndef PKGCONFIG
++PKGCONFIG!=which pkg-config || which false
++endif
+
+ machine=$(strip $(shell $(CC) -dumpmachine))
+

games/jfsw/files/patch-jfbuild_Makefile.shared

@@ -0,0 +1,17 @@
+--- jfbuild/Makefile.shared.orig	2021-12-09 08:50:13 UTC
++++ jfbuild/Makefile.shared
+@@ -3,8 +3,12 @@ EDITORLIB=src/libbuild.a
+ ENGINELIB=src/libengine.a
+ EDITORLIB=src/libbuild.a
+
+-SDL2CONFIG?=$(shell which sdl2-config || which false)
+-PKGCONFIG?=$(shell which pkg-config || which false)
++ifndef SDL2CONFIG
++SDL2CONFIG!=which sdl2-config || which false
++endif
++ifndef PKGCONFIG
++PKGCONFIG!=which pkg-config || which false
++endif
+ export SDL2CONFIG PKGCONFIG
+
+ # Path to the included libsquish

graphics/dynamechs/Makefile

@@ -20,7 +20,7 @@ SHEBANG_FILES=	make/*.pl
 
 MAKE_ENV=	OPENGLINCDIR="${LOCALBASE}/include" \
 		OPENGLLIBDIR="${LOCALBASE}/lib"
-
+MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	freebsd
 
 post-patch: