From owner-svn-ports-all@FreeBSD.ORG Sat Mar 28 12:18:06 2015 Return-Path: Delivered-To: svn-ports-all@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 94F8D484; Sat, 28 Mar 2015 12:18:06 +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 77863BAA; Sat, 28 Mar 2015 12:18:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SCI6Pw004702; Sat, 28 Mar 2015 12:18:06 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SCI6MU004701; Sat, 28 Mar 2015 12:18:06 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201503281218.t2SCI6MU004701@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 28 Mar 2015 12:18:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382474 - head/www/cocoon X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2015 12:18:06 -0000 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 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@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: