From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 20 01:20:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86FCEC88 for ; Tue, 20 May 2014 01:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 636FA2B8F for ; Tue, 20 May 2014 01:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4K1K0WU033880 for ; Tue, 20 May 2014 01:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4K1K0aS033879; Tue, 20 May 2014 01:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 May 2014 01:20:00 GMT Resent-Message-Id: <201405200120.s4K1K0aS033879@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCE25858 for ; Tue, 20 May 2014 01:15:02 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B093F2B66 for ; Tue, 20 May 2014 01:15:02 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4K1F2a6087042 for ; Tue, 20 May 2014 01:15:02 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4K1F2vu087041; Tue, 20 May 2014 01:15:02 GMT (envelope-from nobody) Message-Id: <201405200115.s4K1F2vu087041@cgiserv.freebsd.org> Date: Tue, 20 May 2014 01:15:02 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189978: [patch] Add staging support to www/apache-forrest X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 01:20:00 -0000 >Number: 189978 >Category: ports >Synopsis: [patch] Add staging support to www/apache-forrest >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 20 01:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support to www/apache-forrest. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile index 72e36a8..14748eb 100644 --- a/www/apache-forrest/Makefile +++ b/www/apache-forrest/Makefile @@ -16,6 +16,8 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= A tool for rapid development of small sites USE_JAVA= yes +ANT= ${LOCALBASE}/bin/ant +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant JAVA_VERSION= 1.6 REPLACE_FILES= ${WRKSRC}/bin/forrest ${WRKSRC}/tools/ant/bin/ant @@ -29,11 +31,9 @@ FIND_ARGS1= -type d \! -empty FIND_ARGS2= \! -type d -and -perm -a+x -and \! -name "*.orig" -and \! -name "*.bak" FIND_ARGS3= \! -type d -and \! -perm -a+x -and \! -name "*.bat" -and \! -name "*.orig" -and \! -name "LICENSE.txt" -and \! -name "KEYS" -and \! -name "NOTICE.txt" -and \! -name "*.license.txt" -ANT= ${DATADIR}/tools/ant/bin/ant ANT_TARGET= local-deploy PLUGINSDIR= ${DATADIR}/plugins/org.apache.forrest.plugin.output.pdf -NO_STAGE= yes post-patch: @for FILE in ${REPLACE_FILES}; do \ ${REINPLACE_CMD} -e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \ @@ -45,27 +45,27 @@ do-install: @cd ${WRKSRC}; \ DIRS=$$(${FIND} . ${FIND_ARGS1}); \ for DIR in $${DIRS}; do \ - ${MKDIR} ${DATADIR}/$${DIR}; \ + ${MKDIR} ${STAGEDIR}${DATADIR}/$${DIR}; \ done; \ FILES=$$(${FIND} . ${FIND_ARGS2} ); \ for FILE in $${FILES}; do \ - ${INSTALL_SCRIPT} $${FILE} ${DATADIR}/$${FILE}; \ + ${INSTALL_SCRIPT} $${FILE} ${STAGEDIR}${DATADIR}/$${FILE}; \ done; \ FILES=$$(${FIND} . ${FIND_ARGS3}); \ for FILE in $${FILES}; do \ - ${INSTALL_DATA} $${FILE} ${DATADIR}/$${FILE}; \ + ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DATADIR}/$${FILE}; \ done; # Links to executables @cd ${WRKSRC}; \ FILES=$$(${FIND} bin ${FIND_ARGS2} ); \ for FILE in $${FILES}; do \ - ${LN} ${LINK_OPTS} ${DATADIR}/$${FILE} ${PREFIX}/$${FILE}; \ + ${LN} ${LINK_OPTS} ${DATADIR}/$${FILE} ${STAGEDIR}${PREFIX}/$${FILE}; \ done; post-install: - @cd ${PLUGINSDIR}; \ - ${SETENV} FORREST_HOME=${DATADIR} ${ANT} ${ANT_TARGET}; \ + @cd ${STAGEDIR}${PLUGINSDIR}; \ + ${SETENV} FORREST_HOME=${STAGEDIR}${DATADIR} ${ANT} ${ANT_TARGET}; \ ${SED} -e "/%%DATADIR%%/s//${DATADIR:S/\//\\\//g}/g" \ -e "/%%PORTVERSION%%/s//${PORTVERSION}/g" ${PKGMESSAGE}; >Release-Note: >Audit-Trail: >Unformatted: