svn commit: r348662 - in head/java/linux-sun-jdk17: . files

[Steve Wills]

Author: swills
Date: Thu Mar 20 03:41:04 2014
New Revision: 348662
URL: http://svnweb.freebsd.org/changeset/ports/348662
QAT: https://qat.redports.org/buildarchive/r348662/

Log:
  - Stagify
  
  PR:		ports/187535
  Submitted by:	Johannes Jost Meixner <xmj at chaot.net>

Modified:
  head/java/linux-sun-jdk17/Makefile
  head/java/linux-sun-jdk17/files/pkg-install.in

Modified: head/java/linux-sun-jdk17/Makefile
==============================================================================
--- head/java/linux-sun-jdk17/Makefile	Thu Mar 20 03:39:48 2014	(r348661)
+++ head/java/linux-sun-jdk17/Makefile	Thu Mar 20 03:41:04 2014	(r348662)
@@ -39,7 +39,6 @@ APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PO
 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 @@ post-patch:
 	@(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
 

Modified: head/java/linux-sun-jdk17/files/pkg-install.in
==============================================================================
--- head/java/linux-sun-jdk17/files/pkg-install.in	Thu Mar 20 03:39:48 2014	(r348661)
+++ head/java/linux-sun-jdk17/files/pkg-install.in	Thu Mar 20 03:41:04 2014	(r348662)
@@ -5,15 +5,15 @@ PREFS_LOCATION=%%JRE_HOME%%
 
 # 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