diff options
| author | Steve Wills <swills@FreeBSD.org> | 2014-03-23 19:48:09 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2014-03-23 19:48:09 +0000 |
| commit | 82047d34ad65486e79f9859b1a7171c0b6e7eda1 (patch) | |
| tree | 496f73f6b6eb585bf1a4a3e49f5f050d9411c2c8 | |
| parent | d65be6ab5538cee61a9a800ba4289ef9fdfb6ef5 (diff) | |
| download | ports-82047d34ad65486e79f9859b1a7171c0b6e7eda1.tar.gz ports-82047d34ad65486e79f9859b1a7171c0b6e7eda1.zip | |
Notes
| -rw-r--r-- | java/linux-sun-jdk16/Makefile | 10 | ||||
| -rw-r--r-- | java/linux-sun-jdk16/files/pkg-install.in | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile index 7033f1548f63..3993a5437cd4 100644 --- a/java/linux-sun-jdk16/Makefile +++ b/java/linux-sun-jdk16/Makefile @@ -27,6 +27,7 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USES= shebangfix USE_LINUX= yes USE_LINUX_APPS= xorglibs JDK_VERSION= 1.6.0 @@ -38,7 +39,6 @@ APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION} PACKED_JARS= jre/lib/charsets jre/lib/deploy jre/lib/ext/localedata jre/lib/javaws jre/lib/jsse jre/lib/plugin jre/lib/rt lib/tools UNPACK_CMD= ${WRKSRC}/bin/unpack200 -NO_STAGE= yes .include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) @@ -95,13 +95,13 @@ post-patch: # XXX: This is missing a "${BRANDELF} -t Linux <executables>". do-install: - ${MKDIR} ${APP_HOME} + ${MKDIR} ${STAGEDIR}${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${APP_HOME} + | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME} post-install: - ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}" - ${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g" \ + ${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 diff --git a/java/linux-sun-jdk16/files/pkg-install.in b/java/linux-sun-jdk16/files/pkg-install.in index fa980a9778f0..ed297521cdca 100644 --- a/java/linux-sun-jdk16/files/pkg-install.in +++ b/java/linux-sun-jdk16/files/pkg-install.in @@ -5,15 +5,15 @@ 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" + if [ ! -d "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs" ] ; then + mkdir -m 755 "%%STAGEDIR%%${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" + 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 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then - touch "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" - chmod 644 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + if [ ! -f "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then + touch "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + chmod 644 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" fi fi |