graphics/batik:

- Update to 1.11
- Switch to the binary distribution since building from the sources
  requires maven
- Update WWW

5 files changed, 63 insertions, 66 deletions

diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index c35a513de019..31d0a958c26b 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -2,42 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	batik
-PORTVERSION=	1.7
-PORTREVISION=	3
+PORTVERSION=	1.11
 CATEGORIES=	graphics java
-MASTER_SITES=	APACHE/xmlgraphics/${PORTNAME}
-DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	APACHE/xmlgraphics/${PORTNAME}/binaries
+DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Java based SVG toolkit
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CPE_VENDOR=	apache
 
-USES=		cpe zip
-USE_JAVA=	1.6+
-USE_ANT=	yes
-ALL_TARGET=	jars all-jar
-# Prevent out of memory error during build
-MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
+USES=		cpe
+USE_JAVA=	1.7+
+
+NO_ARCH=	yes
+NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}-${PORTVERSION}
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+JAVAJARDIR=	${JAVASHAREDIR}/${PORTNAME}
+
+PLIST_SUB=	VERSION=${PORTVERSION}
 
-PORTDOCS=	*
-DOC_FILES1=	CHANGES NOTICE README
+PORTDOCS=	CHANGES NOTICE README
 
 OPTIONS_DEFINE=	DOCS
-DOCS_DISTFILES=	${PORTNAME}-docs-${PORTVERSION}${EXTRACT_SUFX}
 
 do-install:
-	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR} "-name *\.jar")
+	(cd ${STAGEDIR}${JAVAJARDIR}/lib && ${LN} batik-all-${PORTVERSION}.jar batik-all.jar)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	(cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/batik/distinfo b/graphics/batik/distinfo
index 33f5d3d4b7ac..dfb1f0b538d1 100644
--- a/graphics/batik/distinfo
+++ b/graphics/batik/distinfo
@@ -1,4 +1,3 @@
-SHA256 (batik-src-1.7.zip) = 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd
-SIZE (batik-src-1.7.zip) = 15060504
-SHA256 (batik-docs-1.7.zip) = 2e4812317780f0e7dedfa944038be99333c2d3a592da80ef90edff916fbaf604
-SIZE (batik-docs-1.7.zip) = 18405853
+TIMESTAMP = 1566428356
+SHA256 (batik-bin-1.11.tar.gz) = ba84f10c52e5471ddde1a1db8b2af9a056b31fd600dea803150fe9567b7426d1
+SIZE (batik-bin-1.11.tar.gz) = 16596046
diff --git a/graphics/batik/files/patch-build.xml b/graphics/batik/files/patch-build.xml
deleted file mode 100644
index ecdb053ac13c..000000000000
--- a/graphics/batik/files/patch-build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./build.xml.orig	2008-01-06 11:11:30.000000000 +0300
-+++ ./build.xml	2010-11-30 01:07:28.436751154 +0300
-@@ -1043,7 +1043,6 @@
-   <!-- Jars ............................................................... -->
-   <target name="prepare-build" depends="init, determine-svn-revision">
-     <mkdir dir="${build}"/>
--    <mkdir dir="${build}/docs"/>
-     <mkdir dir="${build}/lib"/>
-   </target>
- 
diff --git a/graphics/batik/pkg-descr b/graphics/batik/pkg-descr
index 61d5c9aa16e5..94d33d0fe19e 100644
--- a/graphics/batik/pkg-descr
+++ b/graphics/batik/pkg-descr
@@ -2,4 +2,4 @@ Batik is a Java based toolkit for applications that handle images
 in the Scalable Vector Graphics (SVG) format for various purposes,
 such as viewing, generation, or manipulation.
 
-WWW: http://xml.apache.org/batik/
+WWW: https://xmlgraphics.apache.org/batik/
diff --git a/graphics/batik/pkg-plist b/graphics/batik/pkg-plist
index 0481ccc154d0..adaa0202536d 100644
--- a/graphics/batik/pkg-plist
+++ b/graphics/batik/pkg-plist
@@ -1,33 +1,43 @@
-%%DATADIR%%/batik-rasterizer.jar
-%%DATADIR%%/batik-slideshow.jar
-%%DATADIR%%/batik-squiggle.jar
-%%DATADIR%%/batik-svgpp.jar
-%%DATADIR%%/batik-ttf2svg.jar
-%%DATADIR%%/batik.jar
-%%DATADIR%%/extensions/batik-rasterizer-ext.jar
-%%DATADIR%%/extensions/batik-squiggle-ext.jar
-%%DATADIR%%/lib/batik-all.jar
-%%DATADIR%%/lib/batik-anim.jar
-%%DATADIR%%/lib/batik-awt-util.jar
-%%DATADIR%%/lib/batik-bridge.jar
-%%DATADIR%%/lib/batik-codec.jar
-%%DATADIR%%/lib/batik-css.jar
-%%DATADIR%%/lib/batik-dom.jar
-%%DATADIR%%/lib/batik-ext.jar
-%%DATADIR%%/lib/batik-extension.jar
-%%DATADIR%%/lib/batik-gui-util.jar
-%%DATADIR%%/lib/batik-gvt.jar
-%%DATADIR%%/lib/batik-parser.jar
-%%DATADIR%%/lib/batik-script.jar
-%%DATADIR%%/lib/batik-svg-dom.jar
-%%DATADIR%%/lib/batik-svggen.jar
-%%DATADIR%%/lib/batik-swing.jar
-%%DATADIR%%/lib/batik-transcoder.jar
-%%DATADIR%%/lib/batik-util.jar
-%%DATADIR%%/lib/batik-xml.jar
-%%DATADIR%%/lib/js.jar
-%%DATADIR%%/lib/pdf-transcoder.jar
-%%DATADIR%%/lib/xalan-2.6.0.jar
-%%DATADIR%%/lib/xerces_2_5_0.jar
-%%DATADIR%%/lib/xml-apis-ext.jar
-%%DATADIR%%/lib/xml-apis.jar
+%%JAVAJARDIR%%/batik-rasterizer-%%VERSION%%.jar
+%%JAVAJARDIR%%/batik-slideshow-%%VERSION%%.jar
+%%JAVAJARDIR%%/batik-squiggle-%%VERSION%%.jar
+%%JAVAJARDIR%%/batik-svgpp-%%VERSION%%.jar
+%%JAVAJARDIR%%/batik-ttf2svg-%%VERSION%%.jar
+%%JAVAJARDIR%%/extensions/batik-rasterizer-ext-%%VERSION%%.jar
+%%JAVAJARDIR%%/extensions/batik-squiggle-ext-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-all-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-all.jar
+%%JAVAJARDIR%%/lib/batik-anim-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-awt-util-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-bridge-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-codec-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-constants-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-css-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-dom-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-ext-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-extension-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-gui-util-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-gvt-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-i18n-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-parser-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-script-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-svg-dom-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-svgbrowser-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-svggen-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-svgrasterizer-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-swing-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-test-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-test-svg-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-test-swing-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-transcoder-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-util-%%VERSION%%-tests.jar
+%%JAVAJARDIR%%/lib/batik-util-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/batik-xml-%%VERSION%%.jar
+%%JAVAJARDIR%%/lib/fop-transcoder-allinone-2.3.jar
+%%JAVAJARDIR%%/lib/js.jar
+%%JAVAJARDIR%%/lib/serializer-2.7.2.jar
+%%JAVAJARDIR%%/lib/xalan-2.7.2.jar
+%%JAVAJARDIR%%/lib/xercesImpl-2.9.1.jar
+%%JAVAJARDIR%%/lib/xml-apis-1.3.04.jar
+%%JAVAJARDIR%%/lib/xml-apis-ext-1.3.04.jar
+%%JAVAJARDIR%%/lib/xmlgraphics-commons-2.3.jar