sync with OpenBSD -current

games/hack/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2019/04/05 09:02:27 bentley Exp $
+#	$OpenBSD: Makefile,v 1.18 2024/02/08 20:28:53 miod Exp $
 
 PROG=	hack
 CFLAGS+=-I.
@@ -16,7 +16,7 @@ SRCS+=	alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 MAN=	hack.6
 DPADD+=	${LIBCURSES}
 LDADD+=	-lcurses
-CLEANFILES+=hack.onames.h makedefs
+CLEANFILES+=hack.onames.h makedefs makedefs.d
 
 BUILDFIRST = hack.onames.h
 

games/monop/Makefile

@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.7 2002/05/23 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2024/02/08 20:28:53 miod Exp $
 
 PROG=	monop
 SRCS=	monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \
 	print.c prop.c rent.c roll.c spec.c trade.c
 MAN=	monop.6
-CLEANFILES+=initdeck cards.pck
+CLEANFILES+=initdeck initdeck.d cards.pck
 
 monop: cards.pck
 

games/phantasia/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2022/07/11 03:11:49 daniel Exp $
+#	$OpenBSD: Makefile,v 1.21 2024/02/08 20:30:54 miod Exp $
 
 PROG=	phantasia
 SRCS=	main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
@@ -6,7 +6,7 @@ CFLAGS+=-DTERMIOS
 DPADD=	${LIBM} ${LIBCURSES}
 LDADD=	-lm -lcurses
 MAN=	phantasia.6
-CLEANFILES+=map setup setup.o phantglobs.o.bld
+CLEANFILES+=map setup setup.d setup.o phantglobs.o.d phantglobs.o.bld
 
 all: setup phantasia
 

gnu/usr.bin/cc/cc_tools/Makefile

@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.18 2017/07/19 12:50:32 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2024/02/08 20:28:54 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -390,11 +390,12 @@ gengtype-yacc+%DIKED.c: gengtype-yacc.c
 	    ${.ALLSRC} > ${.TARGET}
 
 GENSRCS+= gengtype-lex.c gengtype-yacc.h gengtype-yacc+%DIKED.c
-CLEANFILES+= gengtype-yacc.c
+CLEANFILES+= gengtype-yacc.c gengtype-lex.d gengtype-yacc+%DIKED.d
 
 gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
 	  ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+CLEANFILES+= gengtype.d
 
 gtype-desc.h:	gengtype
 	./gengtype
@@ -411,17 +412,23 @@ CLEANFILES+=	gt-*.h gtype-*.h
 .for F in check checksum genrtl modes
 gen$F:	gen$F.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+CLEANFILES+=	gen$F.d
 .endfor
+CLEANFILES+=	errors.d
 
 .for F in attr attrtab automata codes conditions config constants emit \
 	extract flags  opinit output peep preds recog
 gen$F:	gen$F.o rtl.o read-rtl.o ggc-none.o vec.o min-insn-modes.o \
 	gensupport.o print-rtl.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
+CLEANFILES+=	gen$F.d
 .endfor
+CLEANFILES+=	rtl.d read-rtl.d ggc-none.d vec.d min-insn-modes.d \
+	gensupport.d print-rtl.d
 
 gencondmd:	gencondmd.o
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+CLEANFILES+=	gencondmd.d
 
 #
 # Generated .md files.

gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2023/11/11 18:35:37 robert Exp $
+# $OpenBSD: Makefile,v 1.9 2024/02/08 20:28:54 miod Exp $
 
 LIB=	LLVMExecutionEngine
 NOPROFILE=
@@ -143,6 +143,7 @@ ExecutionEngineELF.cpp:
 .PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/RuntimeDyld
 .PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/RuntimeDyld/Targets
 
-CLEANFILES+= ExecutionEngineCore.cpp \
+CLEANFILES+= ExecutionEngineCOFF.cpp \
+	ExecutionEngineCore.cpp \
 	ExecutionEngineMachO.cpp \
 	ExecutionEngineELF.cpp

gnu/usr.bin/clang/libLLVMIRPrinter/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2023/11/11 18:35:37 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2024/02/08 20:28:54 miod Exp $
 
 LIB=	LLVMIRPrinter
 NOPROFILE=
@@ -9,3 +9,5 @@ IRPrinterIRPrintingPasses.cpp:
 	ln -s ${LLVM_SRCS}/lib/IRPrinter/IRPrintingPasses.cpp $@
 
 .PATH:	${.CURDIR}/../../../llvm/llvm/lib/IRPrinter
+
+CLEANFILES+= IRPrinterIRPrintingPasses.cpp

gnu/usr.bin/clang/libLLVMInstrumentation/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2023/11/11 18:35:37 robert Exp $
+# $OpenBSD: Makefile,v 1.13 2024/02/08 20:28:54 miod Exp $
 
 LIB=	LLVMInstrumentation
 NOPROFILE=
@@ -31,3 +31,5 @@ InstrumentationSanitizerBinaryMetadata.cpp:
 	ln -s ${LLVM_SRCS}/lib/Transforms/Instrumentation/SanitizerBinaryMetadata.cpp $@
 
 .PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/Instrumentation
+
+CLEANFILES+= InstrumentationSanitizerBinaryMetadata.cpp

gnu/usr.bin/clang/libLLVMObject/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2023/11/11 18:35:37 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2024/02/08 20:28:54 miod Exp $
 
 LIB=	LLVMObject
 NOPROFILE=
@@ -53,4 +53,5 @@ ObjectMinidump.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/llvm/lib/Object
 
-CLEANFILES+= ObjectELF.cpp ObjectError.cpp ObjectMinidump.cpp
+CLEANFILES+= ObjectDXContainer.cpp ObjectELF.cpp ObjectError.cpp \
+	ObjectMinidump.cpp

gnu/usr.bin/clang/libclangAST/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2023/11/11 18:35:38 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2024/02/08 20:28:54 miod Exp $
 
 LIB=	clangAST
 NOPIC=
@@ -121,6 +121,8 @@ SRCS+=	ByteCodeEmitter.cpp \
 
 BUILDFIRST=	AttrDocTable.inc \
 		Opcodes.inc
+CLEANFILES+=	AttrDocTable.inc \
+		Opcodes.inc
 
 AttrDocTable.inc:
 	${TBLGEN} -I${CLANG_INC} -gen-clang-attr-doc-table ${CLANG_INC}/clang/Basic/Attr.td \

gnu/usr.bin/clang/libclangBasic/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2023/11/11 18:35:38 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2024/02/08 20:28:54 miod Exp $
 
 LIB=	clangBasic
 NOPIC=
@@ -85,6 +85,7 @@ SRCS+=	AArch64.cpp \
 .PATH:	${.CURDIR}/../../../llvm/clang/lib/Basic/Targets
 
 BUILDFIRST=	VCSVersion.inc
+CLEANFILES+=	VCSVersion.inc
 
 VCSVersion.inc:
 	touch $@

gnu/usr.bin/clang/liblldCommon/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2023/11/11 18:35:39 robert Exp $
+# $OpenBSD: Makefile,v 1.6 2024/02/08 20:28:54 miod Exp $
 
 LIB=	lldCommon
 NOPROFILE=
@@ -22,6 +22,7 @@ SRCS=	Args.cpp \
 .PATH:	${.CURDIR}/../../../llvm/lld/Common
 
 BUILDFIRST=	VCSVersion.inc
+CLEANFILES+=	VCSVersion.inc
 
 VCSVersion.inc:
 	touch $@

gnu/usr.bin/clang/lldb-server/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2023/11/11 18:35:40 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2024/02/08 20:28:54 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -74,6 +74,7 @@ LLVM_LIBDEPS=	clangAST \
     lldbUtility
 
 BUILDFIRST=	VCSVersion.inc LLGSOptions.inc
+CLEANFILES+=	VCSVersion.inc LLGSOptions.inc
 
 VCSVersion.inc:
 	touch $@

gnu/usr.bin/clang/lldb/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2023/11/11 18:35:40 robert Exp $
+# $OpenBSD: Makefile,v 1.16 2024/02/08 20:28:54 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -82,6 +82,7 @@ Options.inc: Options.td
 		-o ${.TARGET} ${.ALLSRC}
 
 BUILDFIRST=	VCSVersion.inc
+CLEANFILES+=	Options.inc VCSVersion.inc
 
 VCSVersion.inc:
 	touch $@

lib/libcurses/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2023/10/17 09:52:08 nicm Exp $
+# $OpenBSD: Makefile,v 1.76 2024/02/08 20:28:54 miod Exp $
 
 LIB=	curses
 
@@ -72,12 +72,12 @@ MAN=	curs_add_wch.3 curs_add_wchstr.3 curs_addch.3 curs_addchstr.3 \
 	wresize.3
 GENERATED= codes.c comp_captab.c comp_userdefs.c expanded.c fallback.c \
 	init_keytry.h keys.list lib_gen.c lib_keyname.c make_hash make_keys \
-	names.c
+	names.c unctrl.c
 
 CAPLIST	= ${.CURDIR}/Caps
 USE_BIG_STRINGS	= 1
 
-CLEANFILES+= ${GENERATED}
+CLEANFILES+= ${GENERATED} make_hash.d make_keys.d
 
 BUILDFIRST = ${GENERATED}
 

sys/dev/fdt/if_dwge.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dwge.c,v 1.21 2023/11/20 20:41:18 kettenis Exp $	*/
+/*	$OpenBSD: if_dwge.c,v 1.22 2024/02/08 20:50:34 kettenis Exp $	*/
 /*
  * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
@@ -450,7 +450,9 @@ dwge_attach(struct device *parent, struct device *self, void *aux)
 	 * defragmenting mbufs before transmitting them fixes the
 	 * issue.
 	 */
-	if (OF_is_compatible(faa->fa_node, "starfive,jh7100-gmac"))
+	/* XXX drop "starfive,jh7100-gmac" in the future */
+	if (OF_is_compatible(faa->fa_node, "starfive,jh7100-gmac") ||
+	    OF_is_compatible(faa->fa_node, "starfive,jh7100-dwmac"))
 		sc->sc_defrag = 1;
 
 	/* Power up PHY. */

usr.sbin/mrouted/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2015/10/26 10:34:19 tedu Exp $
+#	$OpenBSD: Makefile,v 1.8 2024/02/08 20:28:54 miod Exp $
 
 PROG=	mrouted
 SRCS=	callout.c cfparse.c config.c igmp.c inet.c kern.c main.c prune.c \
@@ -7,6 +7,6 @@ MAN=	mrouted.8
 
 CFLAGS+=-I${.CURDIR}
 
-CLEANFILES+= cfparse.c y.tab.h
+CLEANFILES+= cfparse.c cfparse.h y.tab.h
 
 .include <bsd.prog.mk>