diff options
| -rw-r--r-- | java/linux-sun-jdk17/Makefile | 10 | ||||
| -rw-r--r-- | java/linux-sun-jdk17/files/pkg-install.in | 19 |
2 files changed, 5 insertions, 24 deletions
diff --git a/java/linux-sun-jdk17/Makefile b/java/linux-sun-jdk17/Makefile index a343eeb10efb..5a26b7035e92 100644 --- a/java/linux-sun-jdk17/Makefile +++ b/java/linux-sun-jdk17/Makefile @@ -22,7 +22,6 @@ PKGNAMESUFFIX= 17 WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} -PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes USE_LINUX= yes @@ -90,9 +89,10 @@ do-install: .endfor 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-jdk17/files/pkg-install.in b/java/linux-sun-jdk17/files/pkg-install.in deleted file mode 100644 index ed297521cdca..000000000000 --- a/java/linux-sun-jdk17/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 |