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, 75 insertions, 10 deletions

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@