summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache>2011-05-10 01:33:12 +0000
committerobache <obache>2011-05-10 01:33:12 +0000
commit4f0c91822e9576e7025d27ac6d363e041ca98e52 (patch)
tree41e087a4b4d42d029f23d26a70ca6ada215e2955
parente7879fcf985e02da08dcedcfb87943b02e6d18f0 (diff)
downloadpkgsrc-4f0c91822e9576e7025d27ac6d363e041ca98e52.tar.gz
Exactly disable ldap support if ldap option is off (enabled by default in
configure script) to avoid hidden dependency. Bump PKGREVISION.
-rw-r--r--mail/alpine/Makefile4
-rw-r--r--mail/alpine/options.mk6
2 files changed, 6 insertions, 4 deletions
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index d0681a2562e..40bc2f30288 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2011/05/09 12:02:59 obache Exp $
+# $NetBSD: Makefile,v 1.24 2011/05/10 01:33:12 obache Exp $
#
DISTNAME= alpine-2.00
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/
DIST_SUBDIR= alpine-2.00a
diff --git a/mail/alpine/options.mk b/mail/alpine/options.mk
index b2d43a07d08..fa865cef94b 100644
--- a/mail/alpine/options.mk
+++ b/mail/alpine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/04/03 09:44:21 abs Exp $
+# $NetBSD: options.mk,v 1.3 2011/05/10 01:33:12 obache Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.alpine
@@ -20,8 +20,10 @@ PATCH_DIST_STRIP= -p1
#.endif
.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
.include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-ldap
.endif
.if !empty(PKG_OPTIONS:Mmaildir)