diff options
| author | swills <swills@FreeBSD.org> | 2014-03-24 03:43:08 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2014-03-24 03:43:08 +0800 |
| commit | 7c80d7bdd86e1f47370b5a80238e9b91ee6bd1b6 (patch) | |
| tree | be00634ff5cd536b6cf70b42c9d82f60bd13f23a /java | |
| parent | 6a847ae3141e3a8431c4c10093eacc03649e2634 (diff) | |
| download | freebsd-ports-gnome-7c80d7bdd86e1f47370b5a80238e9b91ee6bd1b6.tar.gz freebsd-ports-gnome-7c80d7bdd86e1f47370b5a80238e9b91ee6bd1b6.tar.zst freebsd-ports-gnome-7c80d7bdd86e1f47370b5a80238e9b91ee6bd1b6.zip | |
- Move commands from files/pkg-install.in into post-install
- Kill files/
PR: ports/187535 (second half)
Submitted by: Johannes Jost Meixner <xmj@chaot.net>
Diffstat (limited to 'java')
| -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 |