summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-05-11 19:23:16 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-05-11 19:23:16 +0000
commit138d9265b77cad7e04480027b2452ef22e87c3a6 (patch)
tree6b70f3134b7a6649158276b970af23abd82d970a /net
parentAdd the mirror http://www.mirror.ac.uk/sites/www.haskell.org/ to MASTER_SITES. (diff)
Fix the kerberos dependency so that this will properly build on the clusters,
and retain its kerberos dependency at runtime. Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=108941
Diffstat (limited to 'net')
-rw-r--r--net/samba-devel/Makefile9
-rw-r--r--net/samba3/Makefile9
2 files changed, 4 insertions, 14 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 5a2bbb5e8ea8..865cac003f8a 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -214,13 +214,8 @@ CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}
.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr
.else
-BUILD_DEPENDS+= krb5-config:${PORTSDIR}/security/heimdal
-KRB5_PREFIX!= krb5-config --prefix 2>/dev/null || true
-.if defined(KRB5_PREFIX) && !empty (KRB5_PREFIX)
-CONFIGURE_ARGS+= --with-krb5=${KRB5_PREFIX}
-.else
-BROKEN= "Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
-.endif
+LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
+CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
.endif
.else
CONFIGURE_ARGS+= --without-krb5
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 5a2bbb5e8ea8..865cac003f8a 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -214,13 +214,8 @@ CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}
.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr
.else
-BUILD_DEPENDS+= krb5-config:${PORTSDIR}/security/heimdal
-KRB5_PREFIX!= krb5-config --prefix 2>/dev/null || true
-.if defined(KRB5_PREFIX) && !empty (KRB5_PREFIX)
-CONFIGURE_ARGS+= --with-krb5=${KRB5_PREFIX}
-.else
-BROKEN= "Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
-.endif
+LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
+CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
.endif
.else
CONFIGURE_ARGS+= --without-krb5