 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.35 2020/05/18 21:19:36 jmcneill Exp $
+#	$NetBSD: Makefile.inc,v 1.36 2020/10/30 18:47:38 martin Exp $
+#
 # Makefile for sysinst
 .if exists(${.CURDIR}/../../../Makefile.inc)
 .include "${.CURDIR}/../../../Makefile.inc"
 .endif
 PROG=		sysinst
 MAN=		sysinst.8
 WARNS=		4
 SRCS+=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 @@ -66,26 +66,30 @@ UNIF_AWK=	${.CURDIR}/../../unif.awk
 MSG_XLAT_SH=	${.CURDIR}/../../msg_xlat.sh
 MSG_CMP_SH=	${.CURDIR}/../../msg_cmp.sh
 SETS_TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?"tar.xz":"tgz"}
 .if ${MKBSDTAR:Uno} == "no"
 CPPFLAGS+=	-DUSING_PAXASTAR
 .endif
 .if ${MKDTB:Uno} != "no"
 CPPFLAGS+=	-DHAVE_DTB
 .endif
 .if ${MKKMOD:Uno} != "no"
 CPPFLAGS+=	-DHAVE_MODULES
 .endif
 CATALOGDIR=	/usr/share/sysinst/catalog
 CPPFLAGS+=	-I. -I${.CURDIR}/../.. -I${.CURDIR} \
 		-I${.CURDIR}/../../../../sbin/fsck \
 		-DSETS_TAR_SUFF=${SETS_TAR_SUFF:Q} \
 		-DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" \
 		-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
 		${NODISKLABEL:D-DNO_DISKLABEL} \
 		${NOPARTMAN:D-DNO_PARTMAN}
 .if ${RELEASEMACHINEDIR} != ${MACHINE}
 CPPFLAGS+=	-DARCH_SUBDIR="\"${RELEASEMACHINEDIR}\""
 CPPFLAGS+=	-DPKG_ARCH_SUBDIR="\"${MACHINE_ARCH}\""
 .endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: defs.h,v 1.67 2020/10/13 17:26:28 martin Exp $	*/
+/*	$NetBSD: defs.h,v 1.68 2020/10/30 18:47:38 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -168,31 +168,36 @@ enum {
     SET_DEBUG,
     SET_X11_DEBUG,
     SET_LAST,
     SET_GROUP,		/* Start of submenu */
     SET_GROUP_END,	/* End of submenu */
     SET_PKGSRC,		/* pkgsrc, not counted as regular set */
 };
 /* Initialisers to select sets */
 /* All kernels */
 #define SET_KERNEL SET_KERNEL_1, SET_KERNEL_2, SET_KERNEL_3, SET_KERNEL_4, \
 		    SET_KERNEL_5, SET_KERNEL_6, SET_KERNEL_7, SET_KERNEL_8
 #ifdef HAVE_MODULES
 #define	WITH_MODULES	SET_MODULES,
 #else
 #define	WITH_MODULES
 #endif
 /* Core system sets */
 #ifdef HAVE_DTB
-#define SET_CORE SET_MODULES, SET_BASE, SET_DTB, SET_ETC
+#define SET_CORE WITH_MODULES SET_BASE, SET_DTB, SET_ETC
 #else
-#define SET_CORE SET_MODULES, SET_BASE, SET_ETC
+#define SET_CORE WITH_MODULES SET_BASE, SET_ETC
 #endif
 /* All system sets */
 #define SET_SYSTEM SET_CORE, SET_COMPILER, SET_GAMES, \
 		    SET_MAN_PAGES, SET_MISC, SET_RESCUE, \
 		    SET_TESTS, SET_TEXT_TOOLS
 /* All X11 sets */
 #define SET_X11_NOSERVERS SET_X11_BASE, SET_X11_FONTS, SET_X11_PROG, SET_X11_ETC
 #define SET_X11 SET_X11_NOSERVERS, SET_X11_SERVERS
 /* All machine dependent sets */
 #define SET_MD SET_MD_1, SET_MD_2, SET_MD_3, SET_MD_4
 /* All source sets */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.52 2020/10/27 15:28:01 martin Exp $	*/
+/*	$NetBSD: util.c,v 1.53 2020/10/30 18:47:38 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -104,27 +104,29 @@ distinfo dist_list[] = {
 #ifdef SET_KERNEL_6_NAME
 	{SET_KERNEL_6_NAME,	SET_KERNEL_6,		false, MSG_set_kernel_6, NULL},
 #endif
 #ifdef SET_KERNEL_7_NAME
 	{SET_KERNEL_7_NAME,	SET_KERNEL_7,		false, MSG_set_kernel_7, NULL},
 #endif
 #ifdef SET_KERNEL_8_NAME
 	{SET_KERNEL_8_NAME,	SET_KERNEL_8,		false, MSG_set_kernel_8, NULL},
 #endif
 #ifdef SET_KERNEL_9_NAME
 	{SET_KERNEL_9_NAME,	SET_KERNEL_9,		false, MSG_set_kernel_9, NULL},
 #endif
 #ifdef HAVE_MODULES
 	{"modules",		SET_MODULES,		false, MSG_set_modules, NULL},
 #endif
 	{"base",		SET_BASE,		false, MSG_set_base, NULL},
 #ifdef HAVE_DTB
 	{"dtb",			SET_DTB,		false, MSG_set_dtb, NULL},
 #endif
 	{"etc",			SET_ETC,		false, MSG_set_system, NULL},
 	{"comp",		SET_COMPILER,		false, MSG_set_compiler, NULL},
 	{"games",		SET_GAMES,		false, MSG_set_games, NULL},
 	{"man",			SET_MAN_PAGES,		false, MSG_set_man_pages, NULL},
 	{"misc",		SET_MISC,		false, MSG_set_misc, NULL},
 	{"rescue",		SET_RESCUE,		false, MSG_set_rescue, NULL},
 	{"tests",		SET_TESTS,		false, MSG_set_tests, NULL},
 	{"text",		SET_TEXT_TOOLS,		false, MSG_set_text_tools, NULL},