3 files changed, 18 insertions, 10 deletions

diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 034ac03089b2..de0696c00598 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	Spreadsheet-ParseExcel
-PORTVERSION=	0.2603
+PORTVERSION=	0.2800
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Spreadsheet
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Get information from Excel file
@@ -18,8 +19,8 @@ COMMENT=	Get information from Excel file
 BUILD_DEPENDS=	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
+PERL_MODBUILD=	yes
+#PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
 MAN3=		Spreadsheet::ParseExcel.3 \
 		Spreadsheet::ParseExcel::SaveParser.3 \
@@ -36,4 +37,10 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/sample/Excel/* ${EXAMPLESDIR}/Excel
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=	perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-Spreadsheet-ParseExcel/distinfo b/textproc/p5-Spreadsheet-ParseExcel/distinfo
index 1123fb374b07..536efb0fdc88 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/distinfo
+++ b/textproc/p5-Spreadsheet-ParseExcel/distinfo
@@ -1,3 +1,3 @@
-MD5 (Spreadsheet-ParseExcel-0.2603.tar.gz) = 6ee6257d4b66cb9e147a0b50603d1387
-SHA256 (Spreadsheet-ParseExcel-0.2603.tar.gz) = 1ff7e4fd9cdb9efe191d812cd0e17559bce26cfe9a0bd9f06d0c892250c2b860
-SIZE (Spreadsheet-ParseExcel-0.2603.tar.gz) = 93092
+MD5 (Spreadsheet-ParseExcel-0.28.tar.gz) = 77b6c55d3f3804957b0b47ed2c80ae4a
+SHA256 (Spreadsheet-ParseExcel-0.28.tar.gz) = 6ca1f855cd0b4f40383161dfcefc8416ba65e1e10cd47bf30ad840871849f4a7
+SIZE (Spreadsheet-ParseExcel-0.28.tar.gz) = 97328
diff --git a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
index 7dc5881f6090..ca48f2949b86 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
@@ -6,9 +6,6 @@
 %%SITE_PERL%%/Spreadsheet/ParseExcel/FmtUnicode.pm
 %%SITE_PERL%%/Spreadsheet/ParseExcel/SaveParser.pm
 %%SITE_PERL%%/Spreadsheet/ParseExcel/Utility.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
 @dirrm %%SITE_PERL%%/Spreadsheet/ParseExcel
 @dirrmtry %%SITE_PERL%%/Spreadsheet
 %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/AuthorK.xls
@@ -21,6 +18,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/Test95J.xls
 %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/Test97.xls
 %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/Test97J.xls
+%%PORTDOCS%%%%EXAMPLESDIR%%/Excel/gives-warnings.xls
 %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/oem.xls
 %%PORTDOCS%%%%EXAMPLESDIR%%/Ilya.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
@@ -35,7 +33,9 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/dmpEx_2xml.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/iftest.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/iftestj.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/parse.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/res_fmt
+%%PORTDOCS%%%%EXAMPLESDIR%%/res_iftest.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/res_info
 %%PORTDOCS%%%%EXAMPLESDIR%%/res_oem
 %%PORTDOCS%%%%EXAMPLESDIR%%/res_rich
@@ -45,6 +45,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/sampleOEM.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/sample_j.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/smpFile.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/warning.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/xls2csv.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Excel
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%