aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/picobsd/bridge/crunch.conf2
-rw-r--r--share/examples/etc/make.conf9
-rw-r--r--share/man/man5/make.conf.532
-rw-r--r--tools/tools/nanobsd/make.conf2
-rw-r--r--usr.sbin/ppp/Makefile44
5 files changed, 45 insertions, 44 deletions
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index 7da433aa86cc..911f738d88a8 100644
--- a/release/picobsd/bridge/crunch.conf
+++ b/release/picobsd/bridge/crunch.conf
@@ -18,7 +18,7 @@
# Default build options. Basically tell the Makefiles which understand
# that to use the most compact possible version of the code.
#
-buildopts -DNOPAM -DRELEASE_CRUNCH -DNONETGRAPH -DNOIPSEC -DNO_INET6
+buildopts -DNOPAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -DPPP_NO_PAM -DNOIPSEC -DNO_INET6
# directories where to look for sources of various binaries.
# @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf)
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index f0f5a3997ca1..cab2916916b8 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -145,11 +145,10 @@
#NO_USB= # do not build usbd(8) and related programs
#
# Variables that control how ppp(8) is built.
-#NOALIAS= # do not build with NAT support (see make.conf(5))
-#NONAT= # do not build with NAT support (see make.conf(5))
-#NONETGRAPH= # do not build with NETGRAPH support
-#NORADUIS= # do not build with RADUIS support
-#PPP_NOSUID= # build with normal permissions
+#PPP_NO_NAT= # do not build with NAT support (see make.conf(5))
+#PPP_NO_NETGRAPH= # do not build with Netgraph support
+#PPP_NO_RADUIS= # do not build with RADIUS support
+#PPP_NO_SUID= # build with normal permissions
#
# Variables to control whether parts of the base BIND are built.
# Defining NO_BIND makes all of the following BIND variables obsolete.
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 302fe2b3b1d0..4090f5de0738 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 14, 2004
+.Dd December 21, 2004
.Dt MAKE.CONF 5
.Os
.Sh NAME
@@ -458,11 +458,6 @@ compilers, debuggers etc.
.Pq Vt bool
Set to not build
programs and libraries related to IPv6 networking.
-.It Va NOALIAS
-.Pq Vt bool
-Build
-.Xr ppp 8
-without support for network address translation (NAT).
.It Va NO_ATM
.Pq Vt bool
Set to not build
@@ -633,27 +628,26 @@ and
.It Va WITH_BIND_LIBS
.Pq Vt bool
Set to install BIND libraries and include files.
-.It Va NONAT
-.It Vt bool
-This is an alias for
-.Va NONAT
-and can break when building
-.Xr ppp 8 .
-.It Va NONETGRAPH
+.It Va PPP_NO_NAT
+.Pq Vt bool
+Build
+.Xr ppp 8
+without support for network address translation (NAT).
+.It Va PPP_NO_NETGRAPH
.Pq Vt bool
Set to build
.Xr ppp 8
-without support for netgraph.
-.It Va NORADIUS
-.Pq Va bool
+without support for Netgraph.
+.It Va PPP_NO_RADIUS
+.Pq Vt bool
Set to build
.Xr ppp 8
-without support for radius.
-.It Va PPP_NOSUID
+without support for RADIUS.
+.It Va PPP_NO_SUID
.Pq Vt bool
Set to disable the installation of
.Xr ppp 8
-as an suid root program.
+as a set-user-ID root program.
.It Va SENDMAIL_MC
.Pq Vt str
The default
diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf
index 96f4ff98ac7d..6e72850429c5 100644
--- a/tools/tools/nanobsd/make.conf
+++ b/tools/tools/nanobsd/make.conf
@@ -32,12 +32,12 @@ NO_NIS=
NO_OBJC=
NO_PF=
NO_PROFILE=
-NORADIUS=
NO_RESCUE=
NO_SENDMAIL=
NO_SHAREDOCS=
NO_TOOLCHAIN=
NO_USB=
+PPP_NO_RADIUS=
# If this macro is defined, UFS volume labels are used on
# the flash image to avoid hardcoding device names.
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index c2bbb4c9ca7d..bb176c61e3ca 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -11,17 +11,24 @@ SRCS= acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \
WARNS?= 3
.if defined(RELEASE_CRUNCH)
CFLAGS+=-DRELEASE_CRUNCH
-NO_ATM=
-NODES=
-NOI4B=
-NONAT=
-NOKLDLOAD=
-NOPAM=
-NORADIUS=
-NOSUID=
+PPP_NO_ATM=
+PPP_NO_DES=
+PPP_NO_I4B=
+PPP_NO_KLDLOAD=
+PPP_NO_NAT=
+PPP_NO_PAM=
+PPP_NO_RADIUS=
+PPP_NO_SUID=
.endif
-.if defined(NOSUID) || defined(PPP_NOSUID)
+.if defined(NO_ATM)
+PPP_NO_ATM=
+.endif
+.if defined(NO_I4B)
+PPP_NO_I4B=
+.endif
+
+.if defined(PPP_NO_SUID)
BINMODE=550
.else
BINMODE=4550
@@ -44,7 +51,7 @@ CLEANFILES= ppp.8
CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
.endif
-.if defined(NOKLDLOAD)
+.if defined(PPP_NO_KLDLOAD)
CFLAGS+=-DNOKLDLOAD
.endif
@@ -52,7 +59,7 @@ CFLAGS+=-DNOKLDLOAD
CFLAGS+=-DNOINET6
.endif
-.if defined(NOALIAS) || defined(NONAT)
+.if defined(PPP_NO_NAT)
CFLAGS+=-DNONAT
.else
SRCS+= nat_cmd.c
@@ -60,19 +67,20 @@ LDADD+= -lalias
DPADD+= ${LIBALIAS}
.endif
-.if defined(NO_ATM)
+.if defined(PPP_NO_ATM)
CFLAGS+=-DNOATM
.else
SRCS+= atm.c
.endif
-.if defined(NOSUID) || defined(PPP_NOSUID)
+.if defined(PPP_NO_SUID)
CFLAGS+=-DNOSUID
.else
SRCS+= id.c
.endif
-.if defined(RELEASE_CRUNCH) || defined(NO_CRYPT) || defined(NO_OPENSSL)
+.if defined(RELEASE_CRUNCH) || defined(NO_CRYPT) || defined(NO_OPENSSL) || \
+ defined(PPP_NO_DES)
CFLAGS+=-DNODES
.else
SRCS+= chap_ms.c mppe.c
@@ -80,7 +88,7 @@ LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
.endif
-.if defined(NORADIUS)
+.if defined(PPP_NO_RADIUS)
CFLAGS+=-DNORADIUS
.else
SRCS+= radius.c
@@ -88,13 +96,13 @@ LDADD+= -lradius
DPADD+= ${LIBRADIUS}
.endif
-.if defined(NOI4B) || ${MACHINE_ARCH} != "i386"
+.if defined(PPP_NO_I4B) || ${MACHINE_ARCH} != "i386"
CFLAGS+=-DNOI4B
.else
SRCS+= i4b.c
.endif
-.if defined(NONETGRAPH)
+.if defined(PPP_NO_NETGRAPH)
CFLAGS+=-DNONETGRAPH
.else
SRCS+= ether.c
@@ -106,7 +114,7 @@ SRCS+= netgraph.c
.endif
.endif
-.if defined(NOPAM)
+.if defined(PPP_NO_PAM)
CFLAGS+=-DNOPAM
.else
LDADD+= ${MINUSLPAM}