svn commit: r322986 - in head/net-mgmt/p5-SNMP_Session: . files

[Chris Rees]

Author: crees
Date: Sun Jul 14 15:14:19 2013
New Revision: 322986
URL: http://svnweb.freebsd.org/changeset/ports/322986

Log:
  Fix some warnings when using mrtg_daemon.
  
  PR:		ports/166777
  Submitted by:	Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp>
  Approved by:	demon (maintainer)

Modified:
  head/net-mgmt/p5-SNMP_Session/Makefile
  head/net-mgmt/p5-SNMP_Session/files/patch-SNMP_Session.pm

Modified: head/net-mgmt/p5-SNMP_Session/Makefile
==============================================================================
--- head/net-mgmt/p5-SNMP_Session/Makefile	Sun Jul 14 14:52:01 2013	(r322985)
+++ head/net-mgmt/p5-SNMP_Session/Makefile	Sun Jul 14 15:14:19 2013	(r322986)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	p5-SNMP_Session
-# Date created:				13 June 1999
-# Whom:					Stephen J. Roznowski <sjr at home.net>
-#
+# Created by: Stephen J. Roznowski <sjr at home.net>
 # $FreeBSD$
-#
 
 PORTNAME=	SNMP_Session
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	snmp-session
@@ -19,11 +16,13 @@ PERL_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	${RM} ${WRKSRC}/lib/SNMP_Session.pm.orig
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in README README.SNMP_util index.html
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}

Modified: head/net-mgmt/p5-SNMP_Session/files/patch-SNMP_Session.pm
==============================================================================
--- head/net-mgmt/p5-SNMP_Session/files/patch-SNMP_Session.pm	Sun Jul 14 14:52:01 2013	(r322985)
+++ head/net-mgmt/p5-SNMP_Session/files/patch-SNMP_Session.pm	Sun Jul 14 15:14:19 2013	(r322986)
@@ -5,17 +5,54 @@
      if (eval {local $SIG{__DIE__};require Socket6;} &&
         eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
 -	import Socket6;
-+       	Socket6->import(qw(pack_sockaddr_in6 inet_pton inet_ntop unpack_sockaddr_in6 getaddrinfo));
++       	Socket6->import(qw(inet_pton inet_ntop getaddrinfo));
  	$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
  	$SNMP_Session::ipv6available = 1;
      }
-@@ -601,7 +601,7 @@
+@@ -549,7 +549,7 @@
+     # complaining about AF_INET6 when Socket6 is not available
+ 
+     if( (defined $ipv6_addr_len) && (length $addr == $ipv6_addr_len)) {
+-	($port,$addrunpack) = unpack_sockaddr_in6 ($addr);
++	($port,$addrunpack) = Socket6::unpack_sockaddr_in6 ($addr);
+ 	$addrstr = inet_ntop (AF_INET6(), $addrunpack);
+     } else {
+ 	($port,$addrunpack) = unpack_sockaddr_in ($addr);
+@@ -605,7 +605,7 @@
  BEGIN {
      if($SNMP_Session::ipv6available) {
  	import IO::Socket::INET6;
 -	import Socket6;
-+	Socket6->import(qw(pack_sockaddr_in6 inet_pton inet_ntop unpack_sockaddr_in6 getaddrinfo)); 
++	Socket6->import(qw(inet_pton inet_ntop getaddrinfo)); 
      }
  }
  
-
+@@ -825,8 +825,8 @@
+ 	($p2,$a2) = unpack_sockaddr_in ($sa2);
+     } elsif($this->{'sockfamily'} == AF_INET6()) {
+ 	# IPv6 addresses
+-	($p1,$a1) = unpack_sockaddr_in6 ($sa1);
+-	($p2,$a2) = unpack_sockaddr_in6 ($sa2);
++	($p1,$a1) = Socket6::unpack_sockaddr_in6 ($sa1);
++	($p2,$a2) = Socket6::unpack_sockaddr_in6 ($sa2);
+     } else {
+ 	return 0;
+     }
+@@ -899,7 +899,7 @@
+     return undef unless $remote_addr;
+ 
+     if( (defined $ipv6_addr_len) && (length $remote_addr == $ipv6_addr_len)) {
+-	($port,$iaddr) = unpack_sockaddr_in6($remote_addr);
++	($port,$iaddr) = Socket6::unpack_sockaddr_in6($remote_addr);
+     } else {
+ 	($port,$iaddr) = unpack_sockaddr_in($remote_addr);
+     }
+@@ -948,7 +948,7 @@
+     return undef unless $remote_addr;
+ 
+     if( (defined $ipv6_addr_len) && (length $remote_addr == $ipv6_addr_len)) {
+-	($port,$iaddr) = unpack_sockaddr_in6($remote_addr);
++	($port,$iaddr) = Socket6::unpack_sockaddr_in6($remote_addr);
+     } else {
+ 	($port,$iaddr) = unpack_sockaddr_in($remote_addr);
+     }