From owner-svn-ports-head@FreeBSD.ORG  Tue Mar 31 20:54:54 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 64DBF616;
 Tue, 31 Mar 2015 20:54:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 512D0632;
 Tue, 31 Mar 2015 20:54:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2VKsr1L006826;
 Tue, 31 Mar 2015 20:54:53 GMT (envelope-from makc@FreeBSD.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2VKsrJH006825;
 Tue, 31 Mar 2015 20:54:53 GMT (envelope-from makc@FreeBSD.org)
Message-Id: <201503312054.t2VKsrJH006825@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org
 using -f
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Tue, 31 Mar 2015 20:54:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382864 - head/graphics/batik
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2015 20:54:54 -0000

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@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>