sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
- Kill files/

Submitted by:		Johannes Jost Meixner <xmj@chaot.net> (via irc)
This commit is contained in:
Steve Wills 2014-03-23 22:27:21 +00:00
parent fd6ff44be2
commit 02f21ee7d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=348895
2 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java/linux-sun-jdk16/Makefile
View file

@ -24,7 +24,6 @@ PKGNAMESUFFIX= 16
WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION} WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION}
PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes NO_BUILD= yes
USES= shebangfix USES= shebangfix
@ -48,13 +47,13 @@ IGNORE?=You must manually fetch the J2SE SDK self-extracting file for the Linux
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEMO} .if ${PORT_OPTIONS:MDEMO}
DEMO_UPDATE_VERSION= ${JDK_REVISION} DEMO_UPDATE_VERSION= ${JDK_REVISION}
.if ${DEMO_UPDATE_VERSION} != ${JDK_REVISION} .if ${DEMO_UPDATE_VERSION} != ${JDK_REVISION}
DEMO_DISTNAME= jdk-6u${DEMO_UPDATE_VERSION}-linux-i586-demos DEMO_DISTNAME= jdk-6u${DEMO_UPDATE_VERSION}-linux-i586-demos
DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_VERSION}_${DEMO_UPDATE_VERSION} DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_VERSION}_${DEMO_UPDATE_VERSION}
.else .else
DEMO_DISTNAME= ${DISTNAME}-demos DEMO_DISTNAME= ${DISTNAME}-demos
DEMO_WRKSRC= ${WRKSRC} DEMO_WRKSRC= ${WRKSRC}
.endif .endif
.if !exists(${DISTDIR}/${DEMO_DISTNAME}.tar.gz) .if !exists(${DISTDIR}/${DEMO_DISTNAME}.tar.gz)
IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
@ -100,9 +99,10 @@ do-install:
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME} | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME}
post-install: post-install:
${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g; \ ${MKDIR} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs
s:%%STAGEDIR%%:${STAGEDIR}:g" \ ${TOUCH} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.system.lock
< ${FILESDIR}/pkg-install.in > ${PKGINSTALL} ${TOUCH} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.systemRootModFile
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${CHMOD} 644 ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.system.lock
${CHMOD} 644 ${STAGEDIR}${APP_HOME}/jre/.systemPrefs/.systemRootModFile
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

19
java/linux-sun-jdk16/files/pkg-install.in
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