From owner-svn-ports-all@FreeBSD.ORG Sun Mar 23 22:27:21 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 EF5ED27F; Sun, 23 Mar 2014 22:27:21 +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 C2778D36; Sun, 23 Mar 2014 22:27:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NMRLhi030257; Sun, 23 Mar 2014 22:27:21 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NMRLVM030256; Sun, 23 Mar 2014 22:27:21 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201403232227.s2NMRLVM030256@svn.freebsd.org> From: Steve Wills Date: Sun, 23 Mar 2014 22:27:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348895 - in head/java/linux-sun-jdk16: . 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 22:27:22 -0000 Author: swills Date: Sun Mar 23 22:27:21 2014 New Revision: 348895 URL: http://svnweb.freebsd.org/changeset/ports/348895 QAT: https://qat.redports.org/buildarchive/r348895/ Log: - Move commands from files/pkg-install.in into post-install - Kill files/ Submitted by: Johannes Jost Meixner (via irc) Deleted: head/java/linux-sun-jdk16/files/ Modified: head/java/linux-sun-jdk16/Makefile Modified: head/java/linux-sun-jdk16/Makefile ============================================================================== --- head/java/linux-sun-jdk16/Makefile Sun Mar 23 21:59:04 2014 (r348894) +++ head/java/linux-sun-jdk16/Makefile Sun Mar 23 22:27:21 2014 (r348895) @@ -24,7 +24,6 @@ PKGNAMESUFFIX= 16 WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} -PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes USES= shebangfix @@ -48,13 +47,13 @@ IGNORE?=You must manually fetch the J2SE .include .if ${PORT_OPTIONS:MDEMO} -DEMO_UPDATE_VERSION= ${JDK_REVISION} +DEMO_UPDATE_VERSION= ${JDK_REVISION} .if ${DEMO_UPDATE_VERSION} != ${JDK_REVISION} DEMO_DISTNAME= jdk-6u${DEMO_UPDATE_VERSION}-linux-i586-demos -DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_VERSION}_${DEMO_UPDATE_VERSION} +DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_VERSION}_${DEMO_UPDATE_VERSION} .else -DEMO_DISTNAME= ${DISTNAME}-demos -DEMO_WRKSRC= ${WRKSRC} +DEMO_DISTNAME= ${DISTNAME}-demos +DEMO_WRKSRC= ${WRKSRC} .endif .if !exists(${DISTDIR}/${DEMO_DISTNAME}.tar.gz) IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again @@ -100,9 +99,10 @@ do-install: | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME} 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