From 46b53beed914d3ed8ad56b956369cb74d0a005f4 Mon Sep 17 00:00:00 2001 From: Jun Kuriyama Date: Fri, 12 Jan 2001 01:32:54 +0000 Subject: Unbreak and upgrade to 3.1.0. Use PERL_CONFIGURE and "make test" friendly. --- net/p5-SNMP/Makefile | 8 ++------ net/p5-SNMP/distinfo | 2 +- net/p5-SNMP/files/patch-Makefile.PL | 11 +++++++++++ net/p5-SNMP/files/patch-aa | 24 ------------------------ net/p5-SNMP/files/patch-ac | 29 ----------------------------- net/p5-SNMP/files/patch-mib.t | 18 ++++++++++++++++++ 6 files changed, 32 insertions(+), 60 deletions(-) create mode 100644 net/p5-SNMP/files/patch-Makefile.PL delete mode 100644 net/p5-SNMP/files/patch-aa delete mode 100644 net/p5-SNMP/files/patch-ac create mode 100644 net/p5-SNMP/files/patch-mib.t (limited to 'net/p5-SNMP') diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile index e4908f78dffc..f0ea19753928 100644 --- a/net/p5-SNMP/Makefile +++ b/net/p5-SNMP/Makefile @@ -6,7 +6,7 @@ # PORTNAME= SNMP -PORTVERSION= 1.8.1 +PORTVERSION= 3.1.0 CATEGORIES= net perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= SNMP @@ -16,11 +16,7 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= snmp.4:${PORTSDIR}/net/ucd-snmp -USE_PERL5= yes - -do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ - CC="${CC}" CCFLAGS="${CFLAGS}" +PERL_CONFIGURE= yes post-install: @${INSTALL_DATA} ${WRKSRC}/README \ diff --git a/net/p5-SNMP/distinfo b/net/p5-SNMP/distinfo index a76d9fb90e1d..f77f9ed20532 100644 --- a/net/p5-SNMP/distinfo +++ b/net/p5-SNMP/distinfo @@ -1 +1 @@ -MD5 (SNMP-1.8.1.tar.gz) = f53a9aa7ae3ae77031b40fdf9d19cba1 +MD5 (SNMP-3.1.0.tar.gz) = 21dc57fbf812b2b105412f584e2c2463 diff --git a/net/p5-SNMP/files/patch-Makefile.PL b/net/p5-SNMP/files/patch-Makefile.PL new file mode 100644 index 000000000000..959663ef3629 --- /dev/null +++ b/net/p5-SNMP/files/patch-Makefile.PL @@ -0,0 +1,11 @@ +--- Makefile.PL Mon Jan 8 19:58:04 2001 ++++ Makefile.PL.orig Sat Feb 5 08:09:39 2000 +@@ -27,7 +27,7 @@ + $snmp_link_lib = 'libsnmp'; + $sep = '\\'; + } else { +- $snmp_lib = 'libsnmp.a'; ++ $snmp_lib = 'libsnmp.so'; + $snmp_link_lib = 'snmp'; + $sep = '/'; + } diff --git a/net/p5-SNMP/files/patch-aa b/net/p5-SNMP/files/patch-aa deleted file mode 100644 index 92d2fff56acf..000000000000 --- a/net/p5-SNMP/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.PL.ORIG Wed Oct 21 11:12:12 1998 -+++ Makefile.PL Wed Oct 21 11:24:10 1998 -@@ -26,6 +26,10 @@ - $snmp_lib = 'libsnmp.dll'; - $snmp_llib = 'libsnmp'; - $sep = '\\'; -+} elsif ($Config{'osname'} eq 'freebsd') { -+ $snmp_lib = 'libsnmp.so'; -+ $snmp_llib = 'snmp'; -+ $sep = '/'; - } else { - $snmp_lib = 'libsnmp.a'; - $snmp_llib = 'snmp'; -@@ -79,8 +83,8 @@ - } - $host ||= 'localhost'; - $comm ||= 'private'; -- my $resp = prompt("Enter host and community for SNMP tests: ", -- "$host $comm"); -+ $resp = "$host $comm"; -+ # my $resp = prompt("Enter host and community for SNMP tests: ", "$host $comm"); - open(H, ">host") || die "Error: could not open file 'host' ($!)"; - print H "$resp\n"; - close H; diff --git a/net/p5-SNMP/files/patch-ac b/net/p5-SNMP/files/patch-ac deleted file mode 100644 index 06054d198a6d..000000000000 --- a/net/p5-SNMP/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- SNMP.xs.orig Mon Jun 7 18:02:57 1999 -+++ SNMP.xs Sat Aug 28 01:06:54 1999 -@@ -1778,6 +1778,7 @@ - struct variable_list *vars; - struct variable_list *last_vars; - struct tree *tp; -+ struct sockaddr_in *pduIp; - oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; - SV *tmp_sv; -@@ -1861,14 +1862,15 @@ - &pdu->enterprise_length) != SUCCESS) { - if (verbose) warn("invalid enterprise id: %s", enterprise); - } -+ pduIp = (struct sockaddr_in *)&(pdu->agent_addr); - if (agent && strlen(agent)) { -- pdu->agent_addr.sin_addr.s_addr = __parse_address(agent); -- if (pdu->agent_addr.sin_addr.s_addr == -1 && verbose) { -+ pduIp->sin_addr.s_addr = __parse_address(agent); -+ if (pduIp->sin_addr.s_addr == -1 && verbose) { - warn("invalid agent address: %s", agent); - goto err; - } - } else { -- pdu->agent_addr.sin_addr.s_addr = get_myaddr(); -+ pduIp->sin_addr.s_addr = get_myaddr(); - } - pdu->trap_type = generic; - pdu->specific_type = specific; diff --git a/net/p5-SNMP/files/patch-mib.t b/net/p5-SNMP/files/patch-mib.t new file mode 100644 index 000000000000..9afe0bf961dd --- /dev/null +++ b/net/p5-SNMP/files/patch-mib.t @@ -0,0 +1,18 @@ +--- t/mib.t.orig Tue Jan 11 07:21:08 2000 ++++ t/mib.t Fri Jan 12 10:25:44 2001 +@@ -147,13 +147,13 @@ + ###################### 15 ######################### + $res = $SNMP::MIB{atNetAddress}{nextNode}; + #print("res is --> $res\n"); +-ok($res =~ /^HASH/); ++ok(ref $res eq "HASH"); + #print("\n"); + + ######################## 16 ######################### + $res = $SNMP::MIB{sysDescr}{children}; + #print("res is --> $res\n"); +-ok($res =~ /^ARRAY/); ++ok(ref $res eq "ARRAY"); + #print("\n"); + #################### 17 ######################### + -- cgit v1.2.3