Fixed installation by _really_ disabling building of ldapaliasd. Bug

reported upstream (typo in courier/configure.in prevented option
"--without-ldapaliasd" from working).

3 files changed, 37 insertions, 5 deletions

diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo
index e738602b059..7fb411c1151 100644
--- a/mail/courier-mta/distinfo
+++ b/mail/courier-mta/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2008/02/19 18:45:23 jlam Exp $
+$NetBSD: distinfo,v 1.12 2010/01/09 22:16:20 heinz Exp $
 
 SHA1 (courier-0.58.0.tar.bz2) = 964d81e6de5390678c9f10dddbc176273b925f6d
 RMD160 (courier-0.58.0.tar.bz2) = 940fb7967d154aeeb462691beb508155b3df4e29
 Size (courier-0.58.0.tar.bz2) = 7123136 bytes
 SHA1 (patch-aa) = 3f5465bd153d51f1dd6ed2f7849c098957afec2e
-SHA1 (patch-ab) = 6b46f55cafc63611d841e03dbe53c9f0b6731920
+SHA1 (patch-ab) = 133f2b48bdff76568b89e51908734a7e29cf9e03
 SHA1 (patch-ac) = 3db182c84827d53af35ea45b7296b98ecf0579d8
 SHA1 (patch-ad) = faa1d2f21f55550efa631c25435fefee5b235bf2
 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
@@ -17,3 +17,4 @@ SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
 SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
 SHA1 (patch-ax) = ed01509d1868b92e80ec98e320ac285345584e31
 SHA1 (patch-ay) = 499f46a7116da4f7adfa6e7c2d7e4e4856174a9f
+SHA1 (patch-az) = fbe1667536989486e62ecdb50a74cb3c38e3fb0d
diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab
index fccf66711f2..5b82665f3b4 100644
--- a/mail/courier-mta/patches/patch-ab
+++ b/mail/courier-mta/patches/patch-ab
@@ -1,8 +1,21 @@
-$NetBSD: patch-ab,v 1.4 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2010/01/09 22:16:20 heinz Exp $
 
---- courier/configure.orig	2007-11-23 22:26:42.000000000 -0500
+  first hunk: make option "--without-ldapaliasd" work (see patch-az)
+
+--- courier/configure.orig	2007-11-24 03:26:42.000000000 +0000
 +++ courier/configure
-@@ -22366,9 +22366,9 @@ done
+@@ -21071,7 +21071,9 @@ LIBS="$saveLIBS"
+ 
+ # Check whether --with-ldapaliasd was given.
+ if test "${with_ldapaliasd+set}" = set; then
+-  withval=$with_ldapaliasd; ldapaliasd="$withval"; ldapaliasd="yes"
++  withval=$with_ldapaliasd; ldapaliasd="$withval"
++else
++  ldapaliasd="yes"
+ fi
+ 
+ 
+@@ -22366,9 +22368,9 @@ done
  
  if test "$testmode" = "0"
  then
diff --git a/mail/courier-mta/patches/patch-az b/mail/courier-mta/patches/patch-az
new file mode 100644
index 00000000000..7ae71be8d1e
--- /dev/null
+++ b/mail/courier-mta/patches/patch-az
@@ -0,0 +1,18 @@
+$NetBSD: patch-az,v 1.1 2010/01/09 22:16:20 heinz Exp $
+
+   wrong syntax prevents valid ACTION-IF-NOT-GIVEN, so "--without-ldapaliasd"
+   cannot work.
+   Reported upstream in http://sourceforge.net/mailarchive/message.php?msg_name=20100109205111.GB703%40silence.h.kh-22.de
+
+--- courier/configure.in.orig	2007-11-24 03:25:52.000000000 +0000
++++ courier/configure.in
+@@ -267,7 +267,8 @@ AC_CHECK_FUNC(ldap_search_st, HAVE_LDAP=
+ LIBS="$saveLIBS"
+ 
+ AC_ARG_WITH(ldapaliasd, [ --without-ldapaliasd ],
+-			ldapaliasd="$withval"; ldapaliasd="yes")
++			ldapaliasd="$withval",
++			ldapaliasd="yes")
+ 
+ if test "$ldapaliasd" = "no"
+ then