mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00
Code Issues Releases Activity

Update to 2.2.5.

Browse Source
This commit is contained in:
Hajimu UMEMOTO 2004-05-28 20:34:49 +00:00
parent 2486e13c77
commit 9554ae5db2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=110243
24 changed files with 111 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/cyrus-imapd22/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.4
PORTVERSION= 2.2.5
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -112,9 +112,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.if defined(WITH_SNMP)
LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
.else
CONFIGURE_ARGS+=--with-ucdsnmp=no
CONFIGURE_ARGS+=--with-snmp=no
.endif
CYRUS_USER?= cyrus

4
mail/cyrus-imapd22/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cyrus-imapd-2.2.4.tar.gz) = 50831a41ba0121754431e8507887d511
SIZE (cyrus-imapd-2.2.4.tar.gz) = 1927519
MD5 (cyrus-imapd-2.2.5.tar.gz) = ad8e3ca17b04a38c934f8c7a80c8adec
SIZE (cyrus-imapd-2.2.5.tar.gz) = 1931138

20
mail/cyrus-imapd22/files/extra-patch-aclocal.m4
View File

@ -1,7 +1,7 @@
Index: aclocal.m4
diff -u aclocal.m4.orig aclocal.m4
--- aclocal.m4.orig Thu Jan 15 23:36:46 2004
+++ aclocal.m4 Sat Jan 17 22:58:54 2004
--- aclocal.m4.orig Sat May 29 03:08:14 2004
+++ aclocal.m4 Sat May 29 04:57:43 2004
@@ -505,7 +505,7 @@
BDB_LIBADD=""
fi
@ -20,12 +20,12 @@ diff -u aclocal.m4.orig aclocal.m4
dblib="no")
CPPFLAGS=$cmu_save_CPPFLAGS
@@ -1786,7 +1786,7 @@
LIB_UCDSNMP=""
if test "$with_ucdsnmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
AC_CHECK_LIB(rpm, rpmdbOpen,
@@ -1834,7 +1834,7 @@
LIB_UCDSNMP=""
if test "$with_snmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
AC_CHECK_LIB(rpm, rpmdbOpen,
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
fi
fi

26
mail/cyrus-imapd22/files/extra-patch-configure.in
View File

@ -1,21 +1,13 @@
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}"
--- configure.in.orig Sat May 29 04:59:21 2004
+++ configure.in Sat May 29 05:03:04 2004
@@ -933,7 +933,7 @@
dnl add perl cccdlflags when building libraries -- this ensures that the
dnl libraries will be compiled as PIC if perl requires PIC objects
dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
-dnl eval `${PERL} -V:cccdlflags`
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
PERL_CCCDLFLAGS="$cccdlflags"
AC_SUBST(PERL_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 $ */

36
mail/cyrus-imapd22/files/patch-ac
View File

@ -1,16 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig Mon May 17 06:05:03 2004
+++ configure Wed May 19 00:29:21 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_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_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.
--- configure.orig Sat May 29 03:08:17 2004
+++ configure Sat May 29 04:38:20 2004
@@ -6551,7 +6551,7 @@
BDB_LIBADD=""
fi
@ -34,29 +25,20 @@ diff -u configure.orig configure
;
return 0;
}
@@ -13183,6 +13183,8 @@
@@ -13502,6 +13502,7 @@
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
PERL="${with_perl}"
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
fi
PERL_CCCDLFLAGS="$cccdlflags"
if test "$sievedir" != "no"; then
@@ -13850,7 +13852,7 @@
fi
@@ -14251,7 +14252,7 @@
#define HAVE_UCDSNMP 1
_ACEOF
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
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
@@ -14657,6 +14659,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

9
mail/cyrus-imapd22/files/patch-lib::Makefile.in
View File

@ -2,15 +2,6 @@ Index: lib/Makefile.in
diff -u lib/Makefile.in.orig lib/Makefile.in
--- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004
+++ lib/Makefile.in Wed May 19 00:34:19 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
@@ -102,7 +102,7 @@
all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a

13
mail/cyrus-imapd22/files/patch-perl::sieve::lib::Makefile.in
View File

@ -1,13 +0,0 @@
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

15
mail/cyrus-imapd22/files/patch-sieve::Makefile.in
View File

@ -1,8 +1,8 @@
Index: sieve/Makefile.in
diff -u sieve/Makefile.in.orig sieve/Makefile.in
--- sieve/Makefile.in.orig Fri Mar 12 00:25:35 2004
+++ sieve/Makefile.in Wed May 19 00:38:00 2004
@@ -33,12 +33,13 @@
--- sieve/Makefile.in.orig Sat May 29 03:03:09 2004
+++ sieve/Makefile.in Sat May 29 04:53:11 2004
@@ -34,6 +34,7 @@
YACC = @YACC@
YFLAGS = -d
LEX = @LEX@
@ -10,14 +10,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
RANLIB = @RANLIB@
COMPILE_ET = @COMPILE_ET@
DEFS = @DEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
LDFLAGS = @LDFLAGS@
MAKEDEPEND = @MAKEDEPEND@
@@ -58,8 +59,8 @@
@@ -60,8 +61,8 @@
dist: $(BUILT_SOURCES)
install: sievec

6
mail/cyrus-imapd23/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.4
PORTVERSION= 2.2.5
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -112,9 +112,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.if defined(WITH_SNMP)
LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
.else
CONFIGURE_ARGS+=--with-ucdsnmp=no
CONFIGURE_ARGS+=--with-snmp=no
.endif
CYRUS_USER?= cyrus

4
mail/cyrus-imapd23/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cyrus-imapd-2.2.4.tar.gz) = 50831a41ba0121754431e8507887d511
SIZE (cyrus-imapd-2.2.4.tar.gz) = 1927519
MD5 (cyrus-imapd-2.2.5.tar.gz) = ad8e3ca17b04a38c934f8c7a80c8adec
SIZE (cyrus-imapd-2.2.5.tar.gz) = 1931138

20
mail/cyrus-imapd23/files/extra-patch-aclocal.m4
View File

@ -1,7 +1,7 @@
Index: aclocal.m4
diff -u aclocal.m4.orig aclocal.m4
--- aclocal.m4.orig Thu Jan 15 23:36:46 2004
+++ aclocal.m4 Sat Jan 17 22:58:54 2004
--- aclocal.m4.orig Sat May 29 03:08:14 2004
+++ aclocal.m4 Sat May 29 04:57:43 2004
@@ -505,7 +505,7 @@
BDB_LIBADD=""
fi
@ -20,12 +20,12 @@ diff -u aclocal.m4.orig aclocal.m4
dblib="no")
CPPFLAGS=$cmu_save_CPPFLAGS
@@ -1786,7 +1786,7 @@
LIB_UCDSNMP=""
if test "$with_ucdsnmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
AC_CHECK_LIB(rpm, rpmdbOpen,
@@ -1834,7 +1834,7 @@
LIB_UCDSNMP=""
if test "$with_snmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
AC_CHECK_LIB(rpm, rpmdbOpen,
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
fi
fi

26
mail/cyrus-imapd23/files/extra-patch-configure.in
View File

@ -1,21 +1,13 @@
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}"
--- configure.in.orig Sat May 29 04:59:21 2004
+++ configure.in Sat May 29 05:03:04 2004
@@ -933,7 +933,7 @@
dnl add perl cccdlflags when building libraries -- this ensures that the
dnl libraries will be compiled as PIC if perl requires PIC objects
dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
-dnl eval `${PERL} -V:cccdlflags`
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
PERL_CCCDLFLAGS="$cccdlflags"
AC_SUBST(PERL_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 $ */

36
mail/cyrus-imapd23/files/patch-ac
View File

@ -1,16 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig Mon May 17 06:05:03 2004
+++ configure Wed May 19 00:29:21 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_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_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.
--- configure.orig Sat May 29 03:08:17 2004
+++ configure Sat May 29 04:38:20 2004
@@ -6551,7 +6551,7 @@
BDB_LIBADD=""
fi
@ -34,29 +25,20 @@ diff -u configure.orig configure
;
return 0;
}
@@ -13183,6 +13183,8 @@
@@ -13502,6 +13502,7 @@
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
PERL="${with_perl}"
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
fi
PERL_CCCDLFLAGS="$cccdlflags"
if test "$sievedir" != "no"; then
@@ -13850,7 +13852,7 @@
fi
@@ -14251,7 +14252,7 @@
#define HAVE_UCDSNMP 1
_ACEOF
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
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
@@ -14657,6 +14659,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

9
mail/cyrus-imapd23/files/patch-lib::Makefile.in
View File

@ -2,15 +2,6 @@ Index: lib/Makefile.in
diff -u lib/Makefile.in.orig lib/Makefile.in
--- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004
+++ lib/Makefile.in Wed May 19 00:34:19 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
@@ -102,7 +102,7 @@
all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a

13
mail/cyrus-imapd23/files/patch-perl::sieve::lib::Makefile.in
View File

@ -1,13 +0,0 @@
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

15
mail/cyrus-imapd23/files/patch-sieve::Makefile.in
View File

@ -1,8 +1,8 @@
Index: sieve/Makefile.in
diff -u sieve/Makefile.in.orig sieve/Makefile.in
--- sieve/Makefile.in.orig Fri Mar 12 00:25:35 2004
+++ sieve/Makefile.in Wed May 19 00:38:00 2004
@@ -33,12 +33,13 @@
--- sieve/Makefile.in.orig Sat May 29 03:03:09 2004
+++ sieve/Makefile.in Sat May 29 04:53:11 2004
@@ -34,6 +34,7 @@
YACC = @YACC@
YFLAGS = -d
LEX = @LEX@
@ -10,14 +10,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
RANLIB = @RANLIB@
COMPILE_ET = @COMPILE_ET@
DEFS = @DEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
LDFLAGS = @LDFLAGS@
MAKEDEPEND = @MAKEDEPEND@
@@ -58,8 +59,8 @@
@@ -60,8 +61,8 @@
dist: $(BUILT_SOURCES)
install: sievec

6
mail/cyrus-imapd24/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.4
PORTVERSION= 2.2.5
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -112,9 +112,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.if defined(WITH_SNMP)
LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
.else
CONFIGURE_ARGS+=--with-ucdsnmp=no
CONFIGURE_ARGS+=--with-snmp=no
.endif
CYRUS_USER?= cyrus

4
mail/cyrus-imapd24/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cyrus-imapd-2.2.4.tar.gz) = 50831a41ba0121754431e8507887d511
SIZE (cyrus-imapd-2.2.4.tar.gz) = 1927519
MD5 (cyrus-imapd-2.2.5.tar.gz) = ad8e3ca17b04a38c934f8c7a80c8adec
SIZE (cyrus-imapd-2.2.5.tar.gz) = 1931138

20
mail/cyrus-imapd24/files/extra-patch-aclocal.m4
View File

@ -1,7 +1,7 @@
Index: aclocal.m4
diff -u aclocal.m4.orig aclocal.m4
--- aclocal.m4.orig Thu Jan 15 23:36:46 2004
+++ aclocal.m4 Sat Jan 17 22:58:54 2004
--- aclocal.m4.orig Sat May 29 03:08:14 2004
+++ aclocal.m4 Sat May 29 04:57:43 2004
@@ -505,7 +505,7 @@
BDB_LIBADD=""
fi
@ -20,12 +20,12 @@ diff -u aclocal.m4.orig aclocal.m4
dblib="no")
CPPFLAGS=$cmu_save_CPPFLAGS
@@ -1786,7 +1786,7 @@
LIB_UCDSNMP=""
if test "$with_ucdsnmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
AC_CHECK_LIB(rpm, rpmdbOpen,
@@ -1834,7 +1834,7 @@
LIB_UCDSNMP=""
if test "$with_snmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
AC_CHECK_LIB(rpm, rpmdbOpen,
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
fi
fi

26
mail/cyrus-imapd24/files/extra-patch-configure.in
View File

@ -1,21 +1,13 @@
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}"
--- configure.in.orig Sat May 29 04:59:21 2004
+++ configure.in Sat May 29 05:03:04 2004
@@ -933,7 +933,7 @@
dnl add perl cccdlflags when building libraries -- this ensures that the
dnl libraries will be compiled as PIC if perl requires PIC objects
dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
-dnl eval `${PERL} -V:cccdlflags`
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
PERL_CCCDLFLAGS="$cccdlflags"
AC_SUBST(PERL_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 $ */

36
mail/cyrus-imapd24/files/patch-ac
View File

@ -1,16 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig Mon May 17 06:05:03 2004
+++ configure Wed May 19 00:29:21 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_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_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.
--- configure.orig Sat May 29 03:08:17 2004
+++ configure Sat May 29 04:38:20 2004
@@ -6551,7 +6551,7 @@
BDB_LIBADD=""
fi
@ -34,29 +25,20 @@ diff -u configure.orig configure
;
return 0;
}
@@ -13183,6 +13183,8 @@
@@ -13502,6 +13502,7 @@
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
PERL="${with_perl}"
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
fi
PERL_CCCDLFLAGS="$cccdlflags"
if test "$sievedir" != "no"; then
@@ -13850,7 +13852,7 @@
fi
@@ -14251,7 +14252,7 @@
#define HAVE_UCDSNMP 1
_ACEOF
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
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
@@ -14657,6 +14659,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

9
mail/cyrus-imapd24/files/patch-lib::Makefile.in
View File

@ -2,15 +2,6 @@ Index: lib/Makefile.in
diff -u lib/Makefile.in.orig lib/Makefile.in
--- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004
+++ lib/Makefile.in Wed May 19 00:34:19 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
@@ -102,7 +102,7 @@
all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a

13
mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in
View File

@ -1,13 +0,0 @@
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

15
mail/cyrus-imapd24/files/patch-sieve::Makefile.in
View File

@ -1,8 +1,8 @@
Index: sieve/Makefile.in
diff -u sieve/Makefile.in.orig sieve/Makefile.in
--- sieve/Makefile.in.orig Fri Mar 12 00:25:35 2004
+++ sieve/Makefile.in Wed May 19 00:38:00 2004
@@ -33,12 +33,13 @@
--- sieve/Makefile.in.orig Sat May 29 03:03:09 2004
+++ sieve/Makefile.in Sat May 29 04:53:11 2004
@@ -34,6 +34,7 @@
YACC = @YACC@
YFLAGS = -d
LEX = @LEX@
@ -10,14 +10,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
RANLIB = @RANLIB@
COMPILE_ET = @COMPILE_ET@
DEFS = @DEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
LDFLAGS = @LDFLAGS@
MAKEDEPEND = @MAKEDEPEND@
@@ -58,8 +59,8 @@
@@ -60,8 +61,8 @@
dist: $(BUILT_SOURCES)
install: sievec