5 files changed, 54 insertions, 22 deletions

diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index b8f617c7ed78..6c998eed5f75 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:	batik
 # Date created:			Feb 25, 2004
 # Whom:				ijliao
@@ -8,7 +7,7 @@
 
 PORTNAME=	batik
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	xmlgraphics/${PORTNAME}
@@ -19,29 +18,17 @@ COMMENT=	SVG Toolkit
 
 USE_ZIP=	yes
 USE_JAVA=	1.5+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_ANT=	yes
 USE_JIKES=	no
 ALL_TARGET=	jars all-jar
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-TARGET_DIR=	${WRKSRC}/${PORTNAME}-${PORTVERSION}
-
 # Prevent out of memory error during build
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
 
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-.endif
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}-${PORTVERSION}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 do-install:
-	cd ${TARGET_DIR} \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-
-post-install:
-	@${FIND} -s ${TARGET_DIR} -type f | \
-	  ${SED} -e 's,^${TARGET_DIR},${DATADIR:S,${PREFIX}/,,},' >> ${TMPPLIST}
-	@${FIND} -s -d ${TARGET_DIR} -type d | \
-	  ${SED} -e 's,^${TARGET_DIR},@dirrm ${DATADIR:S,${PREFIX}/,,},' >> ${TMPPLIST}
+	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/batik/distinfo b/graphics/batik/distinfo
index a0ea4de493e1..7d5766405779 100644
--- a/graphics/batik/distinfo
+++ b/graphics/batik/distinfo
@@ -1,3 +1,2 @@
-MD5 (batik-src-1.7.zip) = c117ca2241907f62a2b3031167ebf917
 SHA256 (batik-src-1.7.zip) = 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd
 SIZE (batik-src-1.7.zip) = 15060504
diff --git a/graphics/batik/files/patch-build.xml b/graphics/batik/files/patch-build.xml
new file mode 100644
index 000000000000..ecdb053ac13c
--- /dev/null
+++ b/graphics/batik/files/patch-build.xml
@@ -0,0 +1,10 @@
+--- ./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 f1506a92302b..1bcab01b58d3 100644
--- a/graphics/batik/pkg-descr
+++ b/graphics/batik/pkg-descr
@@ -1,5 +1,5 @@
-Batik is a Java(tm) technology based toolkit for applications or applets that
-want to use images in the Scalable Vector Graphics (SVG) format for various
-purposes, such as viewing, generation or manipulation.
+Batik is a Java technology based toolkit for applications or applets
+that want to use images in the Scalable Vector Graphics (SVG) format
+for various purposes, such as viewing, generation or manipulation.
 
 WWW: http://xml.apache.org/batik/
diff --git a/graphics/batik/pkg-plist b/graphics/batik/pkg-plist
new file mode 100644
index 000000000000..109de44d39dc
--- /dev/null
+++ b/graphics/batik/pkg-plist
@@ -0,0 +1,36 @@
+%%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
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/extensions
+@dirrm %%DATADIR%%