From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 30 16:10: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 A92DCC90 for ; Fri, 30 May 2014 16:10: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 85DBE258D for ; Fri, 30 May 2014 16:10: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 s4UGA09S011616 for ; Fri, 30 May 2014 16:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4UGA0Qq011615; Fri, 30 May 2014 16:10:00 GMT (envelope-from gnats) Resent-Date: Fri, 30 May 2014 16:10:00 GMT Resent-Message-Id: <201405301610.s4UGA0Qq011615@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 [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 B4E107CD for ; Fri, 30 May 2014 16:03:23 +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 A24442534 for ; Fri, 30 May 2014 16:03:23 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UG3Nbo041892 for ; Fri, 30 May 2014 16:03:23 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4UG3NbG041891; Fri, 30 May 2014 16:03:23 GMT (envelope-from nobody) Message-Id: <201405301603.s4UG3NbG041891@cgiserv.freebsd.org> Date: Fri, 30 May 2014 16:03:23 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190418: [patch] Add staging support to www/scloader 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: Fri, 30 May 2014 16:10:00 -0000 >Number: 190418 >Category: ports >Synopsis: [patch] Add staging support to www/scloader >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: Fri May 30 16:10: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/scloader. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/scloader/Makefile b/www/scloader/Makefile index 08d6469..cc597d3 100644 --- a/www/scloader/Makefile +++ b/www/scloader/Makefile @@ -22,22 +22,22 @@ PORTDOCS= README history todo DOS2UNIX_REGEX= .+\.[^j][^a][^r]$ -NO_STAGE= yes do-configure: ${SED} -e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \ -e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \ ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME} do-install: - ${INSTALL} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/scloader.jar ${JAVAJARDIR} + ${INSTALL} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/scloader.jar ${STAGEDIR}${JAVAJARDIR} .ifndef NOPORTDOCS - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/samples/loader.cnf ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/samples/loader.cnf ${STAGEDIR}${DOCSDIR} PORTDOCS+= manual.html loader.cnf .endif >Release-Note: >Audit-Trail: >Unformatted: