kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change USE_KERBEROS to PKG_USE_KERBEROS in pkgsrc. There was a "conflict"

Browse source 
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.
This commit is contained in:
cjep 2002-06-15 21:19:59 +00:00
parent 4b3727b766
commit 64c9e8a407
12 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
databases/openldap/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.42 2002/03/07 23:40:56 jlam Exp $
# $NetBSD: Makefile,v 1.43 2002/06/15 21:19:59 cjep Exp $
DISTNAME= openldap-2.0.23
SVR4_PKGNAME= oldap
@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --enable-spasswd
.endif
.if defined(KERBEROS)
USE_KERBEROS= YES
PKG_USE_KERBEROS= YES
CONFIGURE_ARGS+= --with-kerberos
.else
CONFIGURE_ARGS+= --without-kerberos

4
databases/openldap1/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2001/10/25 18:46:29 kleink Exp $
# $NetBSD: Makefile,v 1.3 2002/06/15 21:20:00 cjep Exp $
#
DISTNAME= openldap-1.2.13
@ -46,7 +46,7 @@ post-configure:
${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
.if defined(KERBEROS)
USE_KERBEROS= yes
PKG_USE_KERBEROS= yes
CONFIGURE_ARGS+=--with-kerberos
.else
CONFIGURE_ARGS+=--without-kerberos

4
mail/cyrus-imapd/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.26 2001/12/06 09:50:13 martti Exp $
# $NetBSD: Makefile,v 1.27 2002/06/15 21:20:01 cjep Exp $
DISTNAME= cyrus-imapd-2.0.16
PKGREVISION= 1
@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --with-com_err=yes
.endif
.if defined(KERBEROS) && ${KERBEROS} == 4
USE_KERBEROS= # defined
PKG_USE_KERBEROS= # defined
CONFIGURE_ARGS+= --with-auth=krb
.else
CONFIGURE_ARGS+= --with-auth=unix

4
mail/fetchmail/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.113 2002/04/06 16:53:01 frueauf Exp $
# $NetBSD: Makefile,v 1.114 2002/06/15 21:20:01 cjep Exp $
DISTNAME= fetchmail-5.9.11
CATEGORIES= mail
@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --without-ssl
BUILD_DEFS+= FETCHMAIL_USE_SSL
.if defined(KERBEROS)
USE_KERBEROS= yes
PKG_USE_KERBEROS= yes
CONFIGURE_ARGS+= --with-kerberos=yes
.if ${MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386} == ""
REPLACE_KERBEROS_LIBS= # defined

4
mail/nmh/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.46 2002/03/11 08:57:50 skrll Exp $
# $NetBSD: Makefile,v 1.47 2002/06/15 21:20:01 cjep Exp $
# FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
#
@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
.endif
.if defined(KERBEROS)
USE_KERBEROS= # defined
PKG_USE_KERBEROS= # defined
CONFIGURE_ARGS+= --with-krb4
.else
CONFIGURE_ARGS+= --without-krb4

4
mail/qpopper/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.5 2002/05/03 15:09:51 taca Exp $
# $NetBSD: Makefile.common,v 1.6 2002/06/15 21:20:02 cjep Exp $
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --libexecdir=${LOCALBASE}/libexec \
@ -20,7 +20,7 @@ VERSION= 4.0.4
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR}
.if defined(KERBEROS)
USE_KERBEROS= # defined
PKG_USE_KERBEROS= # defined
CONFIGURE_ARGS+= --enable-kerberos
.endif

4
mk/bsd.pkg.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.990 2002/06/15 11:28:12 cjep Exp $
# $NetBSD: bsd.pkg.mk,v 1.991 2002/06/15 21:20:02 cjep Exp $
#
# This file is in the public domain.
#
@ -184,7 +184,7 @@ MAKE_PROGRAM= ${MAKE}
.endif
CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}"
.if defined(USE_KERBEROS)
.if defined(PKG_USE_KERBEROS)
RESTRICTED?= uses Kerberos encryption code
BUILD_DEFS+= KERBEROS
.endif

4
net/radius/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.19 2001/12/19 13:42:10 tron Exp $
# $NetBSD: Makefile,v 1.20 2002/06/15 21:20:03 cjep Exp $
#
# Tempted to install another radius package?
#
@ -29,7 +29,7 @@ DIST_SUBDIR= radius
CFLAGS+= -DHAVE_SETVBUF -DNOSHADOW
.if defined(KERBEROS)
USE_KERBEROS= yes
PKG_USE_KERBEROS= yes
CFLAGS+= -DM_KERB -I/usr/include/kerberosIV
RADLIBS= -lkrb -ldes
.endif

4
net/zephyr/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:47 jlam Exp $
# $NetBSD: Makefile,v 1.23 2002/06/15 21:20:03 cjep Exp $
#
DISTNAME= zephyr-2.0.4
@ -12,7 +12,7 @@ COMMENT= Zephyr Messaging Service
.include "../../mk/bsd.prefs.mk"
.if defined(KERBEROS)
USE_KERBEROS= yes
PKG_USE_KERBEROS= yes
CONFIGURE_ARGS+="--with-krb4"
CPPFLAGS+= -I/usr/include/kerberosIV
.else

4
security/openssh/Makefile
View file

@ -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: <krb.h>
#.if defined(KERBEROS)
#USE_KERBEROS= yes
#PKG_USE_KERBEROS= yes
#CONFIGURE_ARGS+= --with-kerberos4=/usr
#.endif

6
security/ssh/Makefile
View file

@ -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

4
security/sudo/Makefile
View file

@ -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