Attachment 42923 Details for Bug 66807 – p5-Text-RecordParser-0.06.patch

[patch] p5-Text-RecordParser-0.06.patch

p5-Text-RecordParser-0.06.patch (text/plain), 5.02 KB, created by Lars Thegler on 2004-05-18 14:00:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Thegler

Created: 2004-05-18 14:00:31 UTC

Size: 5.02 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/Makefile /usr/home/lth/ports/textproc/p5-Text-RecordParser/Makefile
>--- /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/Makefile	Thu May  6 16:16:55 2004
>+++ /usr/home/lth/ports/textproc/p5-Text-RecordParser/Makefile	Tue May 18 00:29:02 2004
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/textproc/p5-Text-RecordParser/Makefile,v 1.3 2004/05/06 14:16:55 mat Exp $
> 
> PORTNAME=	Text-RecordParser
>-PORTVERSION=	0.05
>+PORTVERSION=	0.06
> CATEGORIES=	textproc perl5
> MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> MASTER_SITE_SUBDIR=	Text
>@@ -14,17 +14,27 @@
> 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 <bsd.port.pre.mk>
> 
>+.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 <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/distinfo /usr/home/lth/ports/textproc/p5-Text-RecordParser/distinfo
>--- /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/distinfo	Fri Mar 19 02:51:14 2004
>+++ /usr/home/lth/ports/textproc/p5-Text-RecordParser/distinfo	Sun May 16 22:54:53 2004
>@@ -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
>diff -ruN --exclude=CVS /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/files/5.005-bin::tablify /usr/home/lth/ports/textproc/p5-Text-RecordParser/files/5.005-bin::tablify
>--- /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/files/5.005-bin::tablify	Thu Jan  1 01:00:00 1970
>+++ /usr/home/lth/ports/textproc/p5-Text-RecordParser/files/5.005-bin::tablify	Tue May 18 00:20:07 2004
>@@ -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;
>+ 
>+ # -------------------------------------------------------------------
>+ 
>diff -ruN --exclude=CVS /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/files/5.005-t::02-filename-fh.t /usr/home/lth/ports/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t
>--- /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/files/5.005-t::02-filename-fh.t	Thu Jan  1 01:00:00 1970
>+++ /usr/home/lth/ports/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t	Tue May 18 00:20:30 2004
>@@ -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' );
>+ }
>+ 
>diff -ruN --exclude=CVS /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/pkg-plist /usr/home/lth/ports/textproc/p5-Text-RecordParser/pkg-plist
>--- /usr/home/lth/ports/textproc/p5-Text-RecordParser.old/pkg-plist	Thu Dec  4 17:27:16 2003
>+++ /usr/home/lth/ports/textproc/p5-Text-RecordParser/pkg-plist	Tue May 18 00:22:12 2004
>@@ -1,3 +1,4 @@
>+bin/tablify
> %%SITE_PERL%%/Text/RecordParser.pm
> %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/RecordParser/.packlist
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/RecordParser

Actions: View | Diff

Attachments on bug 66807: 42923