From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 13 15:00:01 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 C88B19D0 for ; Thu, 13 Mar 2014 15:00:01 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A78331AD for ; Thu, 13 Mar 2014 15:00:01 +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 s2DF01sI045570 for ; Thu, 13 Mar 2014 15:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2DF01Ve045569; Thu, 13 Mar 2014 15:00:01 GMT (envelope-from gnats) Resent-Date: Thu, 13 Mar 2014 15:00:01 GMT Resent-Message-Id: <201403131500.s2DF01Ve045569@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, Johannes Jost Meixner 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 20515556; Thu, 13 Mar 2014 14:53:11 +0000 (UTC) Received: from dd16522.kasserver.com (dd16522.kasserver.com [85.13.137.124]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D8CDE129; Thu, 13 Mar 2014 14:53:10 +0000 (UTC) Received: from mx12.chaot.net (82.131.85.135.cable.starman.ee [82.131.85.135]) by dd16522.kasserver.com (Postfix) with ESMTPSA id 595258D4013; Thu, 13 Mar 2014 15:53:01 +0100 (CET) Received: from localhost (1003@localhost [local]); by localhost (OpenSMTPD) with ESMTPA id 0a9c1257; Thu, 13 Mar 2014 16:53:00 +0200 (EET) Message-Id: <15972966414163358595.enqueue@mx12.chaot.net> Date: Thu, 13 Mar 2014 16:52:59 +0200 (EET) From: Johannes Jost Meixner To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187538: [PATCH] java/linux-sun-jre16: Stage Cc: java@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Mar 2014 15:00:01 -0000 >Number: 187538 >Category: ports >Synopsis: [PATCH] java/linux-sun-jre16: Stage >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: Thu Mar 13 15:00:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar 9 15:34:03 EET >Description: - StageDir Port maintainer (java@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- linux-sun-jre16-1.6.0.45.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348075) +++ Makefile (working copy) @@ -34,7 +34,6 @@ PACKED_JARS= lib/charsets lib/deploy lib/ext/localedata lib/javaws lib/jsse lib/plugin lib/rt UNPACK_CMD= ${WRKSRC}/bin/unpack200 -NO_STAGE= yes .include .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) @@ -56,18 +55,18 @@ post-patch: ${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/bin/jcontrol - @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f + @${FIND} ${WRKSRC} -name '*.orig' -delete # XXX: This is missing a "${BRANDELF} -t Linux ". do-install: - ${MKDIR} ${APP_HOME} + ${MKDIR} ${STAGEDIR}${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${APP_HOME} + | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME} post-install: - ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JRE${PORTVERSION}" - ${SED} -e "s:%%JRE_HOME%%:${APP_HOME}:g" \ + ${SED} -e "s:%%JRE_HOME%%:${APP_HOME}:g; \ + s:%%STAGEDIR%%:${STAGEDIR}:" \ < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (revision 348075) +++ files/pkg-install.in (working copy) @@ -5,15 +5,15 @@ # Set up system preferences during post install if [ "$2" = "POST-INSTALL" ]; then - if [ ! -d "${PREFS_LOCATION}/.systemPrefs" ] ; then - mkdir -m 755 "${PREFS_LOCATION}/.systemPrefs" + if [ ! -d "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs" ] ; then + mkdir -m 755 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs" fi - if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.system.lock" ] ; then - touch "${PREFS_LOCATION}/.systemPrefs/.system.lock" - chmod 644 "${PREFS_LOCATION}/.systemPrefs/.system.lock" + if [ ! -f "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.system.lock" ] ; then + touch "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.system.lock" + chmod 644 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.system.lock" fi - if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then - touch "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" - chmod 644 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + if [ ! -f "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then + touch "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + chmod 644 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" fi fi --- linux-sun-jre16-1.6.0.45.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: