11 files changed, 23 insertions, 27 deletions

diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 7243940b38d0..ecc737e91949 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -77,10 +77,11 @@ PLIST_SUB+=	MURDER=""
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-#CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
@@ -108,8 +109,6 @@ DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.include <bsd.port.pre.mk>
-
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
index 89e7be52d853..4c33c0544e12 100644
--- a/mail/cyrus-imapd2/files/patch-ac
+++ b/mail/cyrus-imapd2/files/patch-ac
@@ -16,7 +16,7 @@ diff -u configure.orig configure
  EOF
  
 -    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
++    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
  ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 32f1c5d70f90..8808d4293587 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -111,10 +111,11 @@ CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-#CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
@@ -146,8 +147,6 @@ DOCSDIR=	${PREFIX}/share/doc/cyrus-imapd22
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.include <bsd.port.pre.mk>
-
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
diff --git a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
index 1ecdc62288cd..7670fddd294c 100644
--- a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
@@ -25,7 +25,7 @@ diff -u aclocal.m4.orig aclocal.m4
    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"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
      AC_CHECK_LIB(rpm, rpmdbOpen,
  		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
    fi
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
index 17f80a114033..d33f3b7b0e55 100644
--- a/mail/cyrus-imapd22/files/patch-ac
+++ b/mail/cyrus-imapd22/files/patch-ac
@@ -30,7 +30,7 @@ diff -u configure.orig configure
  _ACEOF
  
 -    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
++    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
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 32f1c5d70f90..8808d4293587 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -111,10 +111,11 @@ CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-#CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
@@ -146,8 +147,6 @@ DOCSDIR=	${PREFIX}/share/doc/cyrus-imapd22
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.include <bsd.port.pre.mk>
-
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
index 1ecdc62288cd..7670fddd294c 100644
--- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
@@ -25,7 +25,7 @@ diff -u aclocal.m4.orig aclocal.m4
    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"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
      AC_CHECK_LIB(rpm, rpmdbOpen,
  		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
    fi
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
index 17f80a114033..d33f3b7b0e55 100644
--- a/mail/cyrus-imapd23/files/patch-ac
+++ b/mail/cyrus-imapd23/files/patch-ac
@@ -30,7 +30,7 @@ diff -u configure.orig configure
  _ACEOF
  
 -    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
++    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
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 32f1c5d70f90..8808d4293587 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -111,10 +111,11 @@ CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-#CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
@@ -146,8 +147,6 @@ DOCSDIR=	${PREFIX}/share/doc/cyrus-imapd22
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.include <bsd.port.pre.mk>
-
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
index 1ecdc62288cd..7670fddd294c 100644
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
@@ -25,7 +25,7 @@ diff -u aclocal.m4.orig aclocal.m4
    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"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
      AC_CHECK_LIB(rpm, rpmdbOpen,
  		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
    fi
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index 17f80a114033..d33f3b7b0e55 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -30,7 +30,7 @@ diff -u configure.orig configure
  _ACEOF
  
 -    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
++    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