--- Makefile.orig	2007-05-20 04:08:39.000000000 +0800
+++ Makefile	2009-03-10 16:42:15.000000000 +0800
@@ -7,20 +7,18 @@
 #
 
 PORTNAME=	batik
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	graphics java
-MASTER_SITES=	${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	xmlgraphics/${PORTNAME}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SVG Toolkit
 
 USE_ZIP=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	1.3 1.4
-WRKSRC=		${WRKDIR}/xml-${PORTNAME}
+USE_JAVA=	1.5+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_ANT=	yes
 USE_JIKES=	no
 ALL_TARGET=	jars
@@ -28,7 +26,7 @@
 TARGET_DIR=	${WRKSRC}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(NOPORTDOCS)
-ALL_TARGET+=	html
+ALL_TARGET+=	javadoc
 .endif
 
 do-install:
--- distinfo.orig	2007-01-01 22:13:43.000000000 +0800
+++ distinfo	2009-03-10 16:41:53.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (batik-src-1.6.zip) = b65e12f520f8342605f700204c96cd2b
-SHA256 (batik-src-1.6.zip) = e1c69fb68e4b6710c246f44157bc4f3f021bdb2f2cedb8112bc025e3a4877a2c
-SIZE (batik-src-1.6.zip) = 10199668
+MD5 (batik-src-1.7.zip) = c117ca2241907f62a2b3031167ebf917
+SHA256 (batik-src-1.7.zip) = 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd
+SIZE (batik-src-1.7.zip) = 15060504