From owner-freebsd-java@FreeBSD.ORG  Thu Mar 13 14:54:44 2014
Return-Path: <owner-freebsd-java@FreeBSD.ORG>
Delivered-To: java@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 D7AD26F2;
 Thu, 13 Mar 2014 14:54:44 +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 9C733142;
 Thu, 13 Mar 2014 14:54:44 +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 BE8078D4013;
 Thu, 13 Mar 2014 15:54:42 +0100 (CET)
Received: from localhost (1003@localhost [local]);
 by localhost (OpenSMTPD) with ESMTPA id 339e6803;
 Thu, 13 Mar 2014 16:54:42 +0200 (EET)
Date: Thu, 13 Mar 2014 16:54:42 +0200 (EET)
Message-Id: <16026924054486911011.enqueue@mx12.chaot.net>
User-Agent: OpenSMTPD enqueuer (Demoostik)
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] java/linux-sun-jdk17: Stage
From: Johannes Jost Meixner <xmj@chaot.net>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Cc: java@FreeBSD.org
X-BeenThere: freebsd-java@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Porting Java to FreeBSD <freebsd-java.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-java>,
 <mailto:freebsd-java-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-java/>
List-Post: <mailto:freebsd-java@freebsd.org>
List-Help: <mailto:freebsd-java-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
 <mailto:freebsd-java-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Mar 2014 14:54:45 -0000


>Submitter-Id:	current-users
>Originator:	Johannes Jost Meixner
>Organization:	Goldener Grund OUe
>Confidential:	no 
>Synopsis:	[PATCH] java/linux-sun-jdk17: Stage
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 11.0-CURRENT amd64
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar  9 15:34:03 EET
>Description:
- Stagify

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-jdk17-7.51.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 348077)
+++ Makefile	(working copy)
@@ -39,7 +39,6 @@
 SCRIPT_FILES=	bin/jcontrol jre/bin/jcontrol
 BIN_DIRS=	bin jre/bin
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -83,16 +82,16 @@
 	@(cd ${WRKSRC}/include; ${LN} -s linux freebsd)
 
 do-install:
-	@${MKDIR} ${APP_HOME}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${APP_HOME}
+	@${MKDIR} ${STAGEDIR}${APP_HOME}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
 .for dir in ${BIN_DIRS}
-	@${CHOWN} -R ${BINOWN}:${BINGRP} "${APP_HOME}/${dir}"
-	@${FIND} ${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \;
+	@${CHOWN} -R ${BINOWN}:${BINGRP} "${STAGEDIR}${APP_HOME}/${dir}"
+	@${FIND} ${STAGEDIR}${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \;
 .endfor
 
 post-install:
-	${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}"
-	@${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g" \
+	@${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
 
Index: files/pkg-install.in
===================================================================
--- files/pkg-install.in	(revision 348077)
+++ 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-jdk17-7.51.patch ends here ---