freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Move commands from files/pkg-install.in into post-install

Browse Source 
- Kill files/

PR:		ports/187537 (second half)
Submitted by:	Johannes Jost Meixner <xmj@chaot.net>
This commit is contained in:
Steve Wills
2014-03-23 19:43:54 +00:00
parent 20c08e16d1
commit d65be6ab55
2 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/linux-sun-jre17/Makefile
+5 -5
View File
@@ -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>
java/linux-sun-jre17/files/pkg-install.in
-19
View File
@@ -1,19 +0,0 @@
#!/bin/sh
# System preference location
PREFS_LOCATION=%%JRE_HOME%%
# Set up system preferences during post install
if [ "$2" = "POST-INSTALL" ]; then
if [ ! -d "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs" ] ; then
mkdir -m 755 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs"
fi
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 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then
touch "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile"
chmod 644 "%%STAGEDIR%%${PREFS_LOCATION}/.systemPrefs/.systemRootModFile"
fi
fi