pkg/60282: fix build pkgsrc-wip/linux-kernel-headers

["vg%FreeBSD.org@localhost via gnats" <gnats-admin%NetBSD.org@localhost>]

>Number:         60282
>Category:       pkg
>Synopsis:       fix build pkgsrc-wip/linux-kernel-headers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue May 19 22:10:00 +0000 2026
>Originator:     Veniamin Gvozdikov
>Release:        master
>Organization:
>Environment:
Linux 73348c0cc845 6.19.11-arch1-1 #1 SMP PREEMPT_DYNAMIC Thu, 02 Apr 2026 23:33:01 +0000 x86_64 GNU/Linux
>Description:
Fails on build. I only have x86_64 setup other PLISTs might have issues too.
>How-To-Repeat:
bmake package NO_CHECKSUM=yes USE_LANGUAGES=c
>Fix:
diff --git a/linux-kernel-headers/Makefile b/linux-kernel-headers/Makefile
index dd7268eb2a..476dd75165 100644
--- a/linux-kernel-headers/Makefile
+++ b/linux-kernel-headers/Makefile
@@ -7,23 +7,29 @@ COMMENT=	Linux kernel headers
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# empty
+USE_TOOLS+=	pax
 
-PLIST_SRC+=	${PKGDIR}/PLIST.${LOWER_ARCH}
+PLIST_SRC+=	${PKGDIR}/PLIST.${MACHINE_ARCH}
 PLIST_SRC+=	${PKGDIR}/PLIST.common
 
 INSTALLATION_DIRS=	include
 
+pre-configure:
+	cd ${WRKSRC} && ${SED} \
+		-i 's/^static struct menu \*current_menu;/struct menu \*current_menu;/' \
+		scripts/kconfig/mconf.c
+
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} include/linux/version.h
 
 do-install:
-	cd ${WRKSRC}/include && pax -rw -pe linux ${DESTDIR}${PREFIX}/include
+	cd ${WRKSRC}/include && ${PAX} -rw -pe linux ${DESTDIR}${PREFIX}/include
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/asm
-	${RM} ${DESTDIR}${PREFIX}/include/asm-generic
+	${RM} -fr ${DESTDIR}${PREFIX}/include/asm-generic
 	${LN} -s ${PREFIX}/include/asm ${DESTDIR}${PREFIX}/include/asm-generic
-	cd ${WRKSRC}/include/asm-${LOWER_ARCH:Q} && \
-		pax -rw -pe . ${DESTDIR}${PREFIX}/include/asm
+	cd ${WRKSRC}/include/asm-${MACHINE_ARCH:Q} && \
+		${PAX} -rw -pe . ${DESTDIR}${PREFIX}/include/asm
 	cd ${WRKSRC}/include/asm-generic && \
-		pax -rw -pe . ${DESTDIR}${PREFIX}/include/asm
+		${PAX} -rw -pe . ${DESTDIR}${PREFIX}/include/asm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/linux-kernel-headers/PLIST.common b/linux-kernel-headers/PLIST.common
index 02603ccbd2..bdeddd68a0 100644
--- a/linux-kernel-headers/PLIST.common
+++ b/linux-kernel-headers/PLIST.common
@@ -1,4 +1,5 @@
 @comment $NetBSD: PLIST.common,v 1.5 2009/10/11 10:44:55 thomasklausner Exp $
+include/asm-generic
 include/asm/a.out.h
 include/asm/atomic.h
 include/asm/bitops.h
@@ -17,6 +18,7 @@ include/asm/cpumask_up.h
 include/asm/current.h
 include/asm/delay.h
 include/asm/div64.h
+include/asm/dma-mapping-broken.h
 include/asm/dma-mapping.h
 include/asm/dma.h
 include/asm/elf.h
@@ -33,11 +35,13 @@ include/asm/irq.h
 include/asm/kmap_types.h
 include/asm/linkage.h
 include/asm/local.h
+include/asm/mce.h
 include/asm/mman.h
 include/asm/mmu.h
 include/asm/mmu_context.h
 include/asm/module.h
 include/asm/msgbuf.h
+include/asm/msi.h
 include/asm/namei.h
 include/asm/page.h
 include/asm/param.h
@@ -126,6 +130,7 @@ include/linux/atmmpc.h
 include/linux/atmppp.h
 include/linux/atmsap.h
 include/linux/atmsvc.h
+include/linux/audit.h
 include/linux/auto_fs.h
 include/linux/auto_fs4.h
 include/linux/autoconf.h
@@ -147,7 +152,6 @@ include/linux/blkpg.h
 include/linux/blockgroup_lock.h
 include/linux/bootmem.h
 include/linux/bpqether.h
-include/linux/brlvger.h
 include/linux/buffer_head.h
 include/linux/byteorder/big_endian.h
 include/linux/byteorder/generic.h
@@ -194,6 +198,7 @@ include/linux/cpumask.h
 include/linux/cramfs_fs.h
 include/linux/cramfs_fs_sb.h
 include/linux/crc32.h
+include/linux/crc32c.h
 include/linux/crypto.h
 include/linux/ctype.h
 include/linux/cuda.h
@@ -213,8 +218,6 @@ include/linux/devpts_fs.h
 include/linux/dio.h
 include/linux/dirent.h
 include/linux/divert.h
-include/linux/dm-ioctl-v1.h
-include/linux/dm-ioctl-v4.h
 include/linux/dm-ioctl.h
 include/linux/dma-mapping.h
 include/linux/dmapool.h
@@ -233,6 +236,7 @@ include/linux/dvb/net.h
 include/linux/dvb/osd.h
 include/linux/dvb/version.h
 include/linux/dvb/video.h
+include/linux/edd.h
 include/linux/eeprom.h
 include/linux/efi.h
 include/linux/efs_dir.h
@@ -280,6 +284,7 @@ include/linux/gameport.h
 include/linux/generic_serial.h
 include/linux/genhd.h
 include/linux/gfp.h
+include/linux/harrier_defs.h
 include/linux/hash.h
 include/linux/hayesesp.h
 include/linux/hdlc.h
@@ -287,17 +292,11 @@ include/linux/hdlc/ioctl.h
 include/linux/hdlcdrv.h
 include/linux/hdreg.h
 include/linux/hdsmart.h
-include/linux/hfs_fs.h
-include/linux/hfs_fs_i.h
-include/linux/hfs_fs_sb.h
-include/linux/hfs_sysdep.h
 include/linux/hiddev.h
 include/linux/highmem.h
 include/linux/highuid.h
 include/linux/hippidevice.h
 include/linux/hpfs_fs.h
-include/linux/hpfs_fs_i.h
-include/linux/hpfs_fs_sb.h
 include/linux/hugetlb.h
 include/linux/hysdn_if.h
 include/linux/i2c-algo-bit.h
@@ -334,7 +333,6 @@ include/linux/if_packet.h
 include/linux/if_plip.h
 include/linux/if_ppp.h
 include/linux/if_pppox.h
-include/linux/if_pppvar.h
 include/linux/if_shaper.h
 include/linux/if_slip.h
 include/linux/if_strip.h
@@ -377,7 +375,6 @@ include/linux/isdn.h
 include/linux/isdn/capicmd.h
 include/linux/isdn/capilli.h
 include/linux/isdn/capiutil.h
-include/linux/isdn/fsm.h
 include/linux/isdn/tpam.h
 include/linux/isdn_divertif.h
 include/linux/isdn_lzscomp.h
@@ -412,6 +409,8 @@ include/linux/kmalloc_sizes.h
 include/linux/kmod.h
 include/linux/kobj_map.h
 include/linux/kobject.h
+include/linux/kref.h
+include/linux/kthread.h
 include/linux/lapb.h
 include/linux/libata.h
 include/linux/limits.h
@@ -446,13 +445,13 @@ include/linux/mm_inline.h
 include/linux/mman.h
 include/linux/mmzone.h
 include/linux/mod_devicetable.h
-include/linux/modsetver.h
 include/linux/module.h
 include/linux/moduleloader.h
 include/linux/moduleparam.h
 include/linux/mount.h
 include/linux/mpage.h
 include/linux/mpp.h
+include/linux/mqueue.h
 include/linux/mroute.h
 include/linux/msdos_fs.h
 include/linux/msdos_fs_i.h
@@ -526,6 +525,7 @@ include/linux/netfilter_ipv4/ip_conntrack_protocol.h
 include/linux/netfilter_ipv4/ip_conntrack_tcp.h
 include/linux/netfilter_ipv4/ip_conntrack_tftp.h
 include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+include/linux/netfilter_ipv4/ip_logging.h
 include/linux/netfilter_ipv4/ip_nat.h
 include/linux/netfilter_ipv4/ip_nat_core.h
 include/linux/netfilter_ipv4/ip_nat_helper.h
@@ -568,6 +568,7 @@ include/linux/netfilter_ipv4/ipt_ttl.h
 include/linux/netfilter_ipv4/listhelp.h
 include/linux/netfilter_ipv4/lockhelp.h
 include/linux/netfilter_ipv6.h
+include/linux/netfilter_ipv6/ip6_logging.h
 include/linux/netfilter_ipv6/ip6_tables.h
 include/linux/netfilter_ipv6/ip6t_LOG.h
 include/linux/netfilter_ipv6/ip6t_MARK.h
@@ -586,8 +587,10 @@ include/linux/netfilter_ipv6/ip6t_opts.h
 include/linux/netfilter_ipv6/ip6t_owner.h
 include/linux/netfilter_ipv6/ip6t_rt.h
 include/linux/netfilter_ipx.h
+include/linux/netfilter_logging.h
 include/linux/netfilter_x25.h
 include/linux/netlink.h
+include/linux/netpoll.h
 include/linux/netrom.h
 include/linux/nfs.h
 include/linux/nfs2.h
@@ -615,6 +618,7 @@ include/linux/nfsd/syscall.h
 include/linux/nfsd/xdr.h
 include/linux/nfsd/xdr3.h
 include/linux/nfsd/xdr4.h
+include/linux/nfsd_idmap.h
 include/linux/nls.h
 include/linux/nmi.h
 include/linux/node.h
@@ -656,7 +660,6 @@ include/linux/posix_acl_xattr.h
 include/linux/posix_types.h
 include/linux/ppdev.h
 include/linux/ppp-comp.h
-include/linux/ppp.h
 include/linux/ppp_channel.h
 include/linux/ppp_defs.h
 include/linux/prctl.h
@@ -694,7 +697,7 @@ include/linux/reiserfs_fs.h
 include/linux/reiserfs_fs_i.h
 include/linux/reiserfs_fs_sb.h
 include/linux/resource.h
-include/linux/rmap-locking.h
+include/linux/rmap.h
 include/linux/romfs_fs.h
 include/linux/root_dev.h
 include/linux/rose.h
@@ -721,6 +724,7 @@ include/linux/sdlasfm.h
 include/linux/securebits.h
 include/linux/security.h
 include/linux/selection.h
+include/linux/selinux_netlink.h
 include/linux/sem.h
 include/linux/seq_file.h
 include/linux/seqlock.h
@@ -755,6 +759,7 @@ include/linux/stallion.h
 include/linux/stat.h
 include/linux/statfs.h
 include/linux/stddef.h
+include/linux/stop_machine.h
 include/linux/string.h
 include/linux/stringify.h
 include/linux/sunrpc/auth.h
@@ -767,12 +772,12 @@ include/linux/sunrpc/gss_asn1.h
 include/linux/sunrpc/gss_err.h
 include/linux/sunrpc/gss_krb5.h
 include/linux/sunrpc/msg_prot.h
-include/linux/sunrpc/name_lookup.h
 include/linux/sunrpc/rpc_pipe_fs.h
 include/linux/sunrpc/sched.h
 include/linux/sunrpc/stats.h
 include/linux/sunrpc/svc.h
 include/linux/sunrpc/svcauth.h
+include/linux/sunrpc/svcauth_gss.h
 include/linux/sunrpc/svcsock.h
 include/linux/sunrpc/timer.h
 include/linux/sunrpc/types.h
@@ -783,6 +788,7 @@ include/linux/swap.h
 include/linux/swapops.h
 include/linux/synclink.h
 include/linux/sys.h
+include/linux/syscalls.h
 include/linux/sysctl.h
 include/linux/sysdev.h
 include/linux/sysfs.h