diff options
| author | Steve Wills <swills@FreeBSD.org> | 2014-03-23 22:27:21 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2014-03-23 22:27:21 +0000 |
| commit | 02f21ee7d90d70a0b0b3fa95afecb636ca96a51c (patch) | |
| tree | fb21cc76e1ecf6e063be226e07dae9180caf6a0d /java | |
| parent | fd6ff44be285b9139cdab60a3402ba15464b3114 (diff) | |
Notes
Diffstat (limited to 'java')
| -rw-r--r-- | java/linux-sun-jdk16/Makefile | 18 | ||||
| -rw-r--r-- | java/linux-sun-jdk16/files/pkg-install.in | 19 |
2 files changed, 9 insertions, 28 deletions
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile index 3993a5437cd4..6982f5713cf0 100644 --- a/java/linux-sun-jdk16/Makefile +++ b/java/linux-sun-jdk16/Makefile @@ -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 SDK self-extracting file for the Linux .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> diff --git a/java/linux-sun-jdk16/files/pkg-install.in b/java/linux-sun-jdk16/files/pkg-install.in deleted file mode 100644 index ed297521cdca..000000000000 --- a/java/linux-sun-jdk16/files/pkg-install.in +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# System preference location -PREFS_LOCATION=%%JRE_HOME%% - -# Set up system preferences during post install -if [ "$2" = "POST-INSTALL" ]; then - if [ ! -d "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs" ] ; then - mkdir -m 755 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs" - fi - 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 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then - touch "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" - chmod 644 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" - fi -fi |