Bug 187537
| Summary: | [PATCH] java/linux-sun-jre17: Stage | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Johannes Meixner <xmj> | ||||||
| Component: | Individual Port(s) | Assignee: | Steve Wills <swills> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | CC: | java | ||||||
| Priority: | Normal | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
Johannes Meixner
2014-03-13 15:00:01 UTC
Responsible Changed From-To: freebsd-ports-bugs->freebsd-java Over to maintainer (via the GNATS Auto Assign Tool) Description: - Stagfiy - work files/pkg-install.in into post-install - Kill files/ Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN) Responsible Changed From-To: freebsd-java->swills I'll take it. Author: swills Date: Thu Mar 20 03:39:48 2014 New Revision: 348661 URL: http://svnweb.freebsd.org/changeset/ports/348661 QAT: https://qat.redports.org/buildarchive/r348661/ Log: - Stagify PR: ports/187537 Submitted by: Johannes Jost Meixner <xmj@chaot.net> Modified: head/java/linux-sun-jre17/Makefile head/java/linux-sun-jre17/files/pkg-install.in Modified: head/java/linux-sun-jre17/Makefile ============================================================================== --- head/java/linux-sun-jre17/Makefile Thu Mar 20 03:36:25 2014 (r348660) +++ head/java/linux-sun-jre17/Makefile Thu Mar 20 03:39:48 2014 (r348661) @@ -35,7 +35,6 @@ APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PO 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 @@ post-patch: @${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 Modified: head/java/linux-sun-jre17/files/pkg-install.in ============================================================================== --- head/java/linux-sun-jre17/files/pkg-install.in Thu Mar 20 03:36:25 2014 (r348660) +++ head/java/linux-sun-jre17/files/pkg-install.in Thu Mar 20 03:39:48 2014 (r348661) @@ -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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed. Thanks! Author: swills Date: Sun Mar 23 19:43:54 2014 New Revision: 348883 URL: http://svnweb.freebsd.org/changeset/ports/348883 QAT: https://qat.redports.org/buildarchive/r348883/ Log: - Move commands from files/pkg-install.in into post-install - Kill files/ PR: ports/187537 (second half) Submitted by: Johannes Jost Meixner <xmj@chaot.net> Deleted: head/java/linux-sun-jre17/files/ Modified: head/java/linux-sun-jre17/Makefile Modified: head/java/linux-sun-jre17/Makefile ============================================================================== --- head/java/linux-sun-jre17/Makefile Sun Mar 23 19:43:08 2014 (r348882) +++ head/java/linux-sun-jre17/Makefile Sun Mar 23 19:43:54 2014 (r348883) @@ -18,7 +18,6 @@ PKGNAMESUFFIX= 17 WRKSRC= ${WRKDIR}/jre${DL_JRE_VERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} -PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes USE_LINUX= yes @@ -59,9 +58,10 @@ do-install: .endfor post-install: - @${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 + ${MKDIR} ${STAGEDIR}${APP_HOME}/.systemPrefs + ${TOUCH} ${STAGEDIR}${APP_HOME}/.systemPrefs/.system.lock + ${TOUCH} ${STAGEDIR}${APP_HOME}/.systemPrefs/.systemRootModFile + ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/.systemPrefs/.system.lock + ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/.systemPrefs/.systemRootModFile .include <bsd.port.post.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" |
