Makefile consistency

["Carl A. Schmidt" <carl@xxxxxxxxxxxxxxx>]

Hello,

I know it's not critical or anything but just a minor nit covered in
FreeBSD 5.x, that is the consistency of using just NO_SOMETHING as
opposed to a combination of NO_SOMETHING and NOSOMETHING.

I have started with one simple change from MAKE_KERBEROS5 to NO_KERBEROS,
making the option consistent with most of the other options.  This
changes the logic of the Makefiles where MAKE_KERBEROS5 appeared to on
by default, but I also adjusted etc/defaults/make.conf to have
NO_KERBEROS by default.  I don't know if that's the correct way to go
about disabling things by default or not, but it seemed to make sense.

So yeah, that's that.  I'll be redoing the entire tree today to fall
somewhat in-line with FreeBSD-CURRENT with respect to make.conf options.
It's the one thing I can actually do reasonably well enough since I
don't plan on being able to help code-wise at least until I'm done
school this semester and start picking up some programming skills.

Also, what's the preference as far as patches go?  Is it preferred to
have one big patch or multiple small patches?  I suck at CVS so all I
could put together right now was small patches for each file modified,
and I expect this isn't what's preferred...

The patches are attached, by the way. :)
-- 
Carl Schmidt
carl@xxxxxxxxxxxxxxx

Index: Makefile.inc1
===================================================================
RCS file: /home/carl/cvs/dfly/Makefile.inc1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.inc1	3 Sep 2005 01:39:54 -0000	1.1
+++ Makefile.inc1	3 Sep 2005 10:19:24 -0000	1.2
@@ -3,7 +3,6 @@
 # $DragonFly: src/Makefile.inc1,v 1.77 2005/08/28 07:06:42 dillon Exp $
 #
 # Make command line options:
-#	-DMAKE_KERBEROS5 to build Kerberos5
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
 #	-DNOCRYPT will prevent building of crypt versions
@@ -14,6 +13,7 @@
 #	-DNOINFO do not make or install info files
 #	-DNOLIBC_R do not build libc_r.
 #	-DNO_FORTRAN do not build g77 and related libraries.
+#	-DNO_KERBEROS do nut build Kerberos 5.
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
@@ -73,7 +73,7 @@
 SUBDIR+= gnu
 .endif
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
-    !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
+    !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
 SUBDIR+= kerberos5
 .endif
 .if exists(${.CURDIR}/libexec)
@@ -818,7 +818,7 @@
 .endif
 
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
-    !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+    !defined(NOCRYPT) && !defined(NO_KERBEROS)
 _libkrb5= kerberos5/tools kerberos5/lib/libroken kerberos5/lib/libvers \
     kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
 .endif
@@ -898,7 +898,7 @@
 
 _generic_libs=	gnu/lib
 
-.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_KERBEROS)
 _prebuild_libs+=	kerberos5/tools
 _prebuild_libs+=	kerberos5/lib/libasn1
 _prebuild_libs+=	kerberos5/lib/libgssapi

Index: etc/defaults/make.conf
===================================================================
RCS file: /home/carl/cvs/dfly/etc/defaults/make.conf,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- etc/defaults/make.conf	3 Sep 2005 01:40:45 -0000	1.1
+++ etc/defaults/make.conf	3 Sep 2005 10:21:26 -0000	1.3
@@ -99,11 +99,12 @@
 #ENABLE_SUID_SSH=	true
 #
 # To avoid building various parts of the base system:
-#NO_CVS=	true	# do not build CVS
 #NO_BIND=	true	# do not build BIND
+#NO_CVS=	true	# do not build CVS
 #NO_FORTRAN=	true	# do not build g77 and related libraries
 #NO_I4B=	true	# do not build isdn4bsd package
 #NO_IPFILTER=	true	# do not build IP Filter package
+NO_KERBEROS=	true	# do not build Kerberos 5 (KTH Heimdal)
 #NO_LPR=	true	# do not build lpr and related programs
 #NO_MAILWRAPPER=true	# do not build the mailwrapper(8) MTA selector
 #NO_MODULES=	true	# do not build modules with the kernel
@@ -122,6 +123,10 @@
 #NOPROFILE=	true	# Avoid compiling profiled libraries
 #NOSHARE=	true	# do not go into the share subdir
 #
+# Kerberos 5 Options
+#ENABLE_SUID_K5SU=	yes	# Install k5su utility setuid
+#KRB5_HOME=		/usr/local	# Destination for Kerberos 5
+#
 # To build sys/modules when building the world (our old way of doing things)
 #MODULES_WITH_WORLD=true	# do not build modules when building kernel
 #
@@ -312,23 +317,6 @@
 # /usr/ports.  
 #WRKDIRPREFIX=	/var/tmp
 #
-# Kerberos 5
-# If you want Kerberos 5 (KTH Heimdal), define this:
-#
-#MAKE_KERBEROS5=	yes
-#
-# Kerberos 5 su (k5su)
-# If you want to use the k5su utility, define this to have it installed
-# set-user-ID.
-#ENABLE_SUID_K5SU=	yes
-#
-#
-# Kerberos5
-# If you want to install MIT Kerberos5 port somewhere other than /usr/local,
-# define this (this is also used to tell ssh1 that kerberos is needed):
-#
-#KRB5_HOME=		/usr/local
-#
 #
 # CVSup update flags.  Edit SUPFILE settings to reflect whichever distribution
 # file(s) you use on your site (see /usr/share/examples/cvsup/README for more

Index: lib/pam_module/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/pam_module/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lib/pam_module/Makefile	3 Sep 2005 01:41:00 -0000	1.1
+++ lib/pam_module/Makefile	3 Sep 2005 10:19:44 -0000	1.2
@@ -2,7 +2,7 @@
 
 SUBDIR=		pam_cleartext_pass_ok pam_deny pam_opie pam_opieaccess
 SUBDIR+=	pam_permit pam_radius pam_ssh pam_tacplus pam_unix
-.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=	pam_krb5
 .endif
 

Index: secure/lib/libssh/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/lib/libssh/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure/lib/libssh/Makefile	3 Sep 2005 01:41:03 -0000	1.1
+++ secure/lib/libssh/Makefile	3 Sep 2005 10:19:48 -0000	1.2
@@ -18,7 +18,7 @@
 # Patches
 SRCS+=	log.c.patch
 
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 CFLAGS+= -DKRB5 -DHEIMDAL
 .endif
 

Index: secure/lib/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/lib/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure/lib/Makefile	3 Sep 2005 01:41:02 -0000	1.1
+++ secure/lib/Makefile	3 Sep 2005 10:19:46 -0000	1.2
@@ -2,7 +2,7 @@
 # $DragonFly: src/secure/lib/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 SUBDIR= libcipher
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(NO_KERBEROS)
 SUBDIR+=libtelnet
 .endif
 .if !defined(NO_OPENSSL)

Index: secure/libexec/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/libexec/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure/libexec/Makefile	3 Sep 2005 01:41:03 -0000	1.1
+++ secure/libexec/Makefile	3 Sep 2005 10:19:50 -0000	1.2
@@ -1,7 +1,7 @@
 # $FreeBSD: src/secure/libexec/Makefile,v 1.4.2.6 2002/07/05 11:10:51 des Exp $
 # $DragonFly: src/secure/libexec/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
-.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && defined(NO_KERBEROS) && !defined(NO_OPENSSL)
 SUBDIR= telnetd
 .endif
 .if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)

Index: secure/usr.bin/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/usr.bin/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure/usr.bin/Makefile	3 Sep 2005 01:41:03 -0000	1.1
+++ secure/usr.bin/Makefile	3 Sep 2005 10:19:51 -0000	1.2
@@ -2,7 +2,7 @@
 # $DragonFly: src/secure/usr.bin/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 
 SUBDIR= bdes
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(NO_KERBEROS)
 SUBDIR+=telnet
 .endif
 .if !defined(NO_OPENSSL)

Index: secure/usr.bin/ssh/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/usr.bin/ssh/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure/usr.bin/ssh/Makefile	3 Sep 2005 01:41:03 -0000	1.1
+++ secure/usr.bin/ssh/Makefile	3 Sep 2005 10:19:54 -0000	1.2
@@ -13,7 +13,7 @@
 SRCS+=	ssh.1.no_obj.patch ssh_config.5.no_obj.patch
 SRCS+=	channels.c kex.c uidswap.c monitor_fdpass.c
 
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL
 LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt

Index: secure/usr.sbin/sshd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/usr.sbin/sshd/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- secure/usr.sbin/sshd/Makefile	3 Sep 2005 01:41:03 -0000	1.1
+++ secure/usr.sbin/sshd/Makefile	3 Sep 2005 10:19:57 -0000	1.2
@@ -30,7 +30,7 @@
 
 SRCS+=	sshd.8.no_obj.patch sshd_config.5.no_obj.patch
 
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL
 SRCS+=	auth-krb5.c

Index: share/man/man5/make.conf.5
===================================================================
RCS file: /home/carl/cvs/dfly/share/man/man5/make.conf.5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- share/man/man5/make.conf.5	3 Sep 2005 01:41:07 -0000	1.1
+++ share/man/man5/make.conf.5	3 Sep 2005 10:19:59 -0000	1.2
@@ -402,11 +402,6 @@
 Command to use to fetch files.
 Normally
 .Xr fetch 1 .
-.It Va KRB5_HOME
-.Pq Vt str
-If you want to install the MIT Kerberos5 port somewhere other than
-.Pa /usr/local ,
-define this.  This is also used to tell ssh1 that kerberos is needed.
 .It Va MAKE_IDEA
 .Pq Vt bool
 Set to build the IDEA encryption code.
@@ -414,17 +409,6 @@
 It is
 .Em "YOUR RESPONSIBILITY"
 to determine if you can legally use IDEA.
-.It Va MAKE_KERBEROS5
-.Pq Vt bool
-Set this to build Kerberos5 (KTH Heimdal).
-.Em WARNING !
-This is still experimental code.
-If you need stable Kerberos5, use the
-port(s).
-.It Va ENABLE_SUID_K5SU
-.Pq Vt bool
-Set this if you wish to use the k5su utility.  Otherwise, it will be
-installed without the set-user-ID bit set.
 .It Va ENABLE_SUID_SSH
 .Pq Vt bool
 Set this to install
@@ -433,12 +417,12 @@
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.
-.It Va NO_CVS
-.Pq Vt bool
-Set to not build CVS.
 .It Va NO_BIND
 .Pq Vt bool
 Set to not build BIND.
+.It Va NO_CVS
+.Pq Vt bool
+Set to not build CVS.
 .It Va NO_FORTRAN
 .Pq Vt bool
 Set to not build
@@ -454,6 +438,18 @@
 .It Va NO_IPFILTER
 .Pq Vt bool
 Set to not build IP Filter package.
+.It Va NO_KERBEROS
+.Pq Vt bool
+Set to not build Kerberos (enabled by default).
+.It Va ENABLE_SUID_K5SU
+.Pq Vt bool
+Set this if you wish to use the k5su utility.  Otherwise, it will be
+installed without the set-user-ID bit set.
+.It Va KRB5_HOME
+.Pq Vt str
+If you want to install the MIT Kerberos5 port somewhere other than
+.Pa /usr/local ,
+define this.
 .It Va NO_LPR
 .Pq Vt bool
 Set to not build
@@ -695,10 +691,6 @@
 .It Va HAVE_MOTIF
 .Pq Vt bool
 Set this if you have Motif on your system.
-.It Va KRB5_HOME
-.Pq Vt str
-Set this if you want to install the MIT Kerberos5 port somewhere
-other than
 .Pa /usr/local .
 .It Va LOCALBASE
 .Pq Vt str