summaryrefslogtreecommitdiffstats
path: root/mail/cyrus-imapd24
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2004-11-24 07:22:49 +0000
committerume <ume@FreeBSD.org>2004-11-24 07:22:49 +0000
commit32f60dd1bfd4206e4fd9c60003601f571c0d5cf5 (patch)
tree3d88efc84f8a007b3139dd0bec4c5b17842551c1 /mail/cyrus-imapd24
parente0101db3cf89d846137b7ae6dd300b1a9e80209b (diff)
downloadFreeBSD-ports-32f60dd1bfd4206e4fd9c60003601f571c0d5cf5.zip
FreeBSD-ports-32f60dd1bfd4206e4fd9c60003601f571c0d5cf5.tar.gz
make it buildable with WITH_DRAC=yes, again
Diffstat (limited to 'mail/cyrus-imapd24')
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-aclocal.m414
-rw-r--r--mail/cyrus-imapd24/files/patch-ac20
3 files changed, 15 insertions, 22 deletions
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index a5d4397..6f712fb 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -258,6 +258,9 @@ post-patch:
@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
+.if defined(WITH_DRAC)
+ @${RM} -rf ${WRKSRC}/autom4te.cache
+.endif
post-install:
.for f in ${CYRUS_MAN3}
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
index 135cc4f..74f668b 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 Tue Nov 23 06:30:12 2004
-+++ aclocal.m4 Tue Nov 23 13:59:16 2004
-@@ -506,17 +506,22 @@
+--- aclocal.m4.orig Wed Nov 24 03:55:40 2004
++++ aclocal.m4 Wed Nov 24 15:39:52 2004
+@@ -506,10 +506,11 @@
fi
saved_LIBS=$LIBS
@@ -16,9 +16,7 @@ diff -u aclocal.m4.orig aclocal.m4
[db_create(NULL, NULL, 0);],
BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
dblib="no")
-+ if test "$dblib" != "no"; then
-+ break
-+ fi
+@@ -517,7 +518,8 @@
done
if test "$dblib" = "no"; then
LIBS="$saved_LIBS -ldb"
@@ -28,7 +26,7 @@ diff -u aclocal.m4.orig aclocal.m4
[db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
dblib="no")
-@@ -1819,9 +1824,12 @@
+@@ -1820,9 +1822,12 @@
if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
@@ -42,7 +40,7 @@ diff -u aclocal.m4.orig aclocal.m4
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
-@@ -1847,7 +1855,7 @@
+@@ -1848,7 +1853,7 @@
LIB_UCDSNMP=""
if test "$with_snmp" != no; then
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index d53f267..4247bf0 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,7 +1,7 @@
Index: configure
diff -u configure.orig configure
---- configure.orig Tue Nov 23 06:30:19 2004
-+++ configure Tue Nov 23 13:32:12 2004
+--- configure.orig Wed Nov 24 03:55:47 2004
++++ configure Wed Nov 24 15:34:27 2004
@@ -309,6 +309,7 @@
#endif"
@@ -27,15 +27,7 @@ diff -u configure.orig configure
#include <db.h>
int
main ()
-@@ -6643,6 +6645,7 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+ break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13531,6 +13534,7 @@
+@@ -13532,6 +13534,7 @@
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
PERL="${with_perl}"
@@ -43,7 +35,7 @@ diff -u configure.orig configure
PERL_CCCDLFLAGS="$cccdlflags"
fi
-@@ -14049,7 +14053,9 @@
+@@ -14050,7 +14053,9 @@
if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
@@ -54,7 +46,7 @@ diff -u configure.orig configure
cat >>confdefs.h <<\_ACEOF
#define HAVE_NETSNMP 1
-@@ -14280,7 +14286,7 @@
+@@ -14281,7 +14286,7 @@
#define HAVE_UCDSNMP 1
_ACEOF
@@ -63,7 +55,7 @@ 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
-@@ -15096,6 +15102,7 @@
+@@ -15097,6 +15102,7 @@
s,@LIB_WRAP@,$LIB_WRAP,;t t
s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
OpenPOWER on IntegriCloud