Date: Thu, 13 Mar 2014 16:54:42 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: java@FreeBSD.org Subject: [PATCH] java/linux-sun-jdk17: Stage Message-ID: <16026924054486911011.enqueue@mx12.chaot.net>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Johannes Jost Meixner
>Organization: Goldener Grund OUe
>Confidential: no
>Synopsis: [PATCH] java/linux-sun-jdk17: Stage
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 11.0-CURRENT amd64
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar 9 15:34:03 EET
>Description:
- Stagify
Port maintainer (java@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- linux-sun-jdk17-7.51.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348077)
+++ Makefile (working copy)
@@ -39,7 +39,6 @@
SCRIPT_FILES= bin/jcontrol jre/bin/jcontrol
BIN_DIRS= bin jre/bin
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -83,16 +82,16 @@
@(cd ${WRKSRC}/include; ${LN} -s linux freebsd)
do-install:
- @${MKDIR} ${APP_HOME}
- @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${APP_HOME}
+ @${MKDIR} ${STAGEDIR}${APP_HOME}
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
.for dir in ${BIN_DIRS}
- @${CHOWN} -R ${BINOWN}:${BINGRP} "${APP_HOME}/${dir}"
- @${FIND} ${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \;
+ @${CHOWN} -R ${BINOWN}:${BINGRP} "${STAGEDIR}${APP_HOME}/${dir}"
+ @${FIND} ${STAGEDIR}${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \;
.endfor
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
Index: files/pkg-install.in
===================================================================
--- files/pkg-install.in (revision 348077)
+++ files/pkg-install.in (working copy)
@@ -5,15 +5,15 @@
# 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
--- linux-sun-jdk17-7.51.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?16026924054486911011.enqueue>