From owner-svn-ports-all@FreeBSD.ORG Sun Mar 23 19:43:08 2014 Return-Path: Delivered-To: svn-ports-all@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 C18664F9; Sun, 23 Mar 2014 19:43:08 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AE068DF0; Sun, 23 Mar 2014 19:43:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NJh8c6063825; Sun, 23 Mar 2014 19:43:08 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NJh8u1063824; Sun, 23 Mar 2014 19:43:08 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201403231943.s2NJh8u1063824@svn.freebsd.org> From: Steve Wills Date: Sun, 23 Mar 2014 19:43:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348882 - in head/java/linux-sun-jdk17: . files 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: Sun, 23 Mar 2014 19:43:08 -0000 Author: swills Date: Sun Mar 23 19:43:08 2014 New Revision: 348882 URL: http://svnweb.freebsd.org/changeset/ports/348882 QAT: https://qat.redports.org/buildarchive/r348882/ Log: - Move commands from files/pkg-install.in into post-install - Kill files/ PR: ports/187535 (second half) Submitted by: Johannes Jost Meixner Deleted: head/java/linux-sun-jdk17/files/ Modified: head/java/linux-sun-jdk17/Makefile Modified: head/java/linux-sun-jdk17/Makefile ============================================================================== --- head/java/linux-sun-jdk17/Makefile Sun Mar 23 19:38:31 2014 (r348881) +++ head/java/linux-sun-jdk17/Makefile Sun Mar 23 19:43:08 2014 (r348882) @@ -22,7 +22,6 @@ PKGNAMESUFFIX= 17 WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} -PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes USE_LINUX= yes @@ -90,9 +89,10 @@ do-install: .endfor post-install: - @${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g; \ - s:%%STAGEDIR%%:${STAGEDIR}:g" \ - < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${MKDIR} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs + ${TOUCH} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.system.lock + ${TOUCH} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.systemRootModFile + ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.system.lock + ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.systemRootModFile .include