From owner-svn-ports-head@FreeBSD.ORG Tue Oct 8 05:44:05 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTP id 760F62DD;
Tue, 8 Oct 2013 05:44:05 +0000 (UTC)
(envelope-from jkim@FreeBSD.org)
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))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 6373B24C1;
Tue, 8 Oct 2013 05:44:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r985i5GA082586;
Tue, 8 Oct 2013 05:44:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r985i53a082585;
Tue, 8 Oct 2013 05:44:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201310080544.r985i53a082585@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 8 Oct 2013 05:44:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r329757 - head/java/openjdk6
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Oct 2013 05:44:05 -0000
Author: jkim
Date: Tue Oct 8 05:44:04 2013
New Revision: 329757
URL: http://svnweb.freebsd.org/changeset/ports/329757
Log:
Use echo correctly.
Modified:
head/java/openjdk6/Makefile
Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile Tue Oct 8 05:35:39 2013 (r329756)
+++ head/java/openjdk6/Makefile Tue Oct 8 05:44:04 2013 (r329757)
@@ -275,7 +275,7 @@ test: build-depends build
.if !defined(DISPLAY)
@${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 \
-fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & \
- ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ ${ECHO_CMD} $$! > ${WRKDIR}/.Xvfb.pid
.endif
@-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} ${GMAKE} tests)
.if !defined(DISPLAY)
@@ -321,8 +321,8 @@ do-install:
${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}
.endif
.endif
- @${ECHO} "#!/bin/sh" > ${PKGDEINSTALL}
- @${ECHO} "#!/bin/sh" > ${PKGINSTALL}
+ @${ECHO_CMD} "#!/bin/sh" > ${PKGDEINSTALL}
+ @${ECHO_CMD} "#!/bin/sh" > ${PKGINSTALL}
.if defined(BUILD_JRE)
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} -s . -not -type d | \
@@ -333,9 +333,9 @@ do-install:
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
${SED} 's,^\.,@dirrm openjdk6-jre/,' >> ${TMPPLIST}
- @${ECHO} "@dirrm openjdk6-jre" >> ${TMPPLIST}
- @${ECHO} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
- @${ECHO} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
+ @${ECHO_CMD} "@dirrm openjdk6-jre" >> ${TMPPLIST}
+ @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
+ @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
.else
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} -s . -not -type d | \
@@ -346,9 +346,9 @@ do-install:
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
${SED} 's,^\./,@dirrm openjdk6/,' >> ${TMPPLIST}
- @${ECHO} "@dirrm openjdk6" >> ${TMPPLIST}
- @${ECHO} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
- @${ECHO} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
+ @${ECHO_CMD} "@dirrm openjdk6" >> ${TMPPLIST}
+ @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
+ @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
.if ${PORT_OPTIONS:MFASTDEBUG}
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} -s . -not -type d | \
@@ -359,12 +359,12 @@ do-install:
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
${SED} 's,^\./,@dirrm openjdk6-fastdebug/,' >> ${TMPPLIST}
- @${ECHO} "@dirrm openjdk6-fastdebug" >> ${TMPPLIST}
- @${ECHO} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
- @${ECHO} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
+ @${ECHO_CMD} "@dirrm openjdk6-fastdebug" >> ${TMPPLIST}
+ @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
+ @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
.endif
.endif
- @${ECHO} "exit 0" >> ${PKGDEINSTALL}
- @${ECHO} "exit 0" >> ${PKGINSTALL}
+ @${ECHO_CMD} "exit 0" >> ${PKGDEINSTALL}
+ @${ECHO_CMD} "exit 0" >> ${PKGINSTALL}
.include <bsd.port.post.mk>