Attachment 140827 Details for Bug 187537 – linux-sun-jre17-7.51.patch

[patch] linux-sun-jre17-7.51.patch

linux-sun-jre17-7.51.patch (text/plain), 2.53 KB, created by Johannes Meixner on 2014-03-13 15:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Meixner

Created: 2014-03-13 15:00:01 UTC

Size: 2.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 348076)
>+++ Makefile	(working copy)
>@@ -35,7 +35,6 @@
> SCRIPT_FILES=	bin/jcontrol
> BIN_DIRS=	bin
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
>@@ -52,16 +51,16 @@
> 	@${FIND} ${WRKSRC} -name '*.orig' -delete
> 
> 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-JRE${PORTVERSION}"
>-	@${SED} -e "s:%%JRE_HOME%%:${APP_HOME}:g" \
>+	@${SED} -e "s:%%JRE_HOME%%:${APP_HOME}: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 348076)
>+++ 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

Actions: View | Diff

Attachments on bug 187537: 140827 | 140828