From c8158555ed6a8a16d7683dc8764f1a573fd39f5d Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Tue, 21 Dec 2004 12:49:24 +0000
Subject: [PATCH] NOPAM -> NO_PAM

---
 libexec/ftpd/Makefile                    | 2 +-
 libexec/lukemftpd/Makefile               | 2 +-
 release/picobsd/bridge/crunch.conf       | 2 +-
 release/picobsd/tinyware/login/Makefile  | 2 +-
 release/picobsd/tinyware/passwd/Makefile | 2 +-
 share/man/man8/picobsd.8                 | 2 +-
 share/mk/bsd.compat.mk                   | 1 +
 usr.sbin/ppp/Makefile                    | 3 +++
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index f4ff5ef6663c..c4275e43939b 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -26,7 +26,7 @@ CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR}
 DPADD+=	${LIBM}
 LDADD+=	-lm
 
-.if !defined(NOPAM)
+.if !defined(NO_PAM)
 CFLAGS+=-DUSE_PAM
 DPADD+= ${LIBPAM}
 LDADD+= ${MINUSLPAM}
diff --git a/libexec/lukemftpd/Makefile b/libexec/lukemftpd/Makefile
index dcec609bf960..532f85c55c5f 100644
--- a/libexec/lukemftpd/Makefile
+++ b/libexec/lukemftpd/Makefile
@@ -30,7 +30,7 @@ CFLAGS+= -DUSE_OPIE -DLOGIN_CAP
 DPADD+=	${LIBOPIE} ${LIBMD}
 LDADD+=	-lopie -lmd
 
-.if !defined(NOPAM)
+.if !defined(NO_PAM)
 CFLAGS+= -DUSE_PAM
 DPADD+=	${LIBPAM}
 LDADD+=	${MINUSLPAM}
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index 02896cec36d4..9686bdc9eb6b 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 -DPPP_NO_NETGRAPH -DPPP_NO_PAM -DTRACEROUTE_NO_IPSEC -DNO_INET6
+buildopts -DNO_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -DTRACEROUTE_NO_IPSEC -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/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile
index cf13442b9a2e..1f622f66c4df 100644
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@@ -12,7 +12,7 @@ CFLAGS+=-DLOGIN_ACCESS -DLOGALL
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt
 
-.if !defined(NOPAM)
+.if !defined(NO_PAM)
 CFLAGS+= -DUSE_PAM
 DPADD+=	${LIBPAM}
 LDADD+=	${MINUSLPAM}
diff --git a/release/picobsd/tinyware/passwd/Makefile b/release/picobsd/tinyware/passwd/Makefile
index 203a5f4a3ba1..5f6b8c45bd15 100644
--- a/release/picobsd/tinyware/passwd/Makefile
+++ b/release/picobsd/tinyware/passwd/Makefile
@@ -1,7 +1,7 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 # $FreeBSD$
 
-# Only NOPAM is used by PicoBSD and supported here
+# Only NO_PAM is used by PicoBSD and supported here
 
 
 PROG=	passwd
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 9207b82404d5..aba665be92fc 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -255,7 +255,7 @@ We can pass build options to those makefiles which understand
 that, in order to reduce the size of the programs.
 This is achieved with a line of the form
 .Pp
-.Dl "buildopts -DNOPAM -DRELEASE_CRUNCH ..."
+.Dl "buildopts -DNO_PAM -DRELEASE_CRUNCH ..."
 .It
 When providing the list of directories where source files are, it
 is convenient to list the following entry first:
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index d91f96c77b3f..d553a1af6f2e 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -24,6 +24,7 @@
 	NOMANCOMPRESS:NO_MANCOMPRESS \
 	NOMLINKS:NO_MLINKS \
 	NOOBJ:NO_OBJ \
+	NOPAM:NO_PAM \
 	NOPIC:NO_PIC \
 	NOPROFILE:NO_PROFILE \
 	NOSHARE:NO_SHARE \
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index bb176c61e3ca..007e5e147f88 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -27,6 +27,9 @@ PPP_NO_ATM=
 .if defined(NO_I4B)
 PPP_NO_I4B=
 .endif
+.if defined(NO_PAM)
+PPP_NO_PAM=
+.endif
 
 .if defined(PPP_NO_SUID)
 BINMODE=550