svn commit: r382474 - head/www/cocoon

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Mar 28 12:18:05 2015
New Revision: 382474
URL: https://svnweb.freebsd.org/changeset/ports/382474
QAT: https://qat.redports.org/buildarchive/r382474/

Log:
  - Add CPE information
  
  PR:		198961
  Submitted by:	shun <shun.fbsd.pr at dropcut.net>

Modified:
  head/www/cocoon/Makefile

Modified: head/www/cocoon/Makefile
==============================================================================
--- head/www/cocoon/Makefile	Sat Mar 28 12:17:59 2015	(r382473)
+++ head/www/cocoon/Makefile	Sat Mar 28 12:18:05 2015	(r382474)
@@ -11,17 +11,18 @@ DISTNAME=	${PDISTNAME}-src
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	XML Web Development Framework
 
-USE_RC_SUBR=		${PORTNAME}
-USE_JAVA=		yes
-JAVA_VERSION=		1.6
-USES=			python
-MAKE_ENV=		JAVA_HOME=${JAVA_HOME}
-WRKSRC=			${WRKDIR}/${PDISTNAME}
-APP_NAME?=		${PORTNAME}
-APP_HOME?=		${PREFIX}/${APP_NAME}
-LATEST_LINK=		${APP_NAME}
-PLIST=			${WRKDIR}/pkg-plist
-PDISTNAME=		${PORTNAME}-${PORTVERSION}
+USE_RC_SUBR=	${PORTNAME}
+USE_JAVA=	yes
+JAVA_VERSION=	1.6
+USES=		cpe python
+CPE_VENDOR=	apache
+MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
+WRKSRC=		${WRKDIR}/${PDISTNAME}
+APP_NAME?=	${PORTNAME}
+APP_HOME?=	${PREFIX}/${APP_NAME}
+LATEST_LINK=	${APP_NAME}
+PLIST=		${WRKDIR}/pkg-plist
+PDISTNAME=	${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 COCOON_LIB=	${JAVASHAREDIR}/${APP_NAME}
@@ -37,8 +38,7 @@ GROUP?=		www
 GID?=		80
 LOG_FILE?=	${APP_HOME}/${APP_NAME}.log
 
-SUB_LIST=	\
-		APP_HOME=${APP_HOME} \
+SUB_LIST=	APP_HOME=${APP_HOME} \
 		APP_NAME=${APP_NAME} \
 		PORT=${PORT} \
 		COCOON_LIB=${COCOON_LIB} \
@@ -52,8 +52,7 @@ SUB_LIST=	\
 		LOG_FILE=${LOG_FILE} \
 		PYTHON_CMD=${PYTHON_CMD}
 
-SUB_FILES=	\
-		pkg-install \
+SUB_FILES=	pkg-install \
 		pkg-deinstall \
 		${APP_NAME}ctl \
 		upstreams-cocoon.sh \
@@ -79,23 +78,23 @@ post-configure:
 	${CP} ${WRKSRC}/build.properties ${WRKSRC}/local.build.properties
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} \
-       	-e 's/^#\(exclude.webapp.documentation=\)/\1/' \
-       	-e 's/^#\(exclude.webapp.javadocs=\)/\1/' \
-       	-e 's/^#\(exclude.documentation=\)/\1/' \
-       	-e 's/^#\(exclude.javadocs=\)/\1/' \
-       	${WRKSRC}/local.build.properties
+		-e 's/^#\(exclude.webapp.documentation=\)/\1/' \
+		-e 's/^#\(exclude.webapp.javadocs=\)/\1/' \
+		-e 's/^#\(exclude.documentation=\)/\1/' \
+		-e 's/^#\(exclude.javadocs=\)/\1/' \
+		${WRKSRC}/local.build.properties
 .endif
 .if ! ${PORT_OPTIONS:MSAMPLES}
 	${REINPLACE_CMD} \
-       	-e 's/^#\(exclude.webapp.samples=\)/\1/' \
-       	-e 's/^#\(exclude.webapp.test-suite=\)/\1/' \
-       	${WRKSRC}/local.build.properties
+		-e 's/^#\(exclude.webapp.samples=\)/\1/' \
+		-e 's/^#\(exclude.webapp.test-suite=\)/\1/' \
+		${WRKSRC}/local.build.properties
 .endif
 # Include Java source code into the binary jar files
 .if (defined(WITH_SOURCES))
 	${REINPLACE_CMD} \
-       	-e 's/^#\(include.sources-in-jars=\)/\1/' \
-       	${WRKSRC}/local.build.properties
+		-e 's/^#\(include.sources-in-jars=\)/\1/' \
+		${WRKSRC}/local.build.properties
 .endif
 
 pre-build: