svn commit: r348895 - in head/java/linux-sun-jdk16: . files

[Steve Wills]

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 <xmj at chaot.net> (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 <bsd.port.options.mk>
 
 .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 <bsd.port.post.mk>