5 files changed, 10 insertions, 92 deletions

diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index cc9bcfdaf6ca..9ce5c01bfb3c 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -5,7 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	Text-RecordParser
-PORTVERSION=	0.09
+PORTVERSION=	1.0.0
+DISTVERSION=	v${PORTVERSION}
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Text
@@ -15,20 +16,19 @@ MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Read record-oriented files
 
 BUILD_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/Text/TabularDisplay.pm:${PORTSDIR}/textproc/p5-Text-TabularDisplay
+		${SITE_PERL}/Text/TabularDisplay.pm:${PORTSDIR}/textproc/p5-Text-TabularDisplay \
+		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+PERL_MODBUILD=	yes
 
 MAN1=		tablify.1 tabmerge.1
 MAN3=		Text::RecordParser.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-EXTRA_PATCHES=	${PATCHDIR}/5.005-RecordParser.pm \
-		${PATCHDIR}/5.005-bin::tablify \
-		${PATCHDIR}/5.005-t::02-filename-fh.t
+.if ${PERL_LEVEL} < 500800
+IGNORE= 	requires Perl 5.8 or newer. Install lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Text-RecordParser/distinfo b/textproc/p5-Text-RecordParser/distinfo
index 8ed010017f93..05fec7fbac44 100644
--- a/textproc/p5-Text-RecordParser/distinfo
+++ b/textproc/p5-Text-RecordParser/distinfo
@@ -1,2 +1,3 @@
-MD5 (Text-RecordParser-0.09.tar.gz) = 26051fe44bb650a6f27f6f721a50bf92
-SIZE (Text-RecordParser-0.09.tar.gz) = 19974
+MD5 (Text-RecordParser-v1.0.0.tar.gz) = cf7f48879770a1cc2ab6f7ae2f92d26d
+SHA256 (Text-RecordParser-v1.0.0.tar.gz) = 4b45e82a39afa65b176c8b71ad8837e87999a84d408e8cc12f72fd4cc409fc46
+SIZE (Text-RecordParser-v1.0.0.tar.gz) = 23782
diff --git a/textproc/p5-Text-RecordParser/files/5.005-RecordParser.pm b/textproc/p5-Text-RecordParser/files/5.005-RecordParser.pm
deleted file mode 100644
index 473b8f0e753f..000000000000
--- a/textproc/p5-Text-RecordParser/files/5.005-RecordParser.pm
+++ /dev/null
@@ -1,24 +0,0 @@
---- RecordParser.pm~	Tue Dec 16 21:43:05 2003
-+++ RecordParser.pm	Thu May  6 11:45:45 2004
-@@ -523,8 +523,8 @@
- 
-     if ( !defined $self->{'fh'} && $self->{'filename'} ) {
-         my $file = $self->{'filename'};
--        open my $fh, "<$file" or croak("Cannot read '$file': $!");
--        $self->{'fh'} = $fh;
-+        open FH, "<$file" or croak("Cannot read '$file': $!");
-+        $self->{'fh'} = \*FH;
-     }
- 
-     return $self->{'fh'};
-@@ -727,8 +727,8 @@
-             croak( "Cannot use directory '$filename' as input source" );
-         } 
-         elsif ( -f _ && -r _ ) {
--            if ( my $fh = $self->fh ) {
--                close $fh or croak(
-+            if ( $self->fh ) {
-+                close $self->fh or croak(
-                     "Can't close '", $self->{'filename'}, "': $!\n"
-                 );
-                 $self->{'fh'} = undef;
diff --git a/textproc/p5-Text-RecordParser/files/5.005-bin::tablify b/textproc/p5-Text-RecordParser/files/5.005-bin::tablify
deleted file mode 100644
index 862f0f421c7d..000000000000
--- a/textproc/p5-Text-RecordParser/files/5.005-bin::tablify
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 --git a/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t b/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t
deleted file mode 100644
index cce03c9a5da1..000000000000
--- a/textproc/p5-Text-RecordParser/files/5.005-t::02-filename-fh.t
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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' );
- }
-