Date: Thu, 13 Mar 2014 16:54:11 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: java@FreeBSD.org Subject: ports/187536: [PATCH] java/linux-sun-jdk16: Stage Message-ID: <1941884279111540884.enqueue@mx12.chaot.net> Resent-Message-ID: <201403131500.s2DF00LR045545@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187536
>Category: ports
>Synopsis: [PATCH] java/linux-sun-jdk16: Stage
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 13 15:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Johannes Jost Meixner
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar 9 15:34:03 EET
>Description:
- Stage
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-jdk16-1.6.0.45.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348077)
+++ Makefile (working copy)
@@ -27,6 +27,7 @@
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 @@
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 @@
# 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
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-jdk16-1.6.0.45.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1941884279111540884.enqueue>