Bug 187538

Comment 1 Edwin Groothuis 2014-03-13 15:00:13 UTC

Responsible Changed
From-To: freebsd-ports-bugs->freebsd-java

Over to maintainer (via the GNATS Auto Assign Tool)

Comment 2 Steve Wills 2014-03-23 19:44:47 UTC

Responsible Changed
From-To: freebsd-java->swills

I'll take it.

Comment 3 dfilter service 2014-03-23 19:51:04 UTC

Author: swills
Date: Sun Mar 23 19:50:59 2014
New Revision: 348885
URL: http://svnweb.freebsd.org/changeset/ports/348885
QAT: https://qat.redports.org/buildarchive/r348885/

Log:
  - Stage
  
  PR:		ports/187538
  Submitted by:	Johannes Jost Meixner <xmj@chaot.net>

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

Modified: head/java/linux-sun-jre16/Makefile
==============================================================================
--- head/java/linux-sun-jre16/Makefile	Sun Mar 23 19:48:09 2014	(r348884)
+++ head/java/linux-sun-jre16/Makefile	Sun Mar 23 19:50:59 2014	(r348885)
@@ -34,7 +34,6 @@ APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PO
 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 <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -56,18 +55,18 @@ do-extract:
 
 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 <executables>".
 
 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
 

Modified: head/java/linux-sun-jre16/files/pkg-install.in
==============================================================================
--- head/java/linux-sun-jre16/files/pkg-install.in	Sun Mar 23 19:48:09 2014	(r348884)
+++ head/java/linux-sun-jre16/files/pkg-install.in	Sun Mar 23 19:50:59 2014	(r348885)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 4 Steve Wills 2014-03-23 19:51:36 UTC

State Changed
From-To: open->closed

Committed. Thanks!