diff options
| author | ume <ume@FreeBSD.org> | 2004-05-30 00:36:16 +0800 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2004-05-30 00:36:16 +0800 |
| commit | 6258e87dca62b1ddff61887571b422bd4e63d643 (patch) | |
| tree | 67b9428745563e87ebf80033ae68b237818c7cd1 /mail/cyrus-imapd23/files | |
| parent | afeb4b65e5622ef8c1a79e9754d70627af4ccc56 (diff) | |
| download | freebsd-ports-gnome-6258e87dca62b1ddff61887571b422bd4e63d643.tar.gz freebsd-ports-gnome-6258e87dca62b1ddff61887571b422bd4e63d643.tar.zst freebsd-ports-gnome-6258e87dca62b1ddff61887571b422bd4e63d643.zip | |
Since net-snmp-5.X support was added in 2.2.5, change the default
of WITH_SNMP from net-snmp4 to net-snmp. However, if there is
net-snmp4 installed, we still use net-snmp4 for backward compatibility.
Diffstat (limited to 'mail/cyrus-imapd23/files')
| -rw-r--r-- | mail/cyrus-imapd23/files/extra-patch-aclocal.m4 | 11 | ||||
| -rw-r--r-- | mail/cyrus-imapd23/files/patch-ac | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 index b6cafac0a496..0fb00562c04e 100644 --- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 +++ b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 @@ -1,7 +1,7 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 --- aclocal.m4.orig Sat May 29 03:08:14 2004 -+++ aclocal.m4 Sat May 29 04:57:43 2004 ++++ aclocal.m4 Sat May 29 07:10:54 2004 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi @@ -20,6 +20,15 @@ diff -u aclocal.m4.orig aclocal.m4 dblib="no") CPPFLAGS=$cmu_save_CPPFLAGS +@@ -1806,7 +1806,7 @@ + + if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then + CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" +- LIB_UCDSNMP=$SNMP_LIBS ++ LIB_UCDSNMP="$SNMP_LIBS -lwrap" + AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?]) + AC_SUBST(LIB_UCDSNMP) + AC_MSG_RESULT(yes) @@ -1834,7 +1834,7 @@ LIB_UCDSNMP="" if test "$with_snmp" != no; then diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac index d2d3c3c729f7..4f6476d7498a 100644 --- a/mail/cyrus-imapd23/files/patch-ac +++ b/mail/cyrus-imapd23/files/patch-ac @@ -1,7 +1,7 @@ Index: configure diff -u configure.orig configure --- configure.orig Sat May 29 03:08:17 2004 -+++ configure Sat May 29 04:38:20 2004 ++++ configure Sat May 29 06:43:27 2004 @@ -6551,7 +6551,7 @@ BDB_LIBADD="" fi @@ -33,6 +33,15 @@ diff -u configure.orig configure PERL_CCCDLFLAGS="$cccdlflags" fi +@@ -14020,7 +14021,7 @@ + + if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then + CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" +- LIB_UCDSNMP=$SNMP_LIBS ++ LIB_UCDSNMP="$SNMP_LIBS -lwrap" + + cat >>confdefs.h <<\_ACEOF + #define HAVE_NETSNMP 1 @@ -14251,7 +14252,7 @@ #define HAVE_UCDSNMP 1 _ACEOF |