From owner-svn-ports-all@FreeBSD.ORG Fri Apr 18 21:40:33 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A41AB38A; Fri, 18 Apr 2014 21:40:33 +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 8E18A12C6; Fri, 18 Apr 2014 21:40:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ILeXdK065740; Fri, 18 Apr 2014 21:40:33 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ILeXv4065736; Fri, 18 Apr 2014 21:40:33 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201404182140.s3ILeXv4065736@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 18 Apr 2014 21:40:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351570 - in head/java: linux-sun-jdk17 linux-sun-jre17 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.17 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: Fri, 18 Apr 2014 21:40:33 -0000 Author: jkim Date: Fri Apr 18 21:40:32 2014 New Revision: 351570 URL: http://svnweb.freebsd.org/changeset/ports/351570 QAT: https://qat.redports.org/buildarchive/r351570/ Log: - Remove unnecessary use of chown to make it more staging friendly. [1] - Use USES=shebangfix instead of rolling our own. Simplify and clean up. Reported by: Andrzej Tobola (ato at iem dot pw dot edu dot pl) Modified: head/java/linux-sun-jdk17/Makefile head/java/linux-sun-jre17/Makefile Modified: head/java/linux-sun-jdk17/Makefile ============================================================================== --- head/java/linux-sun-jdk17/Makefile Fri Apr 18 21:40:17 2014 (r351569) +++ head/java/linux-sun-jdk17/Makefile Fri Apr 18 21:40:32 2014 (r351570) @@ -26,6 +26,7 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\// NO_BUILD= yes USE_LINUX= yes USE_LINUX_APPS= xorglibs +USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 JDK_VERSION= 7 @@ -35,8 +36,10 @@ DL_JDK_VERSION= ${JDK_INTERNAL_VERSION} DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION} -SCRIPT_FILES= bin/jcontrol jre/bin/jcontrol BIN_DIRS= bin jre/bin +LIB_DIRS= ${BIN_DIRS:S|bin$|lib|} +SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|} +bash_CMD= ${SH} .include @@ -74,19 +77,13 @@ post-extract: .endif post-patch: -.for script in ${SCRIPT_FILES} - @${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/${script} -.endfor - @${FIND} ${WRKSRC} -name '*.orig' -delete @(cd ${WRKSRC}/include; ${LN} -s linux freebsd) do-install: @${MKDIR} ${STAGEDIR}${APP_HOME} @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME} -.for dir in ${BIN_DIRS} - @${CHOWN} -R ${BINOWN}:${BINGRP} "${STAGEDIR}${APP_HOME}/${dir}" - @${FIND} ${STAGEDIR}${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \; -.endfor + @cd ${STAGEDIR}${APP_HOME} && \ + ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|} post-install: ${MKDIR} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs Modified: head/java/linux-sun-jre17/Makefile ============================================================================== --- head/java/linux-sun-jre17/Makefile Fri Apr 18 21:40:17 2014 (r351569) +++ head/java/linux-sun-jre17/Makefile Fri Apr 18 21:40:32 2014 (r351570) @@ -22,6 +22,7 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\// NO_BUILD= yes USE_LINUX= yes USE_LINUX_APPS= xorglibs +USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 JRE_VERSION= 7 @@ -31,8 +32,10 @@ DL_JRE_VERSION= ${JRE_INTERNAL_VERSION} DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JRE_INTERNAL_VERSION} -SCRIPT_FILES= bin/jcontrol BIN_DIRS= bin +LIB_DIRS= ${BIN_DIRS:S|bin$|lib|} +SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|} +bash_CMD= ${SH} .include @@ -43,19 +46,11 @@ IGNORE?=You must manually fetch the J2SE pre-everything:: @${CAT} ${PKGMESSAGE} -post-patch: -.for script in ${SCRIPT_FILES} - @${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/${script} -.endfor - @${FIND} ${WRKSRC} -name '*.orig' -delete - do-install: @${MKDIR} ${STAGEDIR}${APP_HOME} @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME} -.for dir in ${BIN_DIRS} - @${CHOWN} -R ${BINOWN}:${BINGRP} "${STAGEDIR}${APP_HOME}/${dir}" - @${FIND} ${STAGEDIR}${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \; -.endfor + @cd ${STAGEDIR}${APP_HOME} && \ + ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|} post-install: ${MKDIR} ${STAGEDIR}${APP_HOME}/.systemPrefs