From owner-freebsd-ports Sun Jan 12 9:40:16 2003 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CA7137B401 for ; Sun, 12 Jan 2003 09:40:04 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E85DF43F5F for ; Sun, 12 Jan 2003 09:40:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h0CHe2NS056080 for ; Sun, 12 Jan 2003 09:40:02 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0CHe2OC056079; Sun, 12 Jan 2003 09:40:02 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3DCA37B401 for ; Sun, 12 Jan 2003 09:33:38 -0800 (PST) Received: from shiva.bouglou.net (shiva.bouglou.net [62.4.22.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id A447F43F43 for ; Sun, 12 Jan 2003 09:33:36 -0800 (PST) (envelope-from ecu@shiva.bouglou.net) Received: by shiva.bouglou.net (Postfix, from userid 1000) id 981391522B; Sun, 12 Jan 2003 18:34:31 +0100 (CET) Message-Id: <20030112173431.981391522B@shiva.bouglou.net> Date: Sun, 12 Jan 2003 18:34:31 +0100 (CET) From: Nicolas Jombart Reply-To: Nicolas Jombart To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/46997: Update port: net/pancho to 9.0.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46997 >Category: ports >Synopsis: Update port: net/pancho to 9.0.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 12 09:40:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Nicolas Jombart >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD shiva.bouglou.net 4.7-STABLE FreeBSD 4.7-STABLE #15: Sat Jan 4 18:49:56 CET 2003 ecu@shiva.bouglou.net:/usr/obj/usr/src/sys/SHIVA i386 >Description: Update net/pancho to 9.0.1 New files: files/ files/patch-Makefile.PL files/patch-MANIFEST >How-To-Repeat: >Fix: --- pancho.diff begins here --- diff -ruN /usr/ports/net/pancho/Makefile pancho/Makefile --- /usr/ports/net/pancho/Makefile Sat Nov 9 11:43:12 2002 +++ pancho/Makefile Sun Jan 12 18:23:26 2003 @@ -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 @@ ${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 diff -ruN /usr/ports/net/pancho/distinfo pancho/distinfo --- /usr/ports/net/pancho/distinfo Sat Nov 9 11:43:12 2002 +++ pancho/distinfo Mon Jan 6 22:31:49 2003 @@ -1 +1 @@ -MD5 (pancho-v7.1.0.tar.gz) = e13d304e4cf3ef16c5100ef115932e4e +MD5 (pancho-v9.0.1.tar.gz) = 5c38770be85570bdff5bb17526bf2979 diff -ruN /usr/ports/net/pancho/files/patch-MANIFEST pancho/files/patch-MANIFEST --- /usr/ports/net/pancho/files/patch-MANIFEST Thu Jan 1 01:00:00 1970 +++ pancho/files/patch-MANIFEST Wed Jan 8 20:53:57 2003 @@ -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 -ruN /usr/ports/net/pancho/files/patch-Makefile.PL pancho/files/patch-Makefile.PL --- /usr/ports/net/pancho/files/patch-Makefile.PL Thu Jan 1 01:00:00 1970 +++ pancho/files/patch-Makefile.PL Mon Jan 6 22:34:45 2003 @@ -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 -ruN /usr/ports/net/pancho/pkg-message pancho/pkg-message --- /usr/ports/net/pancho/pkg-message Mon Sep 9 22:39:04 2002 +++ pancho/pkg-message Sun Jan 12 18:22:13 2003 @@ -2,4 +2,5 @@ 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 -ruN /usr/ports/net/pancho/pkg-plist pancho/pkg-plist --- /usr/ports/net/pancho/pkg-plist Tue Sep 10 00:22:23 2002 +++ pancho/pkg-plist Wed Jan 8 20:58:30 2003 @@ -1,2 +1,16 @@ +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 2>/dev/null || true +@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/audi/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 --- pancho.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message