make it buildable on ia64 and amd64.

(since I don't have ia64 nor amd64, I tested at least it doesn't
break on i386.)

Obtained from:	NetBSD

30 files changed, 405 insertions, 32 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index c71a6251be03..1cb6a8fee638 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -69,10 +69,6 @@ HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
-.endif
-
 post-patch:
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			${WRKSRC}/tools/mkimap
diff --git a/mail/cyrus-imapd/files/patch-ac b/mail/cyrus-imapd/files/patch-ac
index 630aaec33cc9..e3f73dd1f2d8 100644
--- a/mail/cyrus-imapd/files/patch-ac
+++ b/mail/cyrus-imapd/files/patch-ac
@@ -1,8 +1,17 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Thu Dec 21 06:39:31 2000
-+++ configure	Thu Jan  4 23:22:47 2001
-@@ -4178,7 +4178,7 @@
+--- configure.orig	Mon Mar  8 02:25:08 2004
++++ configure	Mon Mar  8 02:26:39 2004
+@@ -2286,6 +2286,8 @@
+ else
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -4187,7 +4189,7 @@
  	cmu_saved_LIBS=$LIBS
  	if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
@@ -11,3 +20,11 @@ diff -u configure.orig configure
  
  	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
  	  LIB_SASL="-L$ac_cv_sasl_where_lib"
+@@ -5300,6 +5302,7 @@
+ s%@LEX@%$LEX%g
+ s%@LEXLIB@%$LEXLIB%g
+ s%@PERL@%$PERL%g
++s%@PERL_CCCDLFLAGS@%$PERL_CCCDLFLAGS%g
+ s%@WITH_NONBLOCK@%$WITH_NONBLOCK%g
+ s%@WITH_GMTOFF@%$WITH_GMTOFF%g
+ s%@WITH_MAP@%$WITH_MAP%g
diff --git a/mail/cyrus-imapd/files/patch-acap::Makefile.in b/mail/cyrus-imapd/files/patch-acap::Makefile.in
new file mode 100644
index 000000000000..4015013eb362
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-acap::Makefile.in
@@ -0,0 +1,13 @@
+Index: acap/Makefile.in
+diff -u acap/Makefile.in.orig acap/Makefile.in
+--- acap/Makefile.in.orig	Mon Jul 14 00:04:56 2003
++++ acap/Makefile.in	Mon Mar  8 02:10:58 2004
+@@ -54,7 +54,7 @@
+ CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/files/patch-lib::Makefile.in b/mail/cyrus-imapd/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..8243d414d431
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: lib/Makefile.in
+diff -u lib/Makefile.in.orig lib/Makefile.in
+--- lib/Makefile.in.orig	Sun Jan  4 00:16:44 2004
++++ lib/Makefile.in	Sun Mar  7 23:44:51 2004
+@@ -60,7 +60,7 @@
+ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in
new file mode 100644
index 000000000000..28d4c44df294
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: perl/sieve/lib/Makefile.in
+diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
+--- perl/sieve/lib/Makefile.in.orig	Sun Jan  4 00:16:45 2004
++++ perl/sieve/lib/Makefile.in	Sun Mar  7 23:42:37 2004
+@@ -55,7 +55,7 @@
+ IMAP_LIBS = @IMAP_LIBS@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = -g
++CFLAGS = -g @PERL_CCCDLFLAGS@
+ LDFLAGS = -g @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/files/patch-sieve::Makefile.in b/mail/cyrus-imapd/files/patch-sieve::Makefile.in
new file mode 100644
index 000000000000..75245207c3a4
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-sieve::Makefile.in
@@ -0,0 +1,13 @@
+Index: sieve/Makefile.in
+diff -u sieve/Makefile.in.orig sieve/Makefile.in
+--- sieve/Makefile.in.orig	Sun Jul 13 23:40:05 2003
++++ sieve/Makefile.in	Mon Mar  8 01:38:00 2004
+@@ -35,7 +35,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 1c73f48e548d..2cc671dd1b7a 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -82,10 +82,6 @@ PLIST_SUB+=	MURDER="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
-.endif
-
 .if defined(WITH_SNMP)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
index 4c33c0544e12..0e94342e36bb 100644
--- a/mail/cyrus-imapd2/files/patch-ac
+++ b/mail/cyrus-imapd2/files/patch-ac
@@ -1,8 +1,8 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Tue Feb  4 16:05:15 2003
-+++ configure	Tue Feb  4 16:08:25 2003
-@@ -2760,7 +2760,7 @@
+--- configure.orig	Mon Mar  8 01:36:22 2004
++++ configure	Mon Mar  8 01:44:26 2004
+@@ -3023,7 +3023,7 @@
  	    BDB_LIBADD=""
  	fi
  
@@ -10,13 +10,30 @@ diff -u configure.orig configure
 +        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:2767: checking for db_create in -l$dbname" >&5
-@@ -6757,7 +6757,7 @@
+ echo "configure:3030: checking for db_create in -l$dbname" >&5
+@@ -6950,6 +6950,8 @@
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -7305,7 +7307,7 @@
  #define HAVE_UCDSNMP 1
  EOF
  
 -    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
 +    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
      echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:6763: checking for rpmdbOpen in -lrpm" >&5
+ echo "configure:7311: checking for rpmdbOpen in -lrpm" >&5
  ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
+@@ -7579,6 +7581,7 @@
+ s%@LIB_SASL@%$LIB_SASL%g
+ s%@SASLFLAGS@%$SASLFLAGS%g
+ s%@PERL@%$PERL%g
++s%@PERL_CCCDLFLAGS@%$PERL_CCCDLFLAGS%g
+ s%@MD5OBJ@%$MD5OBJ%g
+ s%@SNMP_SUBDIRS@%$SNMP_SUBDIRS%g
+ s%@LIB_WRAP@%$LIB_WRAP%g
diff --git a/mail/cyrus-imapd2/files/patch-acap::Makefile.in b/mail/cyrus-imapd2/files/patch-acap::Makefile.in
new file mode 100644
index 000000000000..4015013eb362
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-acap::Makefile.in
@@ -0,0 +1,13 @@
+Index: acap/Makefile.in
+diff -u acap/Makefile.in.orig acap/Makefile.in
+--- acap/Makefile.in.orig	Mon Jul 14 00:04:56 2003
++++ acap/Makefile.in	Mon Mar  8 02:10:58 2004
+@@ -54,7 +54,7 @@
+ CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd2/files/patch-lib::Makefile.in b/mail/cyrus-imapd2/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..8243d414d431
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: lib/Makefile.in
+diff -u lib/Makefile.in.orig lib/Makefile.in
+--- lib/Makefile.in.orig	Sun Jan  4 00:16:44 2004
++++ lib/Makefile.in	Sun Mar  7 23:44:51 2004
+@@ -60,7 +60,7 @@
+ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in
new file mode 100644
index 000000000000..28d4c44df294
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: perl/sieve/lib/Makefile.in
+diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
+--- perl/sieve/lib/Makefile.in.orig	Sun Jan  4 00:16:45 2004
++++ perl/sieve/lib/Makefile.in	Sun Mar  7 23:42:37 2004
+@@ -55,7 +55,7 @@
+ IMAP_LIBS = @IMAP_LIBS@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = -g
++CFLAGS = -g @PERL_CCCDLFLAGS@
+ LDFLAGS = -g @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd2/files/patch-sieve::Makefile.in b/mail/cyrus-imapd2/files/patch-sieve::Makefile.in
new file mode 100644
index 000000000000..75245207c3a4
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-sieve::Makefile.in
@@ -0,0 +1,13 @@
+Index: sieve/Makefile.in
+diff -u sieve/Makefile.in.orig sieve/Makefile.in
+--- sieve/Makefile.in.orig	Sun Jul 13 23:40:05 2003
++++ sieve/Makefile.in	Mon Mar  8 01:38:00 2004
+@@ -35,7 +35,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 0ec600913970..5047e1e8d5f9 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -105,7 +105,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
+		${FILESDIR}/extra-patch-configure.in
 USE_AUTOHEADER=	YES
 USE_AUTOCONF=	YES
 WANT_AUTOCONF_VER=257
diff --git a/mail/cyrus-imapd22/files/extra-patch-configure.in b/mail/cyrus-imapd22/files/extra-patch-configure.in
new file mode 100644
index 000000000000..974d0c83fddb
--- /dev/null
+++ b/mail/cyrus-imapd22/files/extra-patch-configure.in
@@ -0,0 +1,21 @@
+Index: configure.in
+diff -u configure.in.orig configure.in
+--- configure.in.orig	Wed Jan  7 07:08:07 2004
++++ configure.in	Sun Mar  7 23:53:03 2004
+@@ -925,6 +925,8 @@
+ dnl and compile perl/cyradm
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ dnl for timsieved
+@@ -999,6 +1001,7 @@
+ AC_SUBST(PERL_SUBDIRS)
+ AC_SUBST(PERL_DEPSUBDIRS)
+ AC_SUBST(PERL)
++AC_SUBST(PERL_CCCDLFLAGS)
+ 
+ AH_TOP([
+ /* $Id: configure.in,v 1.277 2004/01/06 22:08:07 rjs3 Exp $ */
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
index d33f3b7b0e55..a557cd828ee1 100644
--- a/mail/cyrus-imapd22/files/patch-ac
+++ b/mail/cyrus-imapd22/files/patch-ac
@@ -1,7 +1,16 @@
 Index: configure
 diff -u configure.orig configure
 --- configure.orig	Thu Jan 15 23:36:50 2004
-+++ configure	Sat Jan 17 21:11:14 2004
++++ configure	Sun Mar  7 23:46:32 2004
+@@ -308,7 +308,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
 @@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -25,7 +34,16 @@ diff -u configure.orig configure
    ;
    return 0;
  }
-@@ -13854,7 +13854,7 @@
+@@ -13187,6 +13187,8 @@
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -13854,7 +13856,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
@@ -34,3 +52,11 @@ diff -u configure.orig configure
      echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
  echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
  if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
+@@ -14660,6 +14662,7 @@
+ s,@LIB_SASL@,$LIB_SASL,;t t
+ s,@SASLFLAGS@,$SASLFLAGS,;t t
+ s,@PERL@,$PERL,;t t
++s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+ s,@MD5OBJ@,$MD5OBJ,;t t
+ s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
+ s,@LIB_WRAP@,$LIB_WRAP,;t t
diff --git a/mail/cyrus-imapd22/files/patch-lib::Makefile.in b/mail/cyrus-imapd22/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..8243d414d431
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: lib/Makefile.in
+diff -u lib/Makefile.in.orig lib/Makefile.in
+--- lib/Makefile.in.orig	Sun Jan  4 00:16:44 2004
++++ lib/Makefile.in	Sun Mar  7 23:44:51 2004
+@@ -60,7 +60,7 @@
+ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd22/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd22/files/patch-perl::sieve::lib::Makefile.in
new file mode 100644
index 000000000000..28d4c44df294
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-perl::sieve::lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: perl/sieve/lib/Makefile.in
+diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
+--- perl/sieve/lib/Makefile.in.orig	Sun Jan  4 00:16:45 2004
++++ perl/sieve/lib/Makefile.in	Sun Mar  7 23:42:37 2004
+@@ -55,7 +55,7 @@
+ IMAP_LIBS = @IMAP_LIBS@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = -g
++CFLAGS = -g @PERL_CCCDLFLAGS@
+ LDFLAGS = -g @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in b/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
index 52b3737e58bc..1462f8a955cc 100644
--- a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
@@ -1,8 +1,8 @@
 Index: sieve/Makefile.in
 diff -u sieve/Makefile.in.orig sieve/Makefile.in
 --- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
-+++ sieve/Makefile.in	Fri Feb 13 18:39:33 2004
-@@ -33,6 +33,7 @@
++++ sieve/Makefile.in	Sun Mar  7 23:40:33 2004
+@@ -33,12 +33,13 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,6 +10,13 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
 @@ -59,7 +60,7 @@
  
  install: sievec
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 0ec600913970..5047e1e8d5f9 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -105,7 +105,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
+		${FILESDIR}/extra-patch-configure.in
 USE_AUTOHEADER=	YES
 USE_AUTOCONF=	YES
 WANT_AUTOCONF_VER=257
diff --git a/mail/cyrus-imapd23/files/extra-patch-configure.in b/mail/cyrus-imapd23/files/extra-patch-configure.in
new file mode 100644
index 000000000000..974d0c83fddb
--- /dev/null
+++ b/mail/cyrus-imapd23/files/extra-patch-configure.in
@@ -0,0 +1,21 @@
+Index: configure.in
+diff -u configure.in.orig configure.in
+--- configure.in.orig	Wed Jan  7 07:08:07 2004
++++ configure.in	Sun Mar  7 23:53:03 2004
+@@ -925,6 +925,8 @@
+ dnl and compile perl/cyradm
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ dnl for timsieved
+@@ -999,6 +1001,7 @@
+ AC_SUBST(PERL_SUBDIRS)
+ AC_SUBST(PERL_DEPSUBDIRS)
+ AC_SUBST(PERL)
++AC_SUBST(PERL_CCCDLFLAGS)
+ 
+ AH_TOP([
+ /* $Id: configure.in,v 1.277 2004/01/06 22:08:07 rjs3 Exp $ */
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
index d33f3b7b0e55..a557cd828ee1 100644
--- a/mail/cyrus-imapd23/files/patch-ac
+++ b/mail/cyrus-imapd23/files/patch-ac
@@ -1,7 +1,16 @@
 Index: configure
 diff -u configure.orig configure
 --- configure.orig	Thu Jan 15 23:36:50 2004
-+++ configure	Sat Jan 17 21:11:14 2004
++++ configure	Sun Mar  7 23:46:32 2004
+@@ -308,7 +308,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
 @@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -25,7 +34,16 @@ diff -u configure.orig configure
    ;
    return 0;
  }
-@@ -13854,7 +13854,7 @@
+@@ -13187,6 +13187,8 @@
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -13854,7 +13856,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
@@ -34,3 +52,11 @@ diff -u configure.orig configure
      echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
  echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
  if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
+@@ -14660,6 +14662,7 @@
+ s,@LIB_SASL@,$LIB_SASL,;t t
+ s,@SASLFLAGS@,$SASLFLAGS,;t t
+ s,@PERL@,$PERL,;t t
++s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+ s,@MD5OBJ@,$MD5OBJ,;t t
+ s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
+ s,@LIB_WRAP@,$LIB_WRAP,;t t
diff --git a/mail/cyrus-imapd23/files/patch-lib::Makefile.in b/mail/cyrus-imapd23/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..8243d414d431
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: lib/Makefile.in
+diff -u lib/Makefile.in.orig lib/Makefile.in
+--- lib/Makefile.in.orig	Sun Jan  4 00:16:44 2004
++++ lib/Makefile.in	Sun Mar  7 23:44:51 2004
+@@ -60,7 +60,7 @@
+ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd23/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd23/files/patch-perl::sieve::lib::Makefile.in
new file mode 100644
index 000000000000..28d4c44df294
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-perl::sieve::lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: perl/sieve/lib/Makefile.in
+diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
+--- perl/sieve/lib/Makefile.in.orig	Sun Jan  4 00:16:45 2004
++++ perl/sieve/lib/Makefile.in	Sun Mar  7 23:42:37 2004
+@@ -55,7 +55,7 @@
+ IMAP_LIBS = @IMAP_LIBS@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = -g
++CFLAGS = -g @PERL_CCCDLFLAGS@
+ LDFLAGS = -g @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
index 52b3737e58bc..1462f8a955cc 100644
--- a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
@@ -1,8 +1,8 @@
 Index: sieve/Makefile.in
 diff -u sieve/Makefile.in.orig sieve/Makefile.in
 --- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
-+++ sieve/Makefile.in	Fri Feb 13 18:39:33 2004
-@@ -33,6 +33,7 @@
++++ sieve/Makefile.in	Sun Mar  7 23:40:33 2004
+@@ -33,12 +33,13 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,6 +10,13 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
 @@ -59,7 +60,7 @@
  
  install: sievec
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 0ec600913970..5047e1e8d5f9 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -105,7 +105,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
+		${FILESDIR}/extra-patch-configure.in
 USE_AUTOHEADER=	YES
 USE_AUTOCONF=	YES
 WANT_AUTOCONF_VER=257
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in
new file mode 100644
index 000000000000..974d0c83fddb
--- /dev/null
+++ b/mail/cyrus-imapd24/files/extra-patch-configure.in
@@ -0,0 +1,21 @@
+Index: configure.in
+diff -u configure.in.orig configure.in
+--- configure.in.orig	Wed Jan  7 07:08:07 2004
++++ configure.in	Sun Mar  7 23:53:03 2004
+@@ -925,6 +925,8 @@
+ dnl and compile perl/cyradm
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ dnl for timsieved
+@@ -999,6 +1001,7 @@
+ AC_SUBST(PERL_SUBDIRS)
+ AC_SUBST(PERL_DEPSUBDIRS)
+ AC_SUBST(PERL)
++AC_SUBST(PERL_CCCDLFLAGS)
+ 
+ AH_TOP([
+ /* $Id: configure.in,v 1.277 2004/01/06 22:08:07 rjs3 Exp $ */
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index d33f3b7b0e55..a557cd828ee1 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,7 +1,16 @@
 Index: configure
 diff -u configure.orig configure
 --- configure.orig	Thu Jan 15 23:36:50 2004
-+++ configure	Sat Jan 17 21:11:14 2004
++++ configure	Sun Mar  7 23:46:32 2004
+@@ -308,7 +308,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
 @@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -25,7 +34,16 @@ diff -u configure.orig configure
    ;
    return 0;
  }
-@@ -13854,7 +13854,7 @@
+@@ -13187,6 +13187,8 @@
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -13854,7 +13856,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
@@ -34,3 +52,11 @@ diff -u configure.orig configure
      echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
  echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
  if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
+@@ -14660,6 +14662,7 @@
+ s,@LIB_SASL@,$LIB_SASL,;t t
+ s,@SASLFLAGS@,$SASLFLAGS,;t t
+ s,@PERL@,$PERL,;t t
++s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+ s,@MD5OBJ@,$MD5OBJ,;t t
+ s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
+ s,@LIB_WRAP@,$LIB_WRAP,;t t
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..8243d414d431
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: lib/Makefile.in
+diff -u lib/Makefile.in.orig lib/Makefile.in
+--- lib/Makefile.in.orig	Sun Jan  4 00:16:44 2004
++++ lib/Makefile.in	Sun Mar  7 23:44:51 2004
+@@ -60,7 +60,7 @@
+ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in
new file mode 100644
index 000000000000..28d4c44df294
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in
@@ -0,0 +1,13 @@
+Index: perl/sieve/lib/Makefile.in
+diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
+--- perl/sieve/lib/Makefile.in.orig	Sun Jan  4 00:16:45 2004
++++ perl/sieve/lib/Makefile.in	Sun Mar  7 23:42:37 2004
+@@ -55,7 +55,7 @@
+ IMAP_LIBS = @IMAP_LIBS@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = -g
++CFLAGS = -g @PERL_CCCDLFLAGS@
+ LDFLAGS = -g @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
index 52b3737e58bc..1462f8a955cc 100644
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
@@ -1,8 +1,8 @@
 Index: sieve/Makefile.in
 diff -u sieve/Makefile.in.orig sieve/Makefile.in
 --- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
-+++ sieve/Makefile.in	Fri Feb 13 18:39:33 2004
-@@ -33,6 +33,7 @@
++++ sieve/Makefile.in	Sun Mar  7 23:40:33 2004
+@@ -33,12 +33,13 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,6 +10,13 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
 @@ -59,7 +60,7 @@
  
  install: sievec