diff options
| author | Bill Fumerola <billf@FreeBSD.org> | 2000-05-12 20:21:27 +0000 |
|---|---|---|
| committer | Bill Fumerola <billf@FreeBSD.org> | 2000-05-12 20:21:27 +0000 |
| commit | 370c33992593cfec729089a909423894c63d52d7 (patch) | |
| tree | a3fc06c5caa271cc9763302b4452a613e153f2f5 | |
| parent | Comment clean-ups. (diff) | |
First crack at updating to 4.1.1, more features to come, but at least
the newest version is here.
Notes
Notes:
svn path=/head/; revision=28422
35 files changed, 70 insertions, 133 deletions
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net-mgmt/net-snmp-devel/distinfo +++ b/net-mgmt/net-snmp-devel/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net-mgmt/net-snmp-devel/files/patch-ad b/net-mgmt/net-snmp-devel/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net-mgmt/net-snmp-devel/files/patch-ad +++ b/net-mgmt/net-snmp-devel/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net-mgmt/net-snmp-devel/files/patch-af b/net-mgmt/net-snmp-devel/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net-mgmt/net-snmp-devel/files/patch-af +++ b/net-mgmt/net-snmp-devel/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ b/net-mgmt/net-snmp-devel/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net-mgmt/net-snmp/distinfo +++ b/net-mgmt/net-snmp/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net-mgmt/net-snmp/files/patch-ad b/net-mgmt/net-snmp/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net-mgmt/net-snmp/files/patch-ad +++ b/net-mgmt/net-snmp/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net-mgmt/net-snmp/files/patch-af b/net-mgmt/net-snmp/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net-mgmt/net-snmp/files/patch-af +++ b/net-mgmt/net-snmp/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net-mgmt/net-snmp4/Makefile +++ b/net-mgmt/net-snmp4/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net-mgmt/net-snmp4/distinfo b/net-mgmt/net-snmp4/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net-mgmt/net-snmp4/distinfo +++ b/net-mgmt/net-snmp4/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net-mgmt/net-snmp4/files/patch-ad b/net-mgmt/net-snmp4/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net-mgmt/net-snmp4/files/patch-ad +++ b/net-mgmt/net-snmp4/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net-mgmt/net-snmp4/files/patch-af b/net-mgmt/net-snmp4/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net-mgmt/net-snmp4/files/patch-af +++ b/net-mgmt/net-snmp4/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net-mgmt/net-snmp4/pkg-plist +++ b/net-mgmt/net-snmp4/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net-mgmt/net-snmp53/distinfo +++ b/net-mgmt/net-snmp53/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net-mgmt/net-snmp53/files/patch-ad b/net-mgmt/net-snmp53/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net-mgmt/net-snmp53/files/patch-ad +++ b/net-mgmt/net-snmp53/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net-mgmt/net-snmp53/files/patch-af b/net-mgmt/net-snmp53/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net-mgmt/net-snmp53/files/patch-af +++ b/net-mgmt/net-snmp53/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net-mgmt/net-snmp53/pkg-plist +++ b/net-mgmt/net-snmp53/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net/net-snmp/files/patch-ad b/net/net-snmp/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net/net-snmp/files/patch-ad +++ b/net/net-snmp/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net/net-snmp/files/patch-af b/net/net-snmp/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net/net-snmp/files/patch-af +++ b/net/net-snmp/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net/net-snmp/pkg-plist +++ b/net/net-snmp/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net/net-snmp4/Makefile +++ b/net/net-snmp4/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net/net-snmp4/distinfo +++ b/net/net-snmp4/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net/net-snmp4/files/patch-ad b/net/net-snmp4/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net/net-snmp4/files/patch-ad +++ b/net/net-snmp4/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net/net-snmp4/files/patch-af b/net/net-snmp4/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net/net-snmp4/files/patch-af +++ b/net/net-snmp4/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net/net-snmp4/pkg-plist +++ b/net/net-snmp4/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index 3dde6cad0d45..cba8ebad748c 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -6,26 +6,22 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.1 CATEGORIES= net MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ -PATCH_SITES= http://ucd-snmp.ucdavis.edu/patches/ -PATCHFILES= 012.patch -PATCH_DIST_STRIP= -p0 -d ${WRKSRC}/agent - MAINTAINER= billf@FreeBSD.org CONFIGURE_ARGS= --enable-shared - GNU_CONFIGURE= YES .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif +USE_GMAKE= YES #CFLAGS= -g MAN1= snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \ @@ -43,9 +39,6 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -BROKEN= "aout build breaks: ld: internal error: RRS relocs exceed allocation 343" -.endif .if ${OSVERSION} >= 400000 CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2" .endif @@ -63,7 +56,7 @@ post-install: @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/etc/* ; do \ + @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo index 932a6aa7b86a..e8b6587c2ae2 100644 --- a/net/ucd-snmp/distinfo +++ b/net/ucd-snmp/distinfo @@ -1,2 +1 @@ -MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511 -MD5 (012.patch) = 4e5cbbeacaccafedc985698fafb89d15 +MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa diff --git a/net/ucd-snmp/files/patch-ad b/net/ucd-snmp/files/patch-ad index f47168018a61..6f28af0a528f 100644 --- a/net/ucd-snmp/files/patch-ad +++ b/net/ucd-snmp/files/patch-ad @@ -4,7 +4,7 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1); + naddrs++; +#endif @@ -12,7 +12,7 @@ cp += ifm->ifm_msglen; rtm = (struct rt_msghdr *)cp; while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + ilen -= rtm->rtm_msglen; + cp += rtm->rtm_msglen; +#else diff --git a/net/ucd-snmp/files/patch-af b/net/ucd-snmp/files/patch-af index 2f197dc4c0c0..546933895230 100644 --- a/net/ucd-snmp/files/patch-af +++ b/net/ucd-snmp/files/patch-af @@ -1,12 +1,14 @@ --- agent/mibgroup/ucd_snmp.h.orig Fri Feb 26 03:03:41 1999 +++ agent/mibgroup/ucd_snmp.h Sun Apr 4 13:52:23 1999 -@@ -18,5 +18,9 @@ +@@ -18,5 +18,11 @@ config_arch_require(bsdi3, ucd-snmp/memory) config_arch_require(linux, ucd-snmp/vmstat) config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) config_arch_require(freebsd2, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd3, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) ++config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) config_add_mib(UCD-SNMP-MIB) diff --git a/net/ucd-snmp/pkg-plist b/net/ucd-snmp/pkg-plist index 5e1fb0b00e9d..52d02eb3986c 100644 --- a/net/ucd-snmp/pkg-plist +++ b/net/ucd-snmp/pkg-plist @@ -37,10 +37,7 @@ lib/libsnmp.so.%%shlib%% sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README -share/examples/ucd-snmp/acl.conf -share/examples/ucd-snmp/context.conf -share/examples/ucd-snmp/party.conf -share/examples/ucd-snmp/view.conf +share/examples/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp share/snmp/mibs/DLMOD-MIB.txt share/snmp/mibs/EtherLike-MIB.txt |