Index: head/textproc/p5-Text-RecordParser/Makefile =================================================================== --- head/textproc/p5-Text-RecordParser/Makefile (revision 109436) +++ head/textproc/p5-Text-RecordParser/Makefile (revision 109437) @@ -1,30 +1,40 @@ # New ports collection makefile for: p5-Text-RecordParser # Date created: Nov 23 2003 # Whom: Lars Thegler # # $FreeBSD$ PORTNAME= Text-RecordParser -PORTVERSION= 0.05 +PORTVERSION= 0.06 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Text PKGNAMEPREFIX= p5- MAINTAINER= lars@thegler.dk COMMENT= Read record-oriented files -BUILD_DEPENDS= ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy +BUILD_DEPENDS= ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \ + ${SITE_PERL}/Text/TabularDisplay.pm:${PORTSDIR}/textproc/p5-Text-TabularDisplay RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes +MAN1= tablify.1 MAN3= Text::RecordParser.3 .include +.if ${PERL_LEVEL} <= 500503 +# make PREFIX-clean under perl 5.005_03 +post-configure: + ${PERL} -pi -e 's,/usr/local/,\$$(PREFIX)/,g' ${WRKSRC}/Makefile +.endif + .if ${PERL_LEVEL} < 500601 -EXTRA_PATCHES= ${PATCHDIR}/5.005-RecordParser.pm +EXTRA_PATCHES= ${PATCHDIR}/5.005-RecordParser.pm \ + ${PATCHDIR}/5.005-bin::tablify \ + ${PATCHDIR}/5.005-t::02-filename-fh.t .endif .include Property changes on: head/textproc/p5-Text-RecordParser/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/textproc/p5-Text-RecordParser/distinfo =================================================================== --- head/textproc/p5-Text-RecordParser/distinfo (revision 109436) +++ head/textproc/p5-Text-RecordParser/distinfo (revision 109437) @@ -1,2 +1,2 @@ -MD5 (Text-RecordParser-0.05.tar.gz) = 42e51787b91fc120ad7f8fa04a97da2e -SIZE (Text-RecordParser-0.05.tar.gz) = 11930 +MD5 (Text-RecordParser-0.06.tar.gz) = 8450f9fc8a82cfa28dbdc9abc4f3169b +SIZE (Text-RecordParser-0.06.tar.gz) = 17843 Property changes on: head/textproc/p5-Text-RecordParser/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/textproc/p5-Text-RecordParser/files/5.005-bin::tablify =================================================================== --- head/textproc/p5-Text-RecordParser/files/5.005-bin::tablify (nonexistent) +++ head/textproc/p5-Text-RecordParser/files/5.005-bin::tablify (revision 109437) @@ -0,0 +1,25 @@ +--- bin/tablify.orig Mon May 17 22:08:20 2004 ++++ bin/tablify Mon May 17 22:15:35 2004 +@@ -283,18 +283,18 @@ + + my $fh; + if ( my $pager = $ENV{'PAGER'} ) { +- open $fh, "| $pager"; ++ open FH, "| $pager"; + } + else { +- $fh = \*STDOUT; ++ *FH = *STDOUT; + } + +-print $fh ++print FH + ( $i ) + ? $tab->render . sprintf("\n$i record%s returned\n", $i > 1 ? 's' : '') + : "No records returned\n"; + +-close $fh; ++close FH; + + # ------------------------------------------------------------------- + Property changes on: head/textproc/p5-Text-RecordParser/files/5.005-bin::tablify ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t =================================================================== --- head/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t (nonexistent) +++ head/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t (revision 109437) @@ -0,0 +1,34 @@ +--- t/02-filename-fh.t.orig Mon May 17 22:16:08 2004 ++++ t/02-filename-fh.t Mon May 17 22:19:17 2004 +@@ -40,15 +40,15 @@ + { + my $p = Text::RecordParser->new; + +- open my $fh, "<$Bin/data/simpsons.cvs"; +- is ( ref $p->fh( $fh ), 'GLOB', 'fh is a filehandle' ); ++ open FH, "<$Bin/data/simpsons.cvs"; ++ is ( ref $p->fh( \*FH ), 'GLOB', 'fh is a filehandle' ); + + # + # Cause an error by closing the existing fh. + # +- close $fh; +- open my $fh2, "<$Bin/data/simpsons.tab"; +- eval { $p->fh( $fh2 ) }; ++ close FH; ++ open FH2, "<$Bin/data/simpsons.tab"; ++ eval { $p->fh( \*FH2 ) }; + my $err = $@; + like ( $err, qr/can't close existing/i, 'fh catches bad close' ); + +@@ -105,8 +105,8 @@ + is( $rec->{'instrument'}, 'drums', 'instrument = "drums"' ); + + my $filename = "$Bin/data/simpsons.csv"; +- open my $fh, "<$filename" or die "Can't read '$filename': $!"; +- is ( $p->data( $fh ), 1, 'data accepts a filehandle' ); ++ open FH, "<$filename" or die "Can't read '$filename': $!"; ++ is ( $p->data( \*FH ), 1, 'data accepts a filehandle' ); + is ( UNIVERSAL::isa( $p->fh, 'GLOB' ), 1, 'fh is a GLOB' ); + } + Property changes on: head/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/textproc/p5-Text-RecordParser/pkg-plist =================================================================== --- head/textproc/p5-Text-RecordParser/pkg-plist (revision 109436) +++ head/textproc/p5-Text-RecordParser/pkg-plist (revision 109437) @@ -1,5 +1,6 @@ +bin/tablify %%SITE_PERL%%/Text/RecordParser.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/RecordParser/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/RecordParser @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true @unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true Property changes on: head/textproc/p5-Text-RecordParser/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property