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

6 files changed, 72 insertions, 7 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@