Maintainer update net/pancho to 9.0.1

PR:		ports/46997
Submitted by:	Nicolas Jombart <Nicolas.Jombart@hsc-labs.com>

6 files changed, 136 insertions, 17 deletions

diff --git a/net/pancho/Makefile b/net/pancho/Makefile
index 863000e1e89d..bf9083f74484 100644
--- a/net/pancho/Makefile
+++ b/net/pancho/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pancho
-PORTVERSION=	7.1.0
+PORTVERSION=	9.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.panchoproject.org/archives/pancho/
 DISTNAME=	pancho-v${PORTVERSION}
@@ -17,22 +17,22 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SNMP.pm:${PORTSDIR
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parallel/ForkManager.pm:${PORTSDIR}/devel/p5-Parallel-ForkManager
 
+WRKSRC=		${WRKDIR}/Pancho-${PORTVERSION}
 USE_PERL5=	YES
-NO_BUILD=	YES
+PERL_CONFIGURE=	YES
 
-pre-patch:
-	@${CHMOD} u+w ${WRKSRC}/pancho
-	@${MV} ${WRKSRC}/pancho ${WRKSRC}/pancho.old
-	@${SED} -e '1,1s:/usr/bin/perl:${PERL5}:' \
-		< ${WRKSRC}/pancho.old > ${WRKSRC}/pancho
-	@${RM} ${WRKSRC}/pancho.old
-	@${MV} ${WRKSRC}/pancho ${WRKSRC}/pancho.old
-	@${SED} -e '28,1s:pancho.conf:${PREFIX}/etc/pancho.conf:' \
-		< ${WRKSRC}/pancho.old > ${WRKSRC}/pancho
-	@${RM} ${WRKSRC}/pancho.old
+MAN1=		pancho.1
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pancho ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/samples/sample.conf ${PREFIX}/etc/pancho.conf.sample
+post-patch:
+	@${MV} ${WRKSRC}/lib/Pancho/Plugins/README ${WRKSRC}/README.plugins
+	@${MV} ${WRKSRC}/lib/Pancho/Plugins/Plugin.sample ${WRKSRC}/
 
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/samples/sample.conf ${PREFIX}/etc/pancho.conf.sample
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+.for f in README README.plugins Plugin.sample
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PORTNAME}
+.endfor
+.endif
 .include <bsd.port.mk>
diff --git a/net/pancho/distinfo b/net/pancho/distinfo
index ce07973187fc..9351f85f3f9f 100644
--- a/net/pancho/distinfo
+++ b/net/pancho/distinfo
@@ -1 +1 @@
-MD5 (pancho-v7.1.0.tar.gz) = e13d304e4cf3ef16c5100ef115932e4e
+MD5 (pancho-v9.0.1.tar.gz) = 5c38770be85570bdff5bb17526bf2979
diff --git a/net/pancho/files/patch-MANIFEST b/net/pancho/files/patch-MANIFEST
new file mode 100644
index 000000000000..6e7e7c1cf5de
--- /dev/null
+++ b/net/pancho/files/patch-MANIFEST
@@ -0,0 +1,11 @@
+--- MANIFEST.orig	Wed Jan  8 20:53:26 2003
++++ MANIFEST	Wed Jan  8 20:53:45 2003
+@@ -8,8 +8,6 @@
+ lib/Pancho/Plugins/Cisco.pm
+ lib/Pancho/Plugins/Foundry.pm
+ lib/Pancho/Plugins/Nortel.pm
+-lib/Pancho/Plugins/Plugin.sample
+-lib/Pancho/Plugins/README
+ lib/Pancho/Snmp.pm
+ lib/Pancho/Util.pm
+ license/COPYRIGHT
diff --git a/net/pancho/files/patch-Makefile.PL b/net/pancho/files/patch-Makefile.PL
new file mode 100644
index 000000000000..e4e86eff0eca
--- /dev/null
+++ b/net/pancho/files/patch-Makefile.PL
@@ -0,0 +1,92 @@
+--- Makefile.PL.orig	Mon Jan  6 22:22:54 2003
++++ Makefile.PL	Mon Jan  6 22:26:56 2003
+@@ -52,24 +52,26 @@
+    print "Configuring Pancho.\n";
+ }
+ 
+-my @missing_mods;
+-my @upgrade_mods;
+-# check for modules
+-foreach my $mod (keys %$DEPS) {
+-   my $eval = "require $mod";
+-   eval $eval;
+-   if ($@) {
+-      push (@missing_mods, $mod);
+-   }
+-   elsif ($mod->VERSION < $DEPS->{$mod}) {
+-      push (@upgrade_mods, $mod);
+-   }
+-}
+-
+-if ($NOASK) {
+-   installMods(\@missing_mods, 'missing');
+-   installMods(\@upgrade_mods, 'upgrade');
+-}
++# FreeBSD port : inhibits dependancy checks here
++# and use port's one
++#my @missing_mods;
++#my @upgrade_mods;
++## check for modules
++#foreach my $mod (keys %$DEPS) {
++#   my $eval = "require $mod";
++#   eval $eval;
++#   if ($@) {
++#      push (@missing_mods, $mod);
++#   }
++#   elsif ($mod->VERSION < $DEPS->{$mod}) {
++#      push (@upgrade_mods, $mod);
++#   }
++#}
++#
++#if ($NOASK) {
++#   installMods(\@missing_mods, 'missing');
++#   installMods(\@upgrade_mods, 'upgrade');
++#}
+ 
+ if ($ALONE) {
+    system("perl build_pancho.PL ALONE");
+@@ -109,25 +111,25 @@
+ }
+ 
+ # override install in order to create conf dir and copy config
+-sub MY::install {
+-    package MY;
+-    my $inherited = shift->SUPER::install(@_);
+-
+-    # commands to actually create and copy the files
+-    my $mkdir = "\t\$(MKPATH) \$(SYS_CONFDIR)\n";
+-
+-    my $copy  = "\t\@ if [ -f \"\$(SYS_CONFDIR)/pancho.conf\" ]; then \\\n"; 
+-    $copy    .= "\t\techo;\\\n\t\techo Not copying configuration file.  One already exists.;\\\n\t\techo;\\\n";
+-    $copy    .= "\telse \\\n";
+-    $copy    .= "\t\t\$(CP) pancho.conf \$(SYS_CONFDIR);\\\n";
+-    $copy    .= "\t\techo;\\\n\t\techo Configuration file has been installed into \$(SYS_CONFDIR);\\\n\t\techo;\\\n";
+-    $copy    .= "\tfi\n";
+-
+-    # add copy of config file into SYS_CONFDIR
+-    $inherited =~ s|(^install\s*::.*)|$1\n$mkdir$copy|m;
+-    
+-    $inherited;
+-}
++#sub MY::install {
++#    package MY;
++#    my $inherited = shift->SUPER::install(@_);
++#
++#    # commands to actually create and copy the files
++#    my $mkdir = "\t\$(MKPATH) \$(SYS_CONFDIR)\n";
++#
++#    my $copy  = "\t\@ if [ -f \"\$(SYS_CONFDIR)/pancho.conf\" ]; then \\\n"; 
++#    $copy    .= "\t\techo;\\\n\t\techo Not copying configuration file.  One already exists.;\\\n\t\techo;\\\n";
++#    $copy    .= "\telse \\\n";
++#    $copy    .= "\t\t\$(CP) pancho.conf \$(SYS_CONFDIR);\\\n";
++#    $copy    .= "\t\techo;\\\n\t\techo Configuration file has been installed into \$(SYS_CONFDIR);\\\n\t\techo;\\\n";
++#    $copy    .= "\tfi\n";
++#
++#    # add copy of config file into SYS_CONFDIR
++#    $inherited =~ s|(^install\s*::.*)|$1\n$mkdir$copy|m;
++#    
++#    $inherited;
++#}
+ 
+ # override realclean to remove pancho and pancho.conf
+ sub MY::realclean {
diff --git a/net/pancho/pkg-message b/net/pancho/pkg-message
index 76bfff05babd..e3040835e3d2 100644
--- a/net/pancho/pkg-message
+++ b/net/pancho/pkg-message
@@ -2,4 +2,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.
+A sample configuration file is installed as pancho.conf.sample,
+copy it as pancho.conf.
diff --git a/net/pancho/pkg-plist b/net/pancho/pkg-plist
index 0760d0e43fe9..96d06c197cee 100644
--- a/net/pancho/pkg-plist
+++ b/net/pancho/pkg-plist
@@ -1,2 +1,17 @@
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Util.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Snmp.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Log.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Plugins/Nortel.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Plugins/Foundry.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Plugins/Arrowpoint.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pancho/Plugins/Cisco.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pancho/.packlist
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pancho/Plugins 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pancho 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pancho 2>/dev/null || true
 bin/pancho
 etc/pancho.conf.sample
+%%PORTDOCS%%share/doc/pancho/README
+%%PORTDOCS%%share/doc/pancho/README.plugins
+%%PORTDOCS%%share/doc/pancho/Plugin.sample
+%%PORTDOCS%%@dirrm share/doc/pancho