diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2003-10-11 05:39:21 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2003-10-11 05:39:21 +0000 |
| commit | 42189f5a5d603e3cd08ac794a485455f64da2413 (patch) | |
| tree | 3aaebb9ecc4c9466bc0df24d29dd7296ea36f4cc /java/linux-sun-jdk14 | |
| parent | Fix English (diff) | |
. Install system preferences during post-install to avoid annoying error
messages.
Notes
Notes:
svn path=/head/; revision=90832
Diffstat (limited to 'java/linux-sun-jdk14')
| -rw-r--r-- | java/linux-sun-jdk14/Makefile | 7 | ||||
| -rw-r--r-- | java/linux-sun-jdk14/files/pkg-install.in | 19 | ||||
| -rw-r--r-- | java/linux-sun-jdk14/pkg-plist | 3 |
3 files changed, 28 insertions, 1 deletions
diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 3ca4219504ee..752a7bcbacac 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${INSTALL_JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -71,6 +71,11 @@ do-install: ${RM} -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack; \ fi \ done + +post-install: ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}" + ${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g" \ + < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/java/linux-sun-jdk14/files/pkg-install.in b/java/linux-sun-jdk14/files/pkg-install.in new file mode 100644 index 000000000000..fa980a9778f0 --- /dev/null +++ b/java/linux-sun-jdk14/files/pkg-install.in @@ -0,0 +1,19 @@ +#!/bin/sh + +# System preference location +PREFS_LOCATION=%%JRE_HOME%% + +# Set up system preferences during post install +if [ "$2" = "POST-INSTALL" ]; then + if [ ! -d "${PREFS_LOCATION}/.systemPrefs" ] ; then + mkdir -m 755 "${PREFS_LOCATION}/.systemPrefs" + fi + if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.system.lock" ] ; then + touch "${PREFS_LOCATION}/.systemPrefs/.system.lock" + chmod 644 "${PREFS_LOCATION}/.systemPrefs/.system.lock" + fi + if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then + touch "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + chmod 644 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + fi +fi diff --git a/java/linux-sun-jdk14/pkg-plist b/java/linux-sun-jdk14/pkg-plist index a5cdd5359b74..7f26db2c8742 100644 --- a/java/linux-sun-jdk14/pkg-plist +++ b/java/linux-sun-jdk14/pkg-plist @@ -883,6 +883,8 @@ %%T%%/include/jvmpi.h %%T%%/include/linux/jawt_md.h %%T%%/include/linux/jni_md.h +%%T%%/jre/.systemPrefs/.system.lock +%%T%%/jre/.systemPrefs/.systemRootModFile %%T%%/jre/CHANGES %%T%%/jre/COPYRIGHT %%T%%/jre/ControlPanel.html @@ -1589,6 +1591,7 @@ @dirrm %%T%%/jre/javaws/resources @dirrm %%T%%/jre/javaws @dirrm %%T%%/jre/bin +@dirrm %%T%%/jre/.systemPrefs @dirrm %%T%%/jre @dirrm %%T%%/include/linux @dirrm %%T%%/include |