diff options
| -rw-r--r-- | databases/openldap-server/options.mk | 5 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 4 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-bf | 20 |
3 files changed, 15 insertions, 14 deletions
diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk index b605557bcdc..68907d65ac5 100644 --- a/databases/openldap-server/options.mk +++ b/databases/openldap-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/08/24 19:06:51 manu Exp $ +# $NetBSD: options.mk,v 1.5 2007/08/28 14:33:27 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd @@ -97,5 +97,6 @@ LDFLAGS+=-lkrb5 LDFLAGS+=-lkadm5srv LDFLAGS+=-lhdb . include "../../mk/krb5.buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-smbk5pwd .endif - diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index 98a547a7a4b..c685a80905d 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.55 2007/08/28 14:08:22 tron Exp $ +$NetBSD: distinfo,v 1.56 2007/08/28 14:33:27 tron Exp $ SHA1 (openldap-2.3.32.tgz) = ccf008c3d41206e2e29870b7786aaf00d7c2bc70 RMD160 (openldap-2.3.32.tgz) = de0d076868cbef4e3b9eb393ef45683cf990d3d2 @@ -17,5 +17,5 @@ SHA1 (patch-ba) = 6e7fb1dd6e17afb2009d0bd1c05059feedfdab77 SHA1 (patch-bb) = 5014662e475e4b9f51d444f01ce45fdeb5f36951 SHA1 (patch-bd) = 27281d5057fd82631600ef2e43ceee4cb918a674 SHA1 (patch-be) = ffe85c7127fa42e4d5f06bfe9dd6cbb9b91850c4 -SHA1 (patch-bf) = 79ddb4220e92458cfc9088c2b56268c94076f179 +SHA1 (patch-bf) = caace2398744b236712247fa0927f34673c64994 SHA1 (patch-bh) = ec0d59bfebe2b010dd24344b6b95106d35d329e2 diff --git a/databases/openldap/patches/patch-bf b/databases/openldap/patches/patch-bf index 7cbf031f09c..e90cc344da7 100644 --- a/databases/openldap/patches/patch-bf +++ b/databases/openldap/patches/patch-bf @@ -1,4 +1,4 @@ -$NetBSD: patch-bf,v 1.2 2007/08/28 14:08:22 tron Exp $ +$NetBSD: patch-bf,v 1.3 2007/08/28 14:33:27 tron Exp $ --- configure.orig 2007-08-24 06:20:33.000000000 +0200 +++ configure 2007-08-24 06:23:02.000000000 +0200 @@ -38,11 +38,11 @@ $NetBSD: patch-bf,v 1.2 2007/08/28 14:08:22 tron Exp $ fi; # end --enable-rwm -+# OpenLDAP --enable-smvk5pwd ++# OpenLDAP --enable-smbk5pwd + -+ # Check whether --enable-smvk5pwd or --disable-smvk5pwd was given. -+if test "${enable_smvk5pwd+set}" = set; then -+ enableval="$enable_smvk5pwd" ++ # Check whether --enable-smbk5pwd or --disable-smbk5pwd was given. ++if test "${enable_smbk5pwd+set}" = set; then ++ enableval="$enable_smbk5pwd" + + ol_arg=invalid + for ol_val in no yes mod ; do @@ -51,16 +51,16 @@ $NetBSD: patch-bf,v 1.2 2007/08/28 14:08:22 tron Exp $ + fi + done + if test "$ol_arg" = "invalid" ; then -+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-smvk5pwd" >&5 -+echo "$as_me: error: bad value $enableval for --enable-smvk5pwd" >&2;} ++ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-smbk5pwd" >&5 ++echo "$as_me: error: bad value $enableval for --enable-smbk5pwd" >&2;} + { (exit 1); exit 1; }; } + fi -+ ol_enable_smvk5pwd="$ol_arg" ++ ol_enable_smbk5pwd="$ol_arg" + +else -+ ol_enable_smvk5pwd=${ol_enable_overlays:-yes} ++ ol_enable_smbk5pwd=${ol_enable_overlays:-yes} +fi; -+# end --enable-smvk5pwd ++# end --enable-smbk5pwd + # OpenLDAP --enable-syncprov |