From 64c9e8a407f30ababa7be4bdb08c71b511efae6e Mon Sep 17 00:00:00 2001 From: cjep Date: Sat, 15 Jun 2002 21:19:59 +0000 Subject: Change USE_KERBEROS to PKG_USE_KERBEROS in pkgsrc. There was a "conflict" which the basesrc USE_KERBEROS variable. Discussed on packages@ This fixes PR#17182 from Takahiro Kambe. The problem was pointed out by FUKAUMI Naoki on a Japanese NetBSD mailing list. --- security/openssh/Makefile | 4 ++-- security/ssh/Makefile | 6 +++--- security/sudo/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'security') diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 66c94073941..bbdce61784f 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2002/05/24 04:11:47 itojun Exp $ +# $NetBSD: Makefile,v 1.72 2002/06/15 21:20:04 cjep Exp $ DISTNAME= openssh-3.2.3p1 PKGNAME= openssh-3.2.3.1 @@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --with-md5-passwords # XXX: #.if defined(KERBEROS) -#USE_KERBEROS= yes +#PKG_USE_KERBEROS= yes #CONFIGURE_ARGS+= --with-kerberos4=/usr #.endif diff --git a/security/ssh/Makefile b/security/ssh/Makefile index ad20d09d805..610342c6333 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2002/02/05 04:26:56 jlam Exp $ +# $NetBSD: Makefile,v 1.99 2002/06/15 21:20:04 cjep Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -104,13 +104,13 @@ DEPENDS+= socks5-1.0.2:../../net/socks5 # MD5 (ssh-1.2.27-afs-kerberos.patch-1) = d440f74958d9c3805b76dbc13e97e87d .if defined(KERBEROS) -USE_KERBEROS= yes +PKG_USE_KERBEROS= yes CONFIGURE_ARGS+= --with-krb4=/usr .endif # XXX KERBEROS 5 SUPPORT BROKEN WITH HEIMDAL #.if defined(KERBEROS) && ${KERBEROS} == 5 -#USE_KERBEROS= yes +#PKG_USE_KERBEROS= yes #CONFIGURE_ARGS+=--with-krb5=/usr #.else #CONFIGURE_ARGS+=--without-krb5 diff --git a/security/sudo/Makefile b/security/sudo/Makefile index ea90c25c4b6..91089122111 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2002/04/25 16:57:13 jschauma Exp $ +# $NetBSD: Makefile,v 1.47 2002/06/15 21:20:05 cjep Exp $ # DISTNAME= sudo-1.6.6 @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-skey .endif .if defined(KERBEROS) -USE_KERBEROS= # defined +PKG_USE_KERBEROS= # defined CONFIGURE_ARGS+= --with-kerb4 --with-kerb5 .else CONFIGURE_ARGS+= --without-kerb4 --without-kerb5 -- cgit v1.2.3