From 967942640eb90930235d35bfc7c529ac44207b61 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 26 May 2015 12:17:36 +0200 Subject: [PATCH 068/310] share/mk/src.opts.mk: Disable a bunch of options by default (XXX: Remove BSD_GREP_FASTMATCH) .. either due to license issues or because they are not considered relevant for the majority of ElectroBSD users. src.conf(5) is regenerated in a seperate commit to reduce the chances of merge conflicts when rebasing. Obtained from: ElectroBSD --- share/mk/src.opts.mk | 61 +++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3fb104ad1c50..ccd38715c495 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -57,25 +57,22 @@ __DEFAULT_YES_OPTIONS = \ ACPI \ APM \ AT \ - ATM \ AUDIT \ AUTHPF \ AUTOFS \ BHYVE \ BLACKLIST \ - BLUETOOTH \ BOOT \ BOOTPARAMD \ BOOTPD \ BSD_CPIO \ - BSDINSTALL \ + BSD_GREP_FASTMATCH \ BSNMP \ BZIP2 \ CALENDAR \ CAPSICUM \ CAROOT \ CASPER \ - CCD \ CDDL \ CLANG \ CLANG_BOOTSTRAP \ @@ -98,12 +95,8 @@ __DEFAULT_YES_OPTIONS = \ FDT \ FILE \ FINGER \ - FLOPPY \ - FMTREE \ FORTH \ FP_LIBC \ - FREEBSD_UPDATE \ - FTP \ GAMES \ GH_BC \ GNU_DIFF \ @@ -116,9 +109,7 @@ __DEFAULT_YES_OPTIONS = \ INET \ INET6 \ INETD \ - IPFILTER \ IPFW \ - ISCSI \ JAIL \ KDUMP \ KVM \ @@ -144,8 +135,7 @@ __DEFAULT_YES_OPTIONS = \ MAILWRAPPER \ MAKE \ MALLOC_PRODUCTION \ - MLX5TOOL \ - NDIS \ + MANDOCDB \ NETCAT \ NETGRAPH \ NLS_CATALOGS \ @@ -157,33 +147,23 @@ __DEFAULT_YES_OPTIONS = \ PAM \ PF \ PKGBOOTSTRAP \ - PMC \ - PORTSNAP \ - PPP \ QUOTAS \ RADIUS_SUPPORT \ - RBOOTD \ REPRODUCIBLE_BUILD \ RESCUE \ - ROUTED \ - SENDMAIL \ + RCS \ + RESCUE \ SERVICESDB \ SETUID_LOGIN \ SHARED_TOOLCHAIN \ SHAREDOCS \ - SOURCELESS \ - SOURCELESS_HOST \ - SOURCELESS_UCODE \ STATS \ SYSCONS \ SYSTEM_COMPILER \ SYSTEM_LINKER \ TALK \ - TCP_WRAPPERS \ - TCSH \ TELNET \ TEXTPROC \ - TFTP \ UNBOUND \ USB \ UTMPX \ @@ -243,6 +223,39 @@ __DEFAULT_DEPENDENT_OPTIONS= \ __DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var} .endfor +# Disable a bunch of additional options that default to yes in FreeBSD +__DEFAULT_NO_OPTIONS += \ + ATM \ + BLUETOOTH \ + BSDINSTALL \ + CCD \ + CTM \ + FLOPPY \ + FMTREE \ + FREEBSD_UPDATE \ + FTP \ + GCOV \ + IPFILTER \ + ISCSI \ + NDIS \ + RBOOTD \ + PC_SYSINSTALL \ + PMC \ + PORTSNAP \ + PPP \ + RCMDS \ + ROUTED \ + SENDMAIL \ + SVNLITE \ + SOURCELESS \ + SOURCELESS_HOST \ + SOURCELESS_UCODE \ + SYSINSTALL \ + TCP_WRAPPERS \ + TCSH \ + TFTP \ + TIMED \ + # # Default behaviour of some options depends on the architecture. Unfortunately # this means that we have to test TARGET_ARCH (the buildworld case) as well -- 2.37.1