svn commit: r338385 - head/graphics/batik

[Rusmir Dusko]

Author: nemysis
Date: Wed Jan  1 18:25:10 2014
New Revision: 338385
URL: http://svnweb.freebsd.org/changeset/ports/338385

Log:
  - Change DOCS, add batik-docs
  - Change to use USE_JAVA=1.6+
  - Add DOCS Option
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/graphics/batik/Makefile
  head/graphics/batik/distinfo   (contents, props changed)

Modified: head/graphics/batik/Makefile
==============================================================================
--- head/graphics/batik/Makefile	Wed Jan  1 17:54:26 2014	(r338384)
+++ head/graphics/batik/Makefile	Wed Jan  1 18:25:10 2014	(r338385)
@@ -6,7 +6,7 @@ PORTVERSION=	1.7
 PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	APACHE/xmlgraphics/${PORTNAME}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Java based SVG toolkit
@@ -14,7 +14,7 @@ COMMENT=	Java based SVG toolkit
 LICENSE=	APACHE20
 
 USE_ZIP=	yes
-USE_JAVA=	1.5+
+USE_JAVA=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jars all-jar
 # Prevent out of memory error during build
@@ -24,18 +24,30 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-PORTDOCS=	CHANGES NOTICE README
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	CHANGES NOTICE README
+
+DOCSRCDIR2=	${WRKDIR}/docs/
+DOCSDIR2=	${DOCSDIR}
+DOC_FILES2=	*
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+DISTFILES+=	${PORTNAME}-docs-${PORTVERSION}${EXTRACT_SUFX}
+.endif
+
 do-install:
-	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}
+	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
-post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2})
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/batik/distinfo
==============================================================================
--- head/graphics/batik/distinfo	Wed Jan  1 17:54:26 2014	(r338384)
+++ head/graphics/batik/distinfo	Wed Jan  1 18:25:10 2014	(r338385)
@@ -1,2 +1,4 @@
 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