Date: Sun, 23 Mar 2014 19:48:09 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348884 - in head/java/linux-sun-jdk16: . files Message-ID: <201403231948.s2NJm9wA064591@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Mar 23 19:48:09 2014 New Revision: 348884 URL: http://svnweb.freebsd.org/changeset/ports/348884 QAT: https://qat.redports.org/buildarchive/r348884/ Log: - Stage PR: ports/187536 Submitted by: Johannes Jost Meixner <xmj@chaot.net> Modified: head/java/linux-sun-jdk16/Makefile head/java/linux-sun-jdk16/files/pkg-install.in Modified: head/java/linux-sun-jdk16/Makefile ============================================================================== --- head/java/linux-sun-jdk16/Makefile Sun Mar 23 19:43:54 2014 (r348883) +++ head/java/linux-sun-jdk16/Makefile Sun Mar 23 19:48:09 2014 (r348884) @@ -27,6 +27,7 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\// 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}${PO 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 Modified: head/java/linux-sun-jdk16/files/pkg-install.in ============================================================================== --- head/java/linux-sun-jdk16/files/pkg-install.in Sun Mar 23 19:43:54 2014 (r348883) +++ head/java/linux-sun-jdk16/files/pkg-install.in Sun Mar 23 19:48:09 2014 (r348884) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403231948.s2NJm9wA064591>