aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/cyrus-imapd22/Makefile13
-rw-r--r--mail/cyrus-imapd22/distinfo2
-rw-r--r--mail/cyrus-imapd22/files/extra-patch-aclocal.m410
-rw-r--r--mail/cyrus-imapd22/files/patch-ac20
-rw-r--r--mail/cyrus-imapd22/pkg-plist1
-rw-r--r--mail/cyrus-imapd23/Makefile13
-rw-r--r--mail/cyrus-imapd23/distinfo2
-rw-r--r--mail/cyrus-imapd23/files/extra-patch-aclocal.m410
-rw-r--r--mail/cyrus-imapd23/files/patch-ac20
-rw-r--r--mail/cyrus-imapd23/pkg-plist1
-rw-r--r--mail/cyrus-imapd24/Makefile13
-rw-r--r--mail/cyrus-imapd24/distinfo2
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-aclocal.m410
-rw-r--r--mail/cyrus-imapd24/files/patch-ac20
-rw-r--r--mail/cyrus-imapd24/pkg-plist1
15 files changed, 75 insertions, 63 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 9ae82e1bdbef..9f125500b5ca 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= cyrus-imapd
-PORTVERSION= 2.2.1.b
-PORTREVISION= 2
+PORTVERSION= 2.2.2.b
+#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME= ${PORTNAME}-2.2.1-BETA
+DISTNAME= ${PORTNAME}-2.2.2-BETA
MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -88,8 +88,11 @@ CONFIGURE_ARGS+=--enable-netscapehack
.endif
.if defined(WITH_DRAC)
-EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch \
- ${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4
+BROKEN= currently not supported due to lack of acconfig.h
+EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
+#EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-acconfig.h \
+ ${FILESDIR}/extra-patch-aclocal.m4
USE_AUTOHEADER= YES
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index 356c01f86e3b..f2179e3ff99a 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-2.2.1-BETA.tar.gz) = ea318280ae375065aa21c4c1ace322f4
+MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c
diff --git a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
index f98457a9d553..69be3bdc61b9 100644
--- a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
@@ -1,8 +1,8 @@
Index: aclocal.m4
diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig Thu Jul 17 06:20:37 2003
-+++ aclocal.m4 Fri Jul 18 00:58:34 2003
-@@ -489,7 +489,7 @@
+--- aclocal.m4.orig Wed Oct 29 02:24:46 2003
++++ aclocal.m4 Wed Oct 29 04:28:37 2003
+@@ -505,7 +505,7 @@
BDB_LIBADD=""
fi
@@ -11,10 +11,10 @@ diff -u aclocal.m4.orig aclocal.m4
do
AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
dblib="berkeley"; break, dblib="no")
-@@ -1629,7 +1629,7 @@
+@@ -1664,7 +1664,7 @@
LIB_UCDSNMP=""
if test "$with_ucdsnmp" != no; then
- AC_DEFINE(HAVE_UCDSNMP)
+ AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
AC_CHECK_LIB(rpm, rpmdbOpen,
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
index 9ba6504c36c8..bf700856699a 100644
--- a/mail/cyrus-imapd22/files/patch-ac
+++ b/mail/cyrus-imapd22/files/patch-ac
@@ -1,22 +1,22 @@
Index: configure
diff -u configure.orig configure
---- configure.orig Thu Jul 17 06:20:38 2003
-+++ configure Fri Jul 18 00:32:33 2003
-@@ -3116,7 +3116,7 @@
+--- configure.orig Wed Oct 29 02:24:50 2003
++++ configure Wed Oct 29 03:52:02 2003
+@@ -6811,7 +6811,7 @@
BDB_LIBADD=""
fi
- for dbname in 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
+ 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:3123: checking for db_create in -l$dbname" >&5
-@@ -7475,7 +7475,7 @@
+ as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -13851,7 +13851,7 @@
#define HAVE_UCDSNMP 1
- EOF
+ _ACEOF
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
- echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:7481: checking for rpmdbOpen in -lrpm" >&5
- ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
+ 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
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index 430c67e0260c..f6ed20273e98 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -1,3 +1,4 @@
+bin/arbitron
bin/cyradm
bin/imtest
bin/installsieve
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 9ae82e1bdbef..9f125500b5ca 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= cyrus-imapd
-PORTVERSION= 2.2.1.b
-PORTREVISION= 2
+PORTVERSION= 2.2.2.b
+#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME= ${PORTNAME}-2.2.1-BETA
+DISTNAME= ${PORTNAME}-2.2.2-BETA
MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -88,8 +88,11 @@ CONFIGURE_ARGS+=--enable-netscapehack
.endif
.if defined(WITH_DRAC)
-EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch \
- ${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4
+BROKEN= currently not supported due to lack of acconfig.h
+EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
+#EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-acconfig.h \
+ ${FILESDIR}/extra-patch-aclocal.m4
USE_AUTOHEADER= YES
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index 356c01f86e3b..f2179e3ff99a 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-2.2.1-BETA.tar.gz) = ea318280ae375065aa21c4c1ace322f4
+MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c
diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
index f98457a9d553..69be3bdc61b9 100644
--- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
@@ -1,8 +1,8 @@
Index: aclocal.m4
diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig Thu Jul 17 06:20:37 2003
-+++ aclocal.m4 Fri Jul 18 00:58:34 2003
-@@ -489,7 +489,7 @@
+--- aclocal.m4.orig Wed Oct 29 02:24:46 2003
++++ aclocal.m4 Wed Oct 29 04:28:37 2003
+@@ -505,7 +505,7 @@
BDB_LIBADD=""
fi
@@ -11,10 +11,10 @@ diff -u aclocal.m4.orig aclocal.m4
do
AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
dblib="berkeley"; break, dblib="no")
-@@ -1629,7 +1629,7 @@
+@@ -1664,7 +1664,7 @@
LIB_UCDSNMP=""
if test "$with_ucdsnmp" != no; then
- AC_DEFINE(HAVE_UCDSNMP)
+ AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
AC_CHECK_LIB(rpm, rpmdbOpen,
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
index 9ba6504c36c8..bf700856699a 100644
--- a/mail/cyrus-imapd23/files/patch-ac
+++ b/mail/cyrus-imapd23/files/patch-ac
@@ -1,22 +1,22 @@
Index: configure
diff -u configure.orig configure
---- configure.orig Thu Jul 17 06:20:38 2003
-+++ configure Fri Jul 18 00:32:33 2003
-@@ -3116,7 +3116,7 @@
+--- configure.orig Wed Oct 29 02:24:50 2003
++++ configure Wed Oct 29 03:52:02 2003
+@@ -6811,7 +6811,7 @@
BDB_LIBADD=""
fi
- for dbname in 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
+ 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:3123: checking for db_create in -l$dbname" >&5
-@@ -7475,7 +7475,7 @@
+ as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -13851,7 +13851,7 @@
#define HAVE_UCDSNMP 1
- EOF
+ _ACEOF
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
- echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:7481: checking for rpmdbOpen in -lrpm" >&5
- ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
+ 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
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 430c67e0260c..f6ed20273e98 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -1,3 +1,4 @@
+bin/arbitron
bin/cyradm
bin/imtest
bin/installsieve
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 9ae82e1bdbef..9f125500b5ca 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= cyrus-imapd
-PORTVERSION= 2.2.1.b
-PORTREVISION= 2
+PORTVERSION= 2.2.2.b
+#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME= ${PORTNAME}-2.2.1-BETA
+DISTNAME= ${PORTNAME}-2.2.2-BETA
MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -88,8 +88,11 @@ CONFIGURE_ARGS+=--enable-netscapehack
.endif
.if defined(WITH_DRAC)
-EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch \
- ${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4
+BROKEN= currently not supported due to lack of acconfig.h
+EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
+#EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-acconfig.h \
+ ${FILESDIR}/extra-patch-aclocal.m4
USE_AUTOHEADER= YES
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 356c01f86e3b..f2179e3ff99a 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-2.2.1-BETA.tar.gz) = ea318280ae375065aa21c4c1ace322f4
+MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
index f98457a9d553..69be3bdc61b9 100644
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
@@ -1,8 +1,8 @@
Index: aclocal.m4
diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig Thu Jul 17 06:20:37 2003
-+++ aclocal.m4 Fri Jul 18 00:58:34 2003
-@@ -489,7 +489,7 @@
+--- aclocal.m4.orig Wed Oct 29 02:24:46 2003
++++ aclocal.m4 Wed Oct 29 04:28:37 2003
+@@ -505,7 +505,7 @@
BDB_LIBADD=""
fi
@@ -11,10 +11,10 @@ diff -u aclocal.m4.orig aclocal.m4
do
AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
dblib="berkeley"; break, dblib="no")
-@@ -1629,7 +1629,7 @@
+@@ -1664,7 +1664,7 @@
LIB_UCDSNMP=""
if test "$with_ucdsnmp" != no; then
- AC_DEFINE(HAVE_UCDSNMP)
+ AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
AC_CHECK_LIB(rpm, rpmdbOpen,
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index 9ba6504c36c8..bf700856699a 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,22 +1,22 @@
Index: configure
diff -u configure.orig configure
---- configure.orig Thu Jul 17 06:20:38 2003
-+++ configure Fri Jul 18 00:32:33 2003
-@@ -3116,7 +3116,7 @@
+--- configure.orig Wed Oct 29 02:24:50 2003
++++ configure Wed Oct 29 03:52:02 2003
+@@ -6811,7 +6811,7 @@
BDB_LIBADD=""
fi
- for dbname in 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
+ 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:3123: checking for db_create in -l$dbname" >&5
-@@ -7475,7 +7475,7 @@
+ as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -13851,7 +13851,7 @@
#define HAVE_UCDSNMP 1
- EOF
+ _ACEOF
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
- echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:7481: checking for rpmdbOpen in -lrpm" >&5
- ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
+ 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
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 430c67e0260c..f6ed20273e98 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -1,3 +1,4 @@
+bin/arbitron
bin/cyradm
bin/imtest
bin/installsieve
generated by cgit (git 2.34.1) at 2024-12-01 13:33:37 +0800