Update textproc/epubcheck to 1.1

From Ryo ONODERA in PR pkg/44123

Upstream changes:

- Fix for issue [#83]; version bump to 1.1 RC2
- Correction to unmanifested test for files [#80];
- Support for ISO8601 dates [#56];
- Added test for files added to the <guide> but not in the <manifest> [#45]
- Resolution for [#58] and and [#75]
- Clarified the language around the commonly-encountered Saxon configuration problem.

3 files changed, 15 insertions, 11 deletions

diff --git a/textproc/epubcheck/Makefile b/textproc/epubcheck/Makefile
index 45127c68f8e..a0a1c011b8c 100644
--- a/textproc/epubcheck/Makefile
+++ b/textproc/epubcheck/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/05/02 11:01:41 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/11/22 18:20:30 gls Exp $
 #
 
-DISTNAME=	epubcheck-1.0.5
+DISTNAME=	epubcheck-1.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://epubcheck.googlecode.com/files/
 EXTRACT_SUFX=	.zip
@@ -15,20 +15,22 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 USE_JAVA=	run
-INSTALLATION_DIRS=      bin libexec/epubcheck/lib share/doc/epubcheck
+INSTALLATION_DIRS=		bin libexec/epubcheck/lib share/doc/epubcheck
 
 do-build:
 	${ECHO} "#!/bin/sh" > ${WRKSRC}/epubcheck
-	${ECHO} "${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/libexec/epubcheck/epubcheck-1.0.5.jar"' "$$@"' >> ${WRKSRC}/epubcheck
+	${ECHO} "${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/libexec/epubcheck/epubcheck-1.1.jar"' "$$@"' >> ${WRKSRC}/epubcheck
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/epubcheck ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/epubcheck-1.0.5.jar ${DESTDIR}${PREFIX}/libexec/epubcheck
+	${INSTALL_DATA} ${WRKSRC}/epubcheck-1.1.jar ${DESTDIR}${PREFIX}/libexec/epubcheck
 # XXX: depend on saxon instead?
 	${INSTALL_DATA} ${WRKSRC}/lib/saxon.jar ${DESTDIR}${PREFIX}/libexec/epubcheck/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/jigsaw.jar ${DESTDIR}${PREFIX}/libexec/epubcheck/lib
 	${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${DESTDIR}${PREFIX}/share/doc/epubcheck
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/epubcheck
 	${INSTALL_DATA} ${WRKSRC}/jing_license.txt ${DESTDIR}${PREFIX}/share/doc/epubcheck
+	${INSTALL_DATA} ${WRKSRC}/jigsaw_license.txt ${DESTDIR}${PREFIX}/share/doc/epubcheck
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/epubcheck/PLIST b/textproc/epubcheck/PLIST
index 5f7aa56b26b..cf77c2f7393 100644
--- a/textproc/epubcheck/PLIST
+++ b/textproc/epubcheck/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2010/05/02 11:01:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/11/22 18:20:30 gls Exp $
 bin/epubcheck
-libexec/epubcheck/epubcheck-1.0.5.jar
+libexec/epubcheck/${PKGNAME}.jar
+libexec/epubcheck/lib/jigsaw.jar
 libexec/epubcheck/lib/saxon.jar
 share/doc/epubcheck/COPYING.txt
 share/doc/epubcheck/README.txt
+share/doc/epubcheck/jigsaw_license.txt
 share/doc/epubcheck/jing_license.txt
diff --git a/textproc/epubcheck/distinfo b/textproc/epubcheck/distinfo
index a0d67ce57b6..ec76d5e2dd6 100644
--- a/textproc/epubcheck/distinfo
+++ b/textproc/epubcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/05/02 11:01:42 wiz Exp $
+$NetBSD: distinfo,v 1.4 2010/11/22 18:20:30 gls Exp $
 
-SHA1 (epubcheck-1.0.5.zip) = 31f3740b65da142803c1e3d25c7c77fd632913dd
-RMD160 (epubcheck-1.0.5.zip) = b7577716915fcc5867d1f83068d14e9e1ae72ef1
-Size (epubcheck-1.0.5.zip) = 1300359 bytes
+SHA1 (epubcheck-1.1.zip) = 661e127aa57a0e2f5aecf16c1775e10b2984b54b
+RMD160 (epubcheck-1.1.zip) = 773c733f6e1b9a63ea230752114508ad924ffe60
+Size (epubcheck-1.1.zip) = 2283374 bytes