Unbreak.

Upgrade to v1.8b3.
Fix for Perl5.

5 files changed, 39 insertions, 56 deletions

diff --git a/net-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index 2800746f7535..713d43dee68b 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/p5-SNMP/Makefile
@@ -1,22 +1,20 @@
 # New ports collection makefile for:	p5-SNMP
-# Version required:			1.6
+# Version required:			1.8b3
 # Date created:				May 5th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1998/04/30 02:56:57 asami Exp $
+# $Id: Makefile,v 1.3 1998/09/15 21:31:50 asami Exp $
 #
 
-DISTNAME=	SNMP-1.6
-PKGNAME=	p5-SNMP-1.6
+DISTNAME=	SNMP-1.8b3
+PKGNAME=	p5-SNMP-1.8b3
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	SNMP
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BUILD_DEPENDS= 	${PREFIX}/lib/libsnmp.a:${PORTSDIR}/net/ucd-snmp
-
-BROKEN=		build
+LIB_DEPENDS= 	snmp.3:${PORTSDIR}/net/ucd-snmp
 
 USE_PERL5=	YES
 
diff --git a/net-mgmt/p5-SNMP/distinfo b/net-mgmt/p5-SNMP/distinfo
index f8309476f14e..febf66013b11 100644
--- a/net-mgmt/p5-SNMP/distinfo
+++ b/net-mgmt/p5-SNMP/distinfo
@@ -1 +1 @@
-MD5 (SNMP-1.6.tar.gz) = 7fa5297084b4f82707577635f03f08bd
+MD5 (SNMP-1.8b3.tar.gz) = bf122824eb7833b09c48ecab44dc388c
diff --git a/net-mgmt/p5-SNMP/files/patch-aa b/net-mgmt/p5-SNMP/files/patch-aa
index d729b1190fa0..92d2fff56acf 100644
--- a/net-mgmt/p5-SNMP/files/patch-aa
+++ b/net-mgmt/p5-SNMP/files/patch-aa
@@ -1,18 +1,24 @@
---- Makefile.PL.orig	Tue Feb 27 20:35:19 1996
-+++ Makefile.PL	Wed Jul  2 09:04:10 1997
-@@ -17,13 +17,9 @@
- my @IncludeFiles = qw[asn1.h parse.h snmp.h snmp_api.h 
- 		      snmp_client.h snmp_impl.h];
- 
--my @IncludeDirs = qw[/usr/include /usr/local/include];
-+my $IncludeDir = find_files(\@IncludeFiles, [ ( "$ENV{PREFIX}/include/snmp" ) ] );
- 
--my $IncludeDir = find_files(\@IncludeFiles,\@IncludeDirs) ||
--	prompt("Where are the cmu-snmpv2 include files installed?","/usr/local/include");
--
--my $LibDir = find_files(["libsnmp.a"],[qw[/usr/lib /usr/local/lib]]) ||
--	prompt("Where is libsnmp.a installed?","/usr/local/lib");
-+my $LibDir = find_files(["libsnmp.a"], [ ( "$ENV{PREFIX}/lib" ) ] );
- 
-    @IncludeFiles = map {"$IncludeDir/$_";} @IncludeFiles;
-    $Params{LIBS} = "-L$LibDir -lsnmp";
+--- 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-mgmt/p5-SNMP/pkg-descr b/net-mgmt/p5-SNMP/pkg-descr
index cf17a82af26f..cd4684825f48 100644
--- a/net-mgmt/p5-SNMP/pkg-descr
+++ b/net-mgmt/p5-SNMP/pkg-descr
@@ -1,5 +1,5 @@
 This is a Perl5 extension module which provides an interface to the
-CMU-SNMPv2 library.
+UCD-SNMP library.
 
 Description:
 
@@ -9,24 +9,5 @@ SNMP::Session which is implemented as a blessed hash reference. The
 object supports 'get', 'set', and 'getNext' method calls. All calls are
 blocking/synchronous (i.e., they must receive a response or timeout
 before control is returned to the caller). The methods take a variety of
-input argument formats(see test.pl and examp/* for examples). A
-description of the objects data fields follow.
-
-SNMP::Session
- DestHost - default 'localhost', hostname or ip addr of SNMP agent
- Community - default 'public', SNMP community string
- Version - default '1', v1 support only for now
- Timeout - default '1000000', micro-seconds before retry
- Retries - default '5', retries before failure
- RetryNoSuch - default '1', for get request NOSUCH errors, the pdu will
-               be repaired, removing the varbind in error, and resent -
-               undef will be returned for all NOSUCH varbinds, setting
-               to '0' disables this feature and the entire get request
-               will fail on any NOSUCH error
- ErrorStr - read-only, returns a test description of any error occuring
-            in the last request
- ErrorNum - read-only, returns the snmp_err or staus of last request
-            private
- DestAddr - internal field used to hold the translated DestHost field
- SessPtr - internal field used to cache a created session structure
-
+input argument formats (example/* for examples). A description of the
+objects data fields follow.
diff --git a/net-mgmt/p5-SNMP/pkg-plist b/net-mgmt/p5-SNMP/pkg-plist
index 6b43e2ff7718..15dbc13efc58 100644
--- a/net-mgmt/p5-SNMP/pkg-plist
+++ b/net-mgmt/p5-SNMP/pkg-plist
@@ -1,8 +1,6 @@
-lib/perl5/site_perl/i386-freebsd/auto/SNMP/SNMP.bs
-lib/perl5/site_perl/i386-freebsd/auto/SNMP/SNMP.so
-lib/perl5/site_perl/auto/SNMP/autosplit.ix
-lib/perl5/site_perl/SNMP.pm
-lib/perl5/site_perl/README.SNMP
-lib/perl5/site_perl/i386-freebsd/auto/SNMP/.packlist
-@dirrm lib/perl5/site_perl/auto/SNMP
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/SNMP
+lib/perl5/site_perl/5.005/i386-freebsd/auto/SNMP/SNMP.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/SNMP/SNMP.so
+lib/perl5/site_perl/5.005/i386-freebsd/auto/SNMP/autosplit.ix
+lib/perl5/site_perl/5.005/i386-freebsd/SNMP.pm
+lib/perl5/site_perl/5.005/i386-freebsd/auto/SNMP/.packlist
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/SNMP