Re: MAKE_KERBEROS5->WANT_KERBEROS

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

On Sun, Sep 04, 2005 at 02:13:16PM -0400, Carl A. Schmidt wrote:
> This will simply change MAKE_KERBEROS5 to WANT_KERBEROS,
> and a followup patch will come in a few minutes to add/document
> WANT_LUKEMFTPD.
> -- 
> Carl Schmidt
> carl@xxxxxxxxxxxxxxx

Wow. I suck.  See inline attachment.
-- 
Carl Schmidt
carl@xxxxxxxxxxxxxxx

Index: Makefile.inc1
===================================================================
RCS file: /home/carl/cvsup/dfly/src/Makefile.inc1,v
retrieving revision 1.77
diff -u -r1.77 Makefile.inc1
--- Makefile.inc1	28 Aug 2005 07:06:42 -0000	1.77
+++ Makefile.inc1	4 Sep 2005 17:10:06 -0000
@@ -3,7 +3,7 @@
 # $DragonFly: src/Makefile.inc1,v 1.77 2005/08/28 07:06:42 dillon Exp $
 #
 # Make command line options:
-#	-DMAKE_KERBEROS5 to build Kerberos5
+#	-DWANT_KERBEROS to build Kerberos5
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
 #	-DNOCRYPT will prevent building of crypt versions
@@ -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(WANT_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(WANT_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(WANT_KERBEROS)
 _prebuild_libs+=	kerberos5/tools
 _prebuild_libs+=	kerberos5/lib/libasn1
 _prebuild_libs+=	kerberos5/lib/libgssapi
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/carl/cvsup/dfly/src/etc/defaults/make.conf,v
retrieving revision 1.13
diff -u -r1.13 make.conf
--- etc/defaults/make.conf	11 Jun 2005 21:09:51 -0000	1.13
+++ etc/defaults/make.conf	4 Sep 2005 17:46:18 -0000
@@ -314,22 +314,13 @@
 #
 # Kerberos 5
 # If you want Kerberos 5 (KTH Heimdal), define this:
-#
-#MAKE_KERBEROS5=	yes
+#WANT_KERBEROS=	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
 # information on CVSup and these files).  To use, do "make update" in /usr/src.
Index: lib/pam_module/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/lib/pam_module/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- lib/pam_module/Makefile	12 Jul 2005 23:30:24 -0000	1.2
+++ lib/pam_module/Makefile	4 Sep 2005 17:46:38 -0000
@@ -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(WANT_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=	pam_krb5
 .endif
 
Index: sbin/mount_nfs/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/sbin/mount_nfs/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sbin/mount_nfs/Makefile	3 Apr 2005 15:52:01 -0000	1.3
+++ sbin/mount_nfs/Makefile	4 Sep 2005 17:47:22 -0000
@@ -13,8 +13,7 @@
 CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL}
 .PATH: ${MOUNT} ${UMNTALL}
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
-	|| defined(MAKE_EBONES))
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(WANT_KERBEROS)
 CFLAGS+=-DKERBEROS
 DPADD=	${LIBKRB} ${LIBCRYPTO}
 LDADD=	-lkrb -lcrypto
Index: secure/lib/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/secure/lib/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- secure/lib/Makefile	5 Aug 2003 07:45:42 -0000	1.3
+++ secure/lib/Makefile	4 Sep 2005 17:47:38 -0000
@@ -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(WANT_KERBEROS)
 SUBDIR+=libtelnet
 .endif
 .if !defined(NO_OPENSSL)
Index: secure/lib/libssh/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/secure/lib/libssh/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- secure/lib/libssh/Makefile	7 Jul 2005 12:43:36 -0000	1.5
+++ secure/lib/libssh/Makefile	4 Sep 2005 17:47:55 -0000
@@ -18,7 +18,7 @@
 # Patches
 SRCS+=	log.c.patch
 
-.if defined(MAKE_KERBEROS5)
+.if defined(WANT_KERBEROS)
 CFLAGS+= -DKRB5 -DHEIMDAL
 .endif
 
Index: secure/libexec/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/secure/libexec/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- secure/libexec/Makefile	5 Aug 2003 07:45:42 -0000	1.3
+++ secure/libexec/Makefile	4 Sep 2005 17:48:09 -0000
@@ -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(WANT_KERBEROS) && !defined(NO_OPENSSL)
 SUBDIR= telnetd
 .endif
 .if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
Index: secure/usr.bin/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/secure/usr.bin/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- secure/usr.bin/Makefile	5 Aug 2003 07:45:43 -0000	1.3
+++ secure/usr.bin/Makefile	4 Sep 2005 17:48:24 -0000
@@ -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(WANT_KERBEROS)
 SUBDIR+=telnet
 .endif
 .if !defined(NO_OPENSSL)
Index: secure/usr.bin/ssh/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/secure/usr.bin/ssh/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- secure/usr.bin/ssh/Makefile	7 Jul 2005 12:43:36 -0000	1.6
+++ secure/usr.bin/ssh/Makefile	4 Sep 2005 17:48:39 -0000
@@ -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(WANT_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/cvsup/dfly/src/secure/usr.sbin/sshd/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- secure/usr.sbin/sshd/Makefile	14 Jul 2005 18:29:48 -0000	1.10
+++ secure/usr.sbin/sshd/Makefile	4 Sep 2005 17:49:04 -0000
@@ -30,7 +30,7 @@
 
 SRCS+=	sshd.8.no_obj.patch sshd_config.5.no_obj.patch
 
-.if defined(MAKE_KERBEROS5)
+.if defined(WANT_KERBEROS)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL
 SRCS+=	auth-krb5.c
Index: share/man/man5/make.conf.5
===================================================================
RCS file: /home/carl/cvsup/dfly/src/share/man/man5/make.conf.5,v
retrieving revision 1.9
diff -u -r1.9 make.conf.5
--- share/man/man5/make.conf.5	25 Jul 2005 00:24:31 -0000	1.9
+++ share/man/man5/make.conf.5	4 Sep 2005 17:49:37 -0000
@@ -414,7 +414,7 @@
 It is
 .Em "YOUR RESPONSIBILITY"
 to determine if you can legally use IDEA.
-.It Va MAKE_KERBEROS5
+.It Va WANT_KERBEROS
 .Pq Vt bool
 Set this to build Kerberos5 (KTH Heimdal).
 .Em WARNING !
@@ -695,11 +695,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
 Set this to the base directory that non\-X ports should be
Index: usr.bin/su/Makefile
===================================================================
RCS file: /home/carl/cvsup/dfly/src/usr.bin/su/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- usr.bin/su/Makefile	19 Dec 2004 21:10:48 -0000	1.5
+++ usr.bin/su/Makefile	4 Sep 2005 17:49:50 -0000
@@ -15,7 +15,7 @@
 .endif
 CFLAGS+= -Wall
 
-.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if defined(WANT_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 CFLAGS+=-DKERBEROS5
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
 	${LIBROKEN}