Upgrade to 6.0.0.

PR:		ports/42511
Submitted by:	maintainer

7 files changed, 19 insertions, 51 deletions

diff --git a/net-mgmt/pancho/Makefile b/net-mgmt/pancho/Makefile
index ee5c9b52aaa8..9e2e57d5edcb 100644
--- a/net-mgmt/pancho/Makefile
+++ b/net-mgmt/pancho/Makefile
@@ -6,43 +6,31 @@
 #
 
 PORTNAME=	pancho
-PORTVERSION=	5.4
+PORTVERSION=	6.0.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://pancho.lunarmedia.net/pancho/ \
-		http://pancho.lunarmedia.net/
+MASTER_SITES=	http://www.panchoproject.org/archives/pancho/
 DISTNAME=	pancho-v${PORTVERSION}
 
 MAINTAINER=	Nicolas.Jombart@hsc-labs.com
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SNMP.pm:${PORTSDIR}/net/p5-Net-SNMP
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SNMP.pm:${PORTSDIR}/net/p5-Net-SNMP \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
 
 USE_PERL5=	YES
 NO_BUILD=	YES
 
-pre-everything::
-.if !defined(WITH_PANCHO_LOGGING)
-	@${ECHO_MSG} "Type \"make WITH_PANCHO_LOGGING=yes\" if you want to enable logging."
-	@${ECHO_MSG} "Read LOGGING to know how to customize logging."
-.endif
-
 pre-patch:
 	@${MV} ${WRKSRC}/pancho ${WRKSRC}/pancho.old
 	@${SED} -e '1,1s:/usr/bin/perl:${PERL5}:' \
 		< ${WRKSRC}/pancho.old > ${WRKSRC}/pancho
-.if defined(WITH_PANCHO_LOGGING)
+	@${RM} ${WRKSRC}/pancho.old
 	@${MV} ${WRKSRC}/pancho ${WRKSRC}/pancho.old
-	@${SED} -e '35,1s:logging = "":logging = "1":' \
+	@${SED} -e '28,1s:pancho.conf:${PREFIX}/etc/pancho.conf:' \
 		< ${WRKSRC}/pancho.old > ${WRKSRC}/pancho
-.endif
 	@${RM} ${WRKSRC}/pancho.old
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pancho ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/pancho
-.for i in README LOGGING CREDITS COPYRIGHT
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/pancho
-.endfor
-.endif
+	@${INSTALL_DATA} ${WRKSRC}/samples/sample.conf ${PREFIX}/etc/pancho.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pancho/distinfo b/net-mgmt/pancho/distinfo
index 2031c07ba2ff..db7588fcdd79 100644
--- a/net-mgmt/pancho/distinfo
+++ b/net-mgmt/pancho/distinfo
@@ -1 +1 @@
-MD5 (pancho-v5.4.tar.gz) = cacb74bb27fe9579caee7b9bbd804afd
+MD5 (pancho-v6.0.0.tar.gz) = d4f1e1fbb2d62ae74a735e7609570598
diff --git a/net-mgmt/pancho/files/patch-aa b/net-mgmt/pancho/files/patch-aa
deleted file mode 100644
index edbfc4013a2e..000000000000
--- a/net-mgmt/pancho/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- pancho.orig	Tue Jun 25 05:30:00 2002
-+++ pancho	Tue Jul  2 14:30:30 2002
-@@ -38,9 +38,9 @@
- ############ BE SURE TO READ THROUGH THE LOGGING HOWTO ############
- ############ WHICH ACCOMPANIES THIS DISTRIBUTION.      ############
- 
--my $logging     = "";           # set this to "1" to enable logging
-+my $logging     = "1";           # set this to "1" to enable logging
- 
--my $logfile 	= "";		# full path to your logfile 
-+my $logfile 	= $ENV{HOME}."/pancho.log"; # full path to your logfile 
- 
- ############ USE THE FOLLOWING OPTIONS TO TWEAK YOUR   ############
- ############ SNMP SESSION PARAMETERS.                  ############
diff --git a/net-mgmt/pancho/files/patch-ab b/net-mgmt/pancho/files/patch-ab
deleted file mode 100644
index 79ef97212ce2..000000000000
--- a/net-mgmt/pancho/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- LOGGING.orig	Sat Nov  3 16:26:20 2001
-+++ LOGGING	Sat Nov  3 17:31:18 2001
-@@ -69,3 +69,7 @@
- 
-     % touch /var/log/pancho
-     % chmod 600 /var/log/pancho
-+
-+Note: The FreeBSD port compiled with -DWITH_PANCHO_LOGGING enables
-+logging into ~/pancho.log so the setuid bit isn't set.
-+
diff --git a/net-mgmt/pancho/pkg-descr b/net-mgmt/pancho/pkg-descr
index ca9959cf4262..9f63efb8c7b6 100644
--- a/net-mgmt/pancho/pkg-descr
+++ b/net-mgmt/pancho/pkg-descr
@@ -1,5 +1,5 @@
 Pancho was written with the goal of allowing network
-admnistrators make a change to a group of Cisco routers
+administrators make a change to a group of Cisco routers
 without being required to log into each host. 
 
 Pancho also provides the flexibility to allow admins to
@@ -9,6 +9,9 @@ configurations on remote routers, pancho is also capable
 of archiving router configurations manually or through
 automated runs.
 
-WWW: http://pancho.lunarmedia.net/
+Support is provided for Cisco, Foundry or Nortel/Alteon
+devices.
+
+WWW: http://www.panchoproject.org/
 
 --Nicolas Jombart <Nicolas.Jombart@hsc-labs.com>
diff --git a/net-mgmt/pancho/pkg-message b/net-mgmt/pancho/pkg-message
new file mode 100644
index 000000000000..76bfff05babd
--- /dev/null
+++ b/net-mgmt/pancho/pkg-message
@@ -0,0 +1,5 @@
+Documentation is not included with Pancho distribution
+Please read it at http://www.panchoproject.org/
+
+You also need to customize PREFIX/etc/pancho.conf
+A sample configuration file is installed as pancho.conf.sample.
diff --git a/net-mgmt/pancho/pkg-plist b/net-mgmt/pancho/pkg-plist
index 9179f0458ae6..0760d0e43fe9 100644
--- a/net-mgmt/pancho/pkg-plist
+++ b/net-mgmt/pancho/pkg-plist
@@ -1,6 +1,2 @@
 bin/pancho
-%%PORTDOCS%%share/doc/pancho/README
-%%PORTDOCS%%share/doc/pancho/LOGGING
-%%PORTDOCS%%share/doc/pancho/CREDITS
-%%PORTDOCS%%share/doc/pancho/COPYRIGHT
-%%PORTDOCS%%@dirrm share/doc/pancho
+etc/pancho.conf.sample