Update cue to 20100426.

Based on PR pkg/45557 by YAMAMOTO Takeshi.

Some bug fixes include most of pkgsrc patches.

9 files changed, 168 insertions, 442 deletions

diff --git a/mail/cue/patches/patch-aa b/mail/cue/patches/patch-aa
index 1b367fe048b..30358693b92 100644
--- a/mail/cue/patches/patch-aa
+++ b/mail/cue/patches/patch-aa
@@ -1,71 +1,140 @@
-$NetBSD: patch-aa,v 1.6 2009/12/15 13:11:18 taca Exp $
+$NetBSD: patch-aa,v 1.7 2011/11/27 13:05:33 obache Exp $
 
 * Prevent extra -O from being added to optimizer flags.
 * Assume that DragonFly's getaddrinfo works.
-* Add "USE_" before cpp definition for CANNA, SSL and ZLIB.  It was generated
-  by fixed AC_PREFIX_PKG in configure.in.
+* Fix an error with --enable-ipv6.
 
---- configure.orig	2005-04-27 20:54:13.000000000 +0900
+--- configure.orig	2009-12-16 05:51:12.000000000 +0000
 +++ configure
-@@ -675,7 +675,7 @@ netbsd*)
+@@ -1505,6 +1505,48 @@ $as_echo "$ac_res" >&6; }
+ 
+ } # ac_fn_c_check_func
+ 
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++       $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_retval=$ac_status
++fi
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  return $ac_retval
++
++} # ac_fn_c_try_run
++
+ # ac_fn_c_try_cpp LINENO
+ # ----------------------
+ # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+@@ -1993,7 +2035,7 @@ netbsd*)
  	;;
  esac
  
 -OPTS="-O"
 +OPTS=""
+ CFLAGS=""
  
+ # AC_PREFIX_PKG(VARIABLE, HEADER, LIBRARY, PATH [, IF-TRUE [, IF FALSE ] ])
+@@ -2817,55 +2859,13 @@ $as_echo "yes" >&6; }
+        ;;
+   esac
+ else
+-  if test "$cross_compiling" = yes; then :
++   if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+   ipv6=no
  
- 
-@@ -1127,7 +1127,7 @@ fi
- rm -fr conftest*
+ else
+-
+-# ac_fn_c_try_run LINENO
+-# ----------------------
+-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+-# that executables *can* be run.
+-ac_fn_c_try_run ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if { { ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then :
+-  ac_retval=0
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-       $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-       ac_retval=$ac_status
+-fi
+-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
+-
+-} # ac_fn_c_try_run
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+  /* AF_INET6 avalable check */
+ #include <sys/types.h>
+@@ -3432,6 +3432,7 @@ rm -f core *.core core.conftest.* gmon.o
  fi
  
--
+ 
 +if test ${OPSYS} != "DragonFly"; then
  if test "$buggygetaddrinfo" = "yes"; then
  	if test "$ipv6" = "yes"; then
  		echo 'Fatal: You must get working getaddrinfo() function.'
-@@ -1135,6 +1135,7 @@ if test "$buggygetaddrinfo" = "yes"; the
+@@ -3439,6 +3440,7 @@ if test "$buggygetaddrinfo" = "yes"; the
  		exit 1
  	fi
  fi
 +fi
  
- echo $ac_n "checking if --enable-idea option is specified""... $ac_c" 1>&6
- echo "configure:1141: checking if --enable-idea option is specified" >&5
-@@ -1216,7 +1217,7 @@ echo "configure:1201: checking for zlib 
- 		
- 			zlib=$ac_cv_prefix_zlib
- 			cat >> confdefs.h <<EOF
--#define `echo zlib | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
-+#define `echo use_zlib | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
- EOF
- 
- 			if test -n "$ac_lib"; then
-@@ -1268,7 +1269,7 @@ echo "configure:1253: checking for canna
- 		
- 			canna=$ac_cv_prefix_canna
- 			cat >> confdefs.h <<EOF
--#define `echo canna | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
-+#define `echo use_canna | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
- EOF
- 
- 			if test -n "$ac_lib"; then
-@@ -1321,7 +1322,7 @@ echo "configure:1306: checking for ssl d
- 		
- 			ssl=$ac_cv_prefix_ssl
- 			cat >> confdefs.h <<EOF
--#define `echo ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
-+#define `echo use_ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
- EOF
- 
- 			if test -n "$ac_lib"; then
-@@ -1362,7 +1363,7 @@ echo "configure:1347: checking for ssl d
- 		
- 			ssl=$ac_cv_prefix_ssl
- 			cat >> confdefs.h <<EOF
--#define `echo ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
-+#define `echo use_ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
- EOF
- 
- 			if test -n "$ac_lib"; then
+ # IDEA
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-idea option is specified" >&5
diff --git a/mail/cue/patches/patch-ac b/mail/cue/patches/patch-ac
deleted file mode 100644
index fd8b3f248be..00000000000
--- a/mail/cue/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/22 20:59:01 schwarz Exp $
-
---- proc.c.orig	2006-10-22 22:37:56.000000000 +0200
-+++ proc.c	2006-10-22 22:39:04.000000000 +0200
-@@ -41,6 +41,10 @@
- 
- #include "cue.h"
- 
-+#ifdef __sgi
-+#define vfork() fork()
-+#endif
-+
- struct procs {
- 	struct procs *pr_next;
- 	int pr_pid;
diff --git a/mail/cue/patches/patch-ad b/mail/cue/patches/patch-ad
deleted file mode 100644
index ac9553e42b6..00000000000
--- a/mail/cue/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/10/22 20:59:01 schwarz Exp $
-
---- zip.h.orig	2006-10-22 22:42:35.000000000 +0200
-+++ zip.h	2006-10-22 22:43:58.000000000 +0200
-@@ -30,6 +30,11 @@
- #ifndef _ZIP_H
- #define	_ZIP_H
- 
-+#ifdef NO_ATTRIBUTE
-+/* some compilers don't like it */
-+#define __attribute__(x)
-+#endif
-+
- /*
-  * Definition of ZIP
-  */
diff --git a/mail/cue/patches/patch-ae b/mail/cue/patches/patch-ae
deleted file mode 100644
index 24807a75520..00000000000
--- a/mail/cue/patches/patch-ae
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2009/12/15 13:11:18 taca Exp $
-
-* Fix for OpenSSL 1.0.0 beta. (STACK has gone.)
-* Use proper sk_TYPE_num, sk_TYPE_value for each TYPE.
-
---- smime.c.orig	2008-06-03 10:58:57.000000000 +0900
-+++ smime.c
-@@ -108,7 +108,7 @@ smime_decrypt(struct state *state)
- 	struct header *hdr;
- 	char buf[BUFSIZ];
- #ifndef OPENSSL_BUG_FIXED
--	STACK *sk;
-+	STACK_OF(PKCS7_RECIP_INFO) *sk;
- 	PKCS7_RECIP_INFO *ri;
- #endif
- 
-@@ -174,10 +174,10 @@ smime_decrypt(struct state *state)
- 		sk = NULL;
- 		break;
- 	case NID_pkcs7_signedAndEnveloped:
--		sk = (STACK *)p7->d.signed_and_enveloped->recipientinfo;
-+		sk = p7->d.signed_and_enveloped->recipientinfo;
- 		break;
- 	case NID_pkcs7_enveloped:
--		sk = (STACK *)p7->d.enveloped->recipientinfo;
-+		sk = p7->d.enveloped->recipientinfo;
- 		break;
- 	default:
- 		sk = NULL;
-@@ -185,7 +185,7 @@ smime_decrypt(struct state *state)
- 	}
- 	if (sk) {
- 		for (;;) {
--			if (sk_num(sk) == 0) {
-+			if (sk_PKCS7_RECIP_INFO_num(sk) == 0) {
- 				strlcpy(state->status,
- 				    "Cannot find recipient info for me\n",
- 				    sizeof(state->status));
-@@ -194,11 +194,11 @@ smime_decrypt(struct state *state)
- 				PKCS7_free(p7);
- 				return -1;
- 			}
--			ri=(PKCS7_RECIP_INFO *)sk_value(sk,0);
-+			ri=sk_PKCS7_RECIP_INFO_value(sk,0);
- 			if (X509_name_cmp(ri->issuer_and_serial->issuer, X509_get_issuer_name(x509)) == 0
- 			&&  ASN1_INTEGER_cmp(ri->issuer_and_serial->serial, X509_get_serialNumber(x509)) == 0)
- 				break;
--			sk_shift(sk);
-+			sk_PKCS7_RECIP_INFO_shift(sk);
- 			PKCS7_RECIP_INFO_free(ri);
- 		}
- 	}
-@@ -401,7 +401,7 @@ smime_verify(struct state *state)
- 	cbuf_t *cb, cbuf, sproto, from;
- 	int i, ret;
- 	PKCS7 *p7;
--	STACK *sk;
-+	STACK_OF(PKCS7_SIGNER_INFO) *sk;
- 	char *p, *ep;
- 	BIO *detached, *p7bio;
- 	PKCS7_SIGNER_INFO *si;
-@@ -496,11 +496,11 @@ BIO_read_filename(detached, "/tmp/smime.
- 	    getenv("SSL_CERT_DIR"));
- 	ERR_clear_error();
- 
--	sk = (STACK *)PKCS7_get_signer_info(p7);
-+	sk = PKCS7_get_signer_info(p7);
- 	strlcpy(state->status, "S/MIME verify OK", sizeof(state->status));
- 	ret = 1;
--	for (i = 0; i < sk_num(sk); i++) {
--		si = (PKCS7_SIGNER_INFO *)sk_value(sk, i);
-+	for (i = 0; i < sk_PKCS7_SIGNER_INFO_num(sk); i++) {
-+		si = sk_PKCS7_SIGNER_INFO_value(sk, i);
- 		if (PKCS7_dataVerify(cert_store, &cert_ctx, p7bio, p7, si) <= 0) {
- 			ret = -1;
- 			snprintf(state->status, sizeof(state->status),
-@@ -560,7 +560,7 @@ smime_sign(struct state *state)
- {
- 	int i;
- 	PKCS7 *p7;
--	STACK *sk;
-+	STACK_OF(X509) *sk;
- 	char *p;
- 	BIO *in, *p7bio;
- 	PKCS7_SIGNER_INFO *si;
-@@ -675,9 +675,9 @@ smime_sign(struct state *state)
- 		PKCS7_free(p7);
- 		return 0;
- 	}
--	sk = (STACK *)X509_STORE_CTX_get_chain(&cert_ctx);
--	for (i = 0; i < sk_num(sk); i++) {
--		x = (X509 *)sk_value(sk, i);
-+	sk = X509_STORE_CTX_get_chain(&cert_ctx);
-+	for (i = 0; i < sk_X509_num(sk); i++) {
-+		x = sk_X509_value(sk, i);
- 		PKCS7_add_certificate(p7, x);
- 	}
- 
-@@ -975,7 +975,7 @@ smime_encrypt(struct state *state)
- 	BIO_ctrl(p7bio, BIO_C_GET_CIPHER_CTX, 1, (char *)&ctx);
- 	if (EVP_CIPHER_CTX_nid(ctx) == NID_rc2_cbc) {
- 		const EVP_CIPHER *cipher;
--		STACK *rsk;
-+		STACK_OF(PKCS7_RECIP_INFO) *rsk;
- 		PKCS7_RECIP_INFO *ri;
- 		u_char key[EVP_MAX_KEY_LENGTH];
- 		u_char iv[EVP_MAX_IV_LENGTH];
-@@ -983,7 +983,7 @@ smime_encrypt(struct state *state)
- 		int keylen, ivlen, buflen, len;
- 		u_char *buf, *q;
- 
--		rsk = (STACK *)p7->d.enveloped->recipientinfo;
-+		rsk = p7->d.enveloped->recipientinfo;
- 		cipher = EVP_rc2_40_cbc();	/* XXX */
- 		keylen = EVP_CIPHER_key_length(cipher);
- 		ivlen = EVP_CIPHER_iv_length(cipher);
-@@ -992,8 +992,8 @@ smime_encrypt(struct state *state)
- 		EVP_CipherInit(ctx, cipher, key, iv, 1);
- 		buf = NULL;
- 		buflen = 0;
--		for (i = 0; i < sk_num(rsk); i++) {
--			ri = (PKCS7_RECIP_INFO *)sk_value(rsk, i);
-+		for (i = 0; i < sk_PKCS7_RECIP_INFO_num(rsk); i++) {
-+			ri = sk_PKCS7_RECIP_INFO_value(rsk, i);
- 			pkey = X509_get_pubkey(ri->cert);
- 			len = EVP_PKEY_size(pkey);
- 			if (buflen < len) {
diff --git a/mail/cue/patches/patch-af b/mail/cue/patches/patch-af
deleted file mode 100644
index c6153bd87b0..00000000000
--- a/mail/cue/patches/patch-af
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/12/15 13:11:18 taca Exp $
-
-* ZLIB => USE_ZLIB; it should simply use HAVE_ZLIB_H.
-
---- decode.c.orig	2008-12-18 16:07:25.000000000 +0900
-+++ decode.c
-@@ -41,9 +41,9 @@
- #include <utime.h>
- #include <stddef.h>
- 
--#ifdef ZLIB
-+#ifdef USE_ZLIB
- #include <zlib.h>
--#endif /* ZLIB */
-+#endif /* USE_ZLIB */
- 
- #include "cue.h"
- #include "decode.h"
-@@ -910,7 +910,7 @@ decode_zip(struct decode *dp, char **pp,
- 	*pp = b64_getptr(&bs);
- }
- 
--#ifdef ZLIB
-+#ifdef USE_ZLIB
- 
- /* decode x-gzip64 text */
- static void
-@@ -987,7 +987,7 @@ decode_gzip64(struct decode *dp, char **
- 	dp->noconv = 1;
- 	decode_base64(dp, pp, ep);
- }
--#endif /* ZLIB */
-+#endif /* USE_ZLIB */
- 
- /* decode 1 line body */
- int
-@@ -1006,11 +1006,11 @@ decode_text(char **pp, char *ep, cbuf_t 
- 	case FDB_ENC_B64:
- 		decode_base64(&d, pp, ep);
- 		break;
--#ifdef ZLIB
-+#ifdef USE_ZLIB
- 	case FDB_ENC_GZ64:
- 		decode_gzip64(&d, pp, ep);
- 		break;
--#endif /* ZLIB */
-+#endif /* USE_ZLIB */
- 	case FDB_ENC_UU:
- 		decode_uuencode(&d, pp, ep);
- 		break;
-@@ -1300,14 +1300,14 @@ save_part(struct state *state, int all)
- 		return;
- 	message_parseall(fdb);
- 
--#ifdef ZLIB
-+#ifdef USE_ZLIB
- 	if (!all && (fdb->flags & FDB_ENCODE) == FDB_ENC_ZIP) {
- 		if (fdb->lines - fdb->hdr_lines == 7) {
- 			fdb->filename = *fdb_read(fdb, fdb->lines - 1);
- 			singlezip = 1;
- 		}
- 	}
--#endif /* ZLIB */
-+#endif /* USE_ZLIB */
- 
- 	p = state->status;
- 	ep = state->status + sizeof(state->status);
-@@ -1384,11 +1384,11 @@ save_part(struct state *state, int all)
- 			else
- 				decode_base64(&d, &p, ep);
- 			break;
--#ifdef ZLIB
-+#ifdef USE_ZLIB
- 		case FDB_ENC_GZ64:
- 			decode_gzip64(&d, &p, ep);
- 			break;
--#endif /* ZLIB */
-+#endif /* USE_ZLIB */
- 		default:
- 			fwrite(CP(&fdb->buf_body), CL(&fdb->buf_body), 1, fp);
- 			break;
diff --git a/mail/cue/patches/patch-ag b/mail/cue/patches/patch-ag
deleted file mode 100644
index 8308fb3593d..00000000000
--- a/mail/cue/patches/patch-ag
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/12/15 13:11:18 taca Exp $
-
-* Change CANNA to USE_CANNA.
-
---- edit.c.orig	2008-12-18 13:41:32.000000000 +0900
-+++ edit.c
-@@ -31,16 +31,16 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#ifdef CANNA
-+#ifdef USE_CANNA
- #include <canna/jrkanji.h>
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 
- #include "cue.h"
- 
--#ifdef CANNA
-+#ifdef USE_CANNA
- static char *cannamode;
- static int cannamodelen = -1;
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 
- struct edit_state {
- 	struct state *state;
-@@ -56,11 +56,11 @@ struct edit_state {
- 	int	complistent;
- 	int	complistsize;
- 	struct	abuf abuf;
--#ifdef CANNA
-+#ifdef USE_CANNA
- 	int	canna;
- 	jrKanjiStatus ks;
- 	char	cannabuf[CHARBLOCK];
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- };
- 
- static void
-@@ -89,10 +89,10 @@ edit_update(struct edit_state *e)
- 		break;
- 	}
- 	move(LINES - 1, 0);
--#ifdef CANNA_XXX
-+#ifdef USE_CANNA_XXX
- 	if (e->canna)
- 		addstr(cannamode);
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 	msglen = strlen(e->state->status);
- 	getyx(stdscr, y, x);
- 	width = COLS - x - 1;
-@@ -127,7 +127,7 @@ edit_update(struct edit_state *e)
- 	clrtoeol();
- 	x += e->pos - off;
- 	move(y, x);
--#ifdef CANNA
-+#ifdef USE_CANNA
- 	if (e->canna && e->ks.length) {
- 		/* XXX: e->ks.length -> width (hankana) */
- 		if (x + (2 + e->ks.length) > COLS) {
-@@ -152,7 +152,7 @@ edit_update(struct edit_state *e)
- 			addnstr(p, e->ks.length - (e->ks.revPos + e->ks.revLen));
- 		addstr("|\b");
- 	}
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- }
- 
- static void
-@@ -267,9 +267,9 @@ static int
- edit_control(struct edit_state *e, int ch)
- {
- 	int i;
--#ifdef CANNA
-+#ifdef USE_CANNA
- 	jrKanjiStatusWithValue ksv;
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 
- 	switch (ch) {
- 	/* refresh */
-@@ -355,7 +355,7 @@ edit_control(struct edit_state *e, int c
- 		}
- 		e->len = e->pos;
- 		break;
--#ifdef CANNA
-+#ifdef USE_CANNA
- 	case CTRL('o'):
- 		if (e->canna) {
- 			e->canna = 0;
-@@ -380,7 +380,7 @@ edit_control(struct edit_state *e, int c
- 		jrKanjiControl(0, KC_SETMODEINFOSTYLE, 0);
- 		jrKanjiControl(0, KC_QUERYMODE, cannamode);
- 		break;
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 	default:
- 		return 0;
- 	}
-@@ -426,7 +426,7 @@ edit_stline(struct state *state, char *b
- 		inp = inbuf;
- 		inp[0] = ch;
- 		inp[1] = '\0';
--#ifdef CANNA
-+#ifdef USE_CANNA
- 		if (e->canna) {
- 			i = jrKanjiString(0, ch, e->cannabuf, e->size - e->len,
- 					  &e->ks);
-@@ -446,7 +446,7 @@ edit_stline(struct state *state, char *b
- 			e->cannabuf[i] = '\0';
- 			inp = (u_char *)e->cannabuf;
- 		}
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 		while ((ch = *inp) != '\0') {
- 			switch (ch) {
- 			case CTRL('g'):
diff --git a/mail/cue/patches/patch-ah b/mail/cue/patches/patch-ah
deleted file mode 100644
index 309911d0a27..00000000000
--- a/mail/cue/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/12/15 13:11:18 taca Exp $
-
-* Change SSL to USE_SSL.
-
---- popxmit.c.orig	2003-05-17 05:17:45.000000000 +0900
-+++ popxmit.c
-@@ -40,7 +40,7 @@
- #include <string.h>
- #include <unistd.h>
- 
--#ifdef SSL	/*XXX*/
-+#ifdef USE_SSL	/*XXX*/
- #define	APOP
- #endif
- 
diff --git a/mail/cue/patches/patch-ai b/mail/cue/patches/patch-ai
deleted file mode 100644
index 5a97b8d0784..00000000000
--- a/mail/cue/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2009/12/15 13:11:18 taca Exp $
-
-* Change CANNA to USE_CANNA.
-
---- search.c.orig	2005-04-22 22:41:09.000000000 +0900
-+++ search.c
-@@ -157,11 +157,11 @@ isearch(struct state *state, struct file
- 		cangetch(-1);
- 		ch = getch();
- 		switch (ch) {
--#ifdef CANNA
-+#ifdef USE_CANNA
- 		case CTRL('o'):
- 			ungetch(ch);
- 			/*FALLTHRU*/
--#endif /* CANNA */
-+#endif /* USE_CANNA */
- 		case '\033':
- 			snprintf(status, ep - status, "Search%s: ",
- 				(dir < 0 ? " backward" : ""));
diff --git a/mail/cue/patches/patch-configure.in b/mail/cue/patches/patch-configure.in
new file mode 100644
index 00000000000..29d4369bfc3
--- /dev/null
+++ b/mail/cue/patches/patch-configure.in
@@ -0,0 +1,51 @@
+$NetBSD: patch-configure.in,v 1.1 2011/11/27 13:05:33 obache Exp $
+
+* Prevent extra -O from being added to optimizer flags.
+* Assume that DragonFly's getaddrinfo works.
+* Fix an error with --enable-ipv6.
+
+--- configure.in.orig	2009-12-16 05:51:12.000000000 +0000
++++ configure.in
+@@ -35,7 +35,7 @@ netbsd*)
+ 	;;
+ esac
+ 
+-OPTS="-O"
++OPTS=""
+ CFLAGS=""
+ 
+ # AC_PREFIX_PKG(VARIABLE, HEADER, LIBRARY, PATH [, IF-TRUE [, IF FALSE ] ])
+@@ -98,7 +98,7 @@ AC_ARG_ENABLE(ipv6,
+        ;;
+   esac ],
+ 
+-  AC_TRY_RUN([ /* AF_INET6 avalable check */
++[ AC_TRY_RUN([ /* AF_INET6 avalable check */
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ main()
+@@ -117,7 +117,7 @@ main()
+   ipv6=no,
+   AC_MSG_RESULT(no)
+   ipv6=no
+-))
++)])
+ 
+ ipv6type=unknown
+ ipv6lib=none
+@@ -319,6 +319,7 @@ buggygetaddrinfo=yes,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes)
+ 
++if test ${OPSYS} != "DragonFly"; then
+ if test "$buggygetaddrinfo" = "yes"; then
+ 	if test "$ipv6" = "yes"; then
+ 		echo 'Fatal: You must get working getaddrinfo() function.'
+@@ -326,6 +327,7 @@ if test "$buggygetaddrinfo" = "yes"; the
+ 		exit 1
+ 	fi
+ fi
++fi
+ 
+ # IDEA
+ AC_MSG_CHECKING(if --enable-idea option is specified)