- Remove unused dependency.

- Remove unused message about WITH_INETADDRESS_HACK knob.
- Count inactive memory as cache [1].

PR:		ports/116437 [1]
Submitted by:	rafan [1]

6 files changed, 36 insertions, 94 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 9512cfb6d9fc..b6756a0c8e41 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -24,13 +24,14 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local:Makefile.in
 .if defined(WITH_TKMIB)
 RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
-PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_AUTOTOOLS=	autoconf:261 libtool:15
+GNU_CONFIGURE=	yes
 USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
-INSTALLS_SHLIB=	yes
-.if !defined(WITHOUT_PERL)
+USE_LDCONFIG=	yes
+.if defined(WITHOUT_PERL)
+USE_PERL5_BUILD=yes
+.else
 USE_PERL5=	yes
 .endif
 
@@ -214,7 +215,6 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "WITH_INETADDRESS_HACK=yes	builds with the inetaddress hack"
 	@${ECHO_MSG} "WITH_TKMIB=yes		Install a graphical Perl/Tk/SNMP based mib browser"
 	@${ECHO_MSG} "WITHOUT_DUMMY_VALUES=yes	Provide 'placeholder' dummy values where"
 	@${ECHO_MSG} "				the necessary information is not available."
@@ -236,9 +236,7 @@ pre-everything::
 	@${ECHO_MSG} "				agent"
 	@${ECHO_MSG}
 
-post-patch: patch-script-files
-
-patch-script-files:
+post-patch:
 .for filename in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/local/${filename}
diff --git a/net-mgmt/net-snmp-devel/files/patch-configure.in b/net-mgmt/net-snmp-devel/files/patch-configure.in
index d2550644fed6..e69de29bb2d1 100644
--- a/net-mgmt/net-snmp-devel/files/patch-configure.in
+++ b/net-mgmt/net-snmp-devel/files/patch-configure.in
@@ -1,38 +0,0 @@
---- configure.in.orig	Fri Jul 14 06:55:27 2006
-+++ configure.in	Tue Feb 27 20:29:49 2007
-@@ -2171,7 +2171,7 @@
-   # fall back
-   CFLAG="-f"
- fi
--for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel
-+for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null
-   do
-   if test -f $i -o $CFLAG $i; then
-     ac_cv_KERNEL_LOC="$i"
-@@ -3145,6 +3145,26 @@
- # checking for 4.3 vs 4.4 rtentry.
- AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
- [
-+
-+dnl 4.4 compatible but renamed on FreeBSD
-+AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#define KERNEL
-+#define _KERNEL
-+#include <sys/socket.h>
-+#undef KERNEL
-+#undef _KERNEL
-+#include <net/route.h>
-+],[
-+
-+#ifndef STRUCT_RTENTRY_HAS_RT_DST
-+#define rt_dst rt_nodes->rn_key
-+#endif
-+
-+  struct rtentry rt; 
-+  rt.rt_nodes[0].rn_bit = 1;
-+  rt.rt_dst;
-+  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
- 
- # 4.4 compat
- AC_TRY_COMPILE([
diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c
new file mode 100644
index 000000000000..f7b5e603716d
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c
@@ -0,0 +1,11 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig	2008-03-30 14:37:13.262895421 +0900
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	2008-03-30 14:37:41.921163790 +0900
+@@ -352,7 +352,7 @@
+ #ifdef darwin
+         long_ret = ptok(mem.v_lookups);
+ #else
+-        long_ret = ptok(mem.v_cache_count);
++        long_ret = ptok(mem.v_cache_count) + ptok(mem.v_inactive_count);
+ #endif
+         return ((u_char *) (&long_ret));
+ #endif
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 9512cfb6d9fc..b6756a0c8e41 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -24,13 +24,14 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local:Makefile.in
 .if defined(WITH_TKMIB)
 RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
-PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_AUTOTOOLS=	autoconf:261 libtool:15
+GNU_CONFIGURE=	yes
 USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
-INSTALLS_SHLIB=	yes
-.if !defined(WITHOUT_PERL)
+USE_LDCONFIG=	yes
+.if defined(WITHOUT_PERL)
+USE_PERL5_BUILD=yes
+.else
 USE_PERL5=	yes
 .endif
 
@@ -214,7 +215,6 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "WITH_INETADDRESS_HACK=yes	builds with the inetaddress hack"
 	@${ECHO_MSG} "WITH_TKMIB=yes		Install a graphical Perl/Tk/SNMP based mib browser"
 	@${ECHO_MSG} "WITHOUT_DUMMY_VALUES=yes	Provide 'placeholder' dummy values where"
 	@${ECHO_MSG} "				the necessary information is not available."
@@ -236,9 +236,7 @@ pre-everything::
 	@${ECHO_MSG} "				agent"
 	@${ECHO_MSG}
 
-post-patch: patch-script-files
-
-patch-script-files:
+post-patch:
 .for filename in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/local/${filename}
diff --git a/net-mgmt/net-snmp/files/patch-configure.in b/net-mgmt/net-snmp/files/patch-configure.in
index d2550644fed6..e69de29bb2d1 100644
--- a/net-mgmt/net-snmp/files/patch-configure.in
+++ b/net-mgmt/net-snmp/files/patch-configure.in
@@ -1,38 +0,0 @@
---- configure.in.orig	Fri Jul 14 06:55:27 2006
-+++ configure.in	Tue Feb 27 20:29:49 2007
-@@ -2171,7 +2171,7 @@
-   # fall back
-   CFLAG="-f"
- fi
--for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel
-+for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null
-   do
-   if test -f $i -o $CFLAG $i; then
-     ac_cv_KERNEL_LOC="$i"
-@@ -3145,6 +3145,26 @@
- # checking for 4.3 vs 4.4 rtentry.
- AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
- [
-+
-+dnl 4.4 compatible but renamed on FreeBSD
-+AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#define KERNEL
-+#define _KERNEL
-+#include <sys/socket.h>
-+#undef KERNEL
-+#undef _KERNEL
-+#include <net/route.h>
-+],[
-+
-+#ifndef STRUCT_RTENTRY_HAS_RT_DST
-+#define rt_dst rt_nodes->rn_key
-+#endif
-+
-+  struct rtentry rt; 
-+  rt.rt_nodes[0].rn_bit = 1;
-+  rt.rt_dst;
-+  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
- 
- # 4.4 compat
- AC_TRY_COMPILE([
diff --git a/net-mgmt/net-snmp/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp/files/patch-memory_freebsd2.c
new file mode 100644
index 000000000000..f7b5e603716d
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-memory_freebsd2.c
@@ -0,0 +1,11 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig	2008-03-30 14:37:13.262895421 +0900
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	2008-03-30 14:37:41.921163790 +0900
+@@ -352,7 +352,7 @@
+ #ifdef darwin
+         long_ret = ptok(mem.v_lookups);
+ #else
+-        long_ret = ptok(mem.v_cache_count);
++        long_ret = ptok(mem.v_cache_count) + ptok(mem.v_inactive_count);
+ #endif
+         return ((u_char *) (&long_ret));
+ #endif