Fixes build on DragonFly.

3 files changed, 30 insertions, 12 deletions

diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index b3d73741313..bcb4e49fda7 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2011/04/14 02:18:27 obache Exp $
+$NetBSD: distinfo,v 1.8 2011/04/14 12:23:40 obache Exp $
 
 SHA1 (cyrus-imapd-2.4.8.tar.gz) = 4dfc328aff482c9ebb4efdce4b140f69564880e8
 RMD160 (cyrus-imapd-2.4.8.tar.gz) = 72f9afbf7893b3449a1a76b7050ea6d7c9b003c9
 Size (cyrus-imapd-2.4.8.tar.gz) = 2424151 bytes
-SHA1 (patch-aa) = 68bc0f58dd6afd585dcfb1d38e4d131457cddb12
-SHA1 (patch-ab) = f4762aaf7b8b929c28d63c666e6e8ea700681974
+SHA1 (patch-aa) = 29838467af173e0ca9ff174d0ce926ca2f76ca1f
+SHA1 (patch-ab) = e685a3c3fc106135318378d020860f0a25bc1d9f
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
 SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
diff --git a/mail/cyrus-imapd24/patches/patch-aa b/mail/cyrus-imapd24/patches/patch-aa
index 48a2dc83410..e4a68fe6642 100644
--- a/mail/cyrus-imapd24/patches/patch-aa
+++ b/mail/cyrus-imapd24/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/11/30 00:45:56 obache Exp $
+$NetBSD: patch-aa,v 1.3 2011/04/14 12:23:40 obache Exp $
 
---- configure.in.orig	2010-11-29 13:28:06.000000000 +0000
+--- configure.in.orig	2011-04-13 14:35:22.000000000 +0000
 +++ configure.in
-@@ -391,7 +391,7 @@ if test "$sievedir" != "no"; then
+@@ -395,7 +395,7 @@ if test "$sievedir" != "no"; then
  	AC_CHECK_LIB(fl,main)
  
  	AC_CHECK_HEADER(pcreposix.h)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2010/11/30 00:45:56 obache Exp $
  		AC_MSG_CHECKING(for utf8 enabled pcre)
  		AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
  #ifndef REG_UTF8
-@@ -401,13 +401,13 @@ if test "$sievedir" != "no"; then
+@@ -405,13 +405,13 @@ if test "$sievedir" != "no"; then
  	else
  		cyrus_cv_pcre_utf8="no"
  	fi
@@ -27,3 +27,12 @@ $NetBSD: patch-aa,v 1.2 2010/11/30 00:45:56 obache Exp $
  			LIBS="$LIBS -lrx"
  			AC_DEFINE(ENABLE_REGEX, [],
  				  [Do we have a regex library?])
+@@ -1161,7 +1161,7 @@ dnl add perl cccdlflags when building li
+ dnl libraries will be compiled as PIC if perl requires PIC objects
+ dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --
+     case "${target_os}" in
+-        linux*|netbsd*)
++        linux*|netbsd*|dragonfly*)
+             AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
+             eval `${PERL} -V:cccdlflags`
+             PERL_CCCDLFLAGS="$cccdlflags"
diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab
index e61b12d517b..0511d9f6df5 100644
--- a/mail/cyrus-imapd24/patches/patch-ab
+++ b/mail/cyrus-imapd24/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2010/11/30 00:45:56 obache Exp $
+$NetBSD: patch-ab,v 1.3 2011/04/14 12:23:40 obache Exp $
 
---- configure.orig	2010-11-29 13:29:23.000000000 +0000
+--- configure.orig	2011-04-13 14:53:15.000000000 +0000
 +++ configure
-@@ -7156,7 +7156,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
+@@ -7179,7 +7179,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
  fi
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2010/11/30 00:45:56 obache Exp $
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 enabled pcre" >&5
  $as_echo_n "checking for utf8 enabled pcre... " >&6; }
  		if test "${cyrus_cv_pcre_utf8+set}" = set; then :
-@@ -7182,7 +7182,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
+@@ -7205,7 +7205,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
  	else
  		cyrus_cv_pcre_utf8="no"
  	fi
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2010/11/30 00:45:56 obache Exp $
  		LIBS="$LIBS -lpcre -lpcreposix";
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-@@ -7203,7 +7203,7 @@ fi
+@@ -7226,7 +7226,7 @@ fi
  
  done
  
@@ -29,3 +29,12 @@ $NetBSD: patch-ab,v 1.2 2010/11/30 00:45:56 obache Exp $
  			LIBS="$LIBS -lrx"
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
+@@ -10469,7 +10469,7 @@ elif test "${with_perl}" != "no"; then
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
+     case "${target_os}" in
+-        linux*|netbsd*)
++        linux*|netbsd*|dragonfly*)
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
+ $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
+             eval `${PERL} -V:cccdlflags`