svn commit: r382864 - head/graphics/batik

[Max Brazhnikov]

Author: makc
Date: Tue Mar 31 20:54:53 2015
New Revision: 382864
URL: https://svnweb.freebsd.org/changeset/ports/382864
QAT: https://qat.redports.org/buildarchive/r382864/

Log:
  graphics/batik:
  - Add CPE info [1]
  - Clean up Makefile from superfluous variables
  
  PR:		198960 [1]
  Submitted by:	shun.fbsd.pr at dropcut.net

Modified:
  head/graphics/batik/Makefile

Modified: head/graphics/batik/Makefile
==============================================================================
--- head/graphics/batik/Makefile	Tue Mar 31 20:25:23 2015	(r382863)
+++ head/graphics/batik/Makefile	Tue Mar 31 20:54:53 2015	(r382864)
@@ -13,7 +13,9 @@ COMMENT=	Java based SVG toolkit
 
 LICENSE=	APACHE20
 
-USES=		zip
+CPE_VENDOR=	apache
+
+USES=		cpe zip
 USE_JAVA=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jars all-jar
@@ -26,13 +28,8 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
 DOC_FILES1=	CHANGES NOTICE README
 
-DOCSRCDIR2=	${WRKDIR}/docs/
-DOCSDIR2=	${DOCSDIR}
-DOC_FILES2=	*
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
@@ -46,8 +43,8 @@ do-install:
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2})
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>