From owner-svn-ports-all@FreeBSD.ORG  Sun May 25 05:31:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
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 80C2D6EA;
 Sun, 25 May 2014 05:31:14 +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 548EB2F44;
 Sun, 25 May 2014 05:31:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4P5VEfH037341;
 Sun, 25 May 2014 05:31:14 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4P5VE9C037340;
 Sun, 25 May 2014 05:31:14 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201405250531.s4P5VE9C037340@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sun, 25 May 2014 05:31:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355128 - head/www/grails
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
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 May 2014 05:31:14 -0000

Author: miwi
Date: Sun May 25 05:31:13 2014
New Revision: 355128
URL: http://svnweb.freebsd.org/changeset/ports/355128
QAT: https://qat.redports.org/buildarchive/r355128/

Log:
  - Stage support
  
  PR:		190118
  Submitted by:	Joseph Benden <joe@thrallingpenguin.com>
  Approved by:	maintainer

Modified:
  head/www/grails/Makefile

Modified: head/www/grails/Makefile
==============================================================================
--- head/www/grails/Makefile	Sun May 25 05:30:22 2014	(r355127)
+++ head/www/grails/Makefile	Sun May 25 05:31:13 2014	(r355128)
@@ -29,27 +29,26 @@ PLIST_FILES=	${SCRIPTFILES:S,^,bin/,} \
 PLIST_DIRS=	${DATADIR:S,${PREFIX}/,,}/bin
 SUB_FILES=	edit-startGrails.sed pkg-message
 
-NO_STAGE=	yes
 do-install:
 	@${ECHO_MSG} -n ">> Installing data files in ${DATADIR}..."
 	@cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
-	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; \
+	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing and symlinking executables..."
-	@${MKDIR} ${DATADIR}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	@${REINPLACE_CMD} -f ${WRKDIR}/edit-startGrails.sed ${WRKSRC}/bin/startGrails
 .for file in ${SCRIPTFILES}
 	@${ECHO_MSG} -n " ${file}"
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${DATADIR}/bin/${file}
-	@${LN} -fs ${DATADIR}/bin/${file} ${PREFIX}/bin/${file}
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${DATADIR}/bin/${file}
+	@${LN} -fs ${DATADIR}/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@cd ${WRKSRC}/doc \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif