aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2014-03-23 22:27:53 +0000
committerSteve Wills <swills@FreeBSD.org>2014-03-23 22:27:53 +0000
commit4032c26e2ff87c0b80b46a7bf2623e1493d9854a (patch)
tree41dcf6354dab804e63d6979332eafd633f0c45cb /java
parent02f21ee7d90d70a0b0b3fa95afecb636ca96a51c (diff)
downloadports-4032c26e2ff87c0b80b46a7bf2623e1493d9854a.tar.gz
ports-4032c26e2ff87c0b80b46a7bf2623e1493d9854a.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/linux-sun-jre16/Makefile10
-rw-r--r--java/linux-sun-jre16/files/pkg-install.in19
2 files changed, 5 insertions, 24 deletions
diff --git a/java/linux-sun-jre16/Makefile b/java/linux-sun-jre16/Makefile
index 5c207af42c42..e2381ace96b0 100644
--- a/java/linux-sun-jre16/Makefile
+++ b/java/linux-sun-jre16/Makefile
@@ -20,7 +20,6 @@ PKGNAMESUFFIX= 16
WRKSRC= ${WRKDIR}/jre${DL_JRE_VERSION}
PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
-PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
USE_LINUX= yes
@@ -65,9 +64,10 @@ do-install:
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME}
post-install:
- ${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
+ ${MKDIR} ${STAGEDIR}${APP_HOME}/.systemPrefs
+ ${TOUCH} ${STAGEDIR}${APP_HOME}/.systemPrefs/.system.lock
+ ${TOUCH} ${STAGEDIR}${APP_HOME}/.systemPrefs/.systemRootModFile
+ ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/.systemPrefs/.system.lock
+ ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/.systemPrefs/.systemRootModFile
.include <bsd.port.post.mk>
diff --git a/java/linux-sun-jre16/files/pkg-install.in b/java/linux-sun-jre16/files/pkg-install.in
deleted file mode 100644
index ed297521cdca..000000000000
--- a/java/linux-sun-jre16/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