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

- Remove unnecessary use of chown to make it more staging friendly. [1]

Browse source 
- Use USES=shebangfix instead of rolling our own.  Simplify and clean up.

Reported by:	Andrzej Tobola (ato at iem dot pw dot edu dot pl)
This commit is contained in:
Jung-uk Kim 2014-04-18 21:40:32 +00:00
parent 73aaed137f
commit a08a97b36f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=351570
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
java/linux-sun-jdk17/Makefile
View file

@ -26,6 +26,7 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
NO_BUILD= yes
USE_LINUX= yes
USE_LINUX_APPS= xorglibs
USES= shebangfix
ONLY_FOR_ARCHS= i386 amd64
JDK_VERSION= 7
@ -35,8 +36,10 @@ DL_JDK_VERSION= ${JDK_INTERNAL_VERSION}_${JDK_UPDATE_VERSION}
DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html
APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION}
SCRIPT_FILES= bin/jcontrol jre/bin/jcontrol
BIN_DIRS= bin jre/bin
LIB_DIRS= ${BIN_DIRS:S|bin$|lib|}
SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|}
bash_CMD= ${SH}
.include <bsd.port.pre.mk>
@ -74,19 +77,13 @@ post-extract:
.endif
post-patch:
.for script in ${SCRIPT_FILES}
@${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/${script}
.endfor
@${FIND} ${WRKSRC} -name '*.orig' -delete
@(cd ${WRKSRC}/include; ${LN} -s linux freebsd)
do-install:
@${MKDIR} ${STAGEDIR}${APP_HOME}
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
.for dir in ${BIN_DIRS}
@${CHOWN} -R ${BINOWN}:${BINGRP} "${STAGEDIR}${APP_HOME}/${dir}"
@${FIND} ${STAGEDIR}${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \;
.endfor
@cd ${STAGEDIR}${APP_HOME} && \
${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
post-install:
${MKDIR} ${STAGEDIR}${APP_HOME}/jre/.systemPrefs

17
java/linux-sun-jre17/Makefile
View file

@ -22,6 +22,7 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
NO_BUILD= yes
USE_LINUX= yes
USE_LINUX_APPS= xorglibs
USES= shebangfix
ONLY_FOR_ARCHS= i386 amd64
JRE_VERSION= 7
@ -31,8 +32,10 @@ DL_JRE_VERSION= ${JRE_INTERNAL_VERSION}_${JRE_UPDATE_VERSION}
DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html
APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JRE_INTERNAL_VERSION}
SCRIPT_FILES= bin/jcontrol
BIN_DIRS= bin
LIB_DIRS= ${BIN_DIRS:S|bin$|lib|}
SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|}
bash_CMD= ${SH}
.include <bsd.port.pre.mk>
@ -43,19 +46,11 @@ IGNORE?=You must manually fetch the J2SE RE download for the Linux platform (${D
pre-everything::
@${CAT} ${PKGMESSAGE}
post-patch:
.for script in ${SCRIPT_FILES}
@${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/${script}
.endfor
@${FIND} ${WRKSRC} -name '*.orig' -delete
do-install:
@${MKDIR} ${STAGEDIR}${APP_HOME}
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
.for dir in ${BIN_DIRS}
@${CHOWN} -R ${BINOWN}:${BINGRP} "${STAGEDIR}${APP_HOME}/${dir}"
@${FIND} ${STAGEDIR}${APP_HOME}/${dir} -type f -exec "${CHMOD}" ${BINMODE} "{}" \;
.endfor
@cd ${STAGEDIR}${APP_HOME} && \
${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
post-install:
${MKDIR} ${STAGEDIR}${APP_HOME}/.systemPrefs