View | Details | Raw Unified | Return to bug 165623
Collapse All | Expand All

(-)Mk/bsd.commands.mk (-1 / +1 lines)
Lines 39-45 Link Here
39
EGREP?=		/usr/bin/egrep
39
EGREP?=		/usr/bin/egrep
40
EXPR?=		/bin/expr
40
EXPR?=		/bin/expr
41
FALSE?=		false				# Shell builtin
41
FALSE?=		false				# Shell builtin
42
FILE?=		/usr/bin/file
42
FILE_CMD?=		/usr/bin/file	# FILE is a commonly used variable
43
FIND?=		/usr/bin/find
43
FIND?=		/usr/bin/find
44
FLEX?=		/usr/bin/flex
44
FLEX?=		/usr/bin/flex
45
FMT?=		/usr/bin/fmt
45
FMT?=		/usr/bin/fmt
(-)Mk/bsd.linux-rpm.mk (-1 / +1 lines)
Lines 187-193 Link Here
187
do-install:
187
do-install:
188
.	if ${BRANDELF_DIRS}
188
.	if ${BRANDELF_DIRS}
189
		@cd ${WRKSRC} && ${FIND} ${BRANDELF_DIRS} -type f -print0 \
189
		@cd ${WRKSRC} && ${FIND} ${BRANDELF_DIRS} -type f -print0 \
190
		| ${XARGS} -0 ${FILE} | ${GREP} ELF | ${CUT} -d : -f 1 \
190
		| ${XARGS} -0 ${FILE_CMD} | ${GREP} ELF | ${CUT} -d : -f 1 \
191
		| ${XARGS} ${BRANDELF} -t Linux
191
		| ${XARGS} ${BRANDELF} -t Linux
192
.	endif
192
.	endif
193
.	if ${BRANDELF_FILES}
193
.	if ${BRANDELF_FILES}
(-)emulators/linux_base-f10/Makefile (-1 / +1 lines)
Lines 190-196 Link Here
190
#	@${CHMOD} u+w ${WRKSRC}/usr/bin/*db4*
190
#	@${CHMOD} u+w ${WRKSRC}/usr/bin/*db4*
191
191
192
	@${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \
192
	@${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \
193
		${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \
193
		${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE_CMD} \
194
		| ${GREP} ELF | ${CUT} -d : -f 1 \
194
		| ${GREP} ELF | ${CUT} -d : -f 1 \
195
		| ${XARGS} ${BRANDELF} -t Linux
195
		| ${XARGS} ${BRANDELF} -t Linux
196
	@${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.9.so
196
	@${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.9.so
(-)emulators/linux_base-fc4/Makefile (-1 / +1 lines)
Lines 167-173 Link Here
167
	@${CHMOD} u+w ${WRKSRC}/usr/bin/*db4*
167
	@${CHMOD} u+w ${WRKSRC}/usr/bin/*db4*
168
168
169
	@${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \
169
	@${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \
170
		${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \
170
		${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE_CMD} \
171
		| ${GREP} ELF | ${CUT} -d : -f 1 \
171
		| ${GREP} ELF | ${CUT} -d : -f 1 \
172
		| ${XARGS} ${BRANDELF} -t Linux
172
		| ${XARGS} ${BRANDELF} -t Linux
173
	@${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.3.6.so
173
	@${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.3.6.so
(-)emulators/linux_dist-gentoo-stage3/Makefile (-1 / +1 lines)
Lines 107-113 Link Here
107
	@${CP} -p /etc/resolv.conf ${PREFIX}/${PREFIX_SUBDIR}/etc/
107
	@${CP} -p /etc/resolv.conf ${PREFIX}/${PREFIX_SUBDIR}/etc/
108
	@${FIND} ${PREFIX}/${PREFIX_SUBDIR}bin ${PREFIX}/${PREFIX_SUBDIR}sbin/ \
108
	@${FIND} ${PREFIX}/${PREFIX_SUBDIR}bin ${PREFIX}/${PREFIX_SUBDIR}sbin/ \
109
		${PREFIX}/${PREFIX_SUBDIR}usr/bin ${PREFIX}/${PREFIX_SUBDIR}/usr/sbin \
109
		${PREFIX}/${PREFIX_SUBDIR}usr/bin ${PREFIX}/${PREFIX_SUBDIR}/usr/sbin \
110
		-type f -print0 | ${XARGS} -0 ${FILE} \
110
		-type f -print0 | ${XARGS} -0 ${FILE_CMD} \
111
		| ${GREP} ELF | ${CUT} -d : -f 1 | ${XARGS} ${BRANDELF} -t Linux
111
		| ${GREP} ELF | ${CUT} -d : -f 1 | ${XARGS} ${BRANDELF} -t Linux
112
	@${BRANDELF} -t Linux ${PREFIX}/${PREFIX_SUBDIR}/lib/ld-*.so
112
	@${BRANDELF} -t Linux ${PREFIX}/${PREFIX_SUBDIR}/lib/ld-*.so
113
	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
113
	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
(-)games/doom-data/Makefile.include (-1 / +1 lines)
Lines 25-31 Link Here
25
.   else
25
.   else
26
pre-patch:
26
pre-patch:
27
	@${FIND} ${WRKDIR} -type f -print0 | \
27
	@${FIND} ${WRKDIR} -type f -print0 | \
28
		${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
28
		${XARGS} -0 ${FILE_CMD} | ${GREP} 'CRLF' | \
29
		${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
29
		${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
30
		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
30
		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
31
.   endif
31
.   endif
(-)games/linux-enemyterritory-etpub/Makefile (-1 / +1 lines)
Lines 39-45 Link Here
39
39
40
pre-patch:
40
pre-patch:
41
	@${FIND} ${WRKSRC} -type f -exec ${SH} -c \
41
	@${FIND} ${WRKSRC} -type f -exec ${SH} -c \
42
		'${FILE} "$$0" | ${GREP} -q text && \
42
		'${FILE_CMD} "$$0" | ${GREP} -q text && \
43
		${REINPLACE_CMD} -i "" -e "s/
$$//" "$$0"' {} \;
43
		${REINPLACE_CMD} -i "" -e "s/
$$//" "$$0"' {} \;
44
44
45
do-build:
45
do-build:
(-)games/quake-source/Makefile (-1 / +1 lines)
Lines 38-44 Link Here
38
.endif
38
.endif
39
39
40
pre-patch:
40
pre-patch:
41
	@${FIND} ${WRKSRC} -type f | ${XARGS} ${FILE} | \
41
	@${FIND} ${WRKSRC} -type f | ${XARGS} ${FILE_CMD} | \
42
		${GREP} 'CRLF' | ${SED} -e 's/:.*//' | \
42
		${GREP} 'CRLF' | ${SED} -e 's/:.*//' | \
43
		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
43
		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
44
44
(-)games/quake3-data/Makefile.include (-1 / +1 lines)
Lines 25-31 Link Here
25
.   else
25
.   else
26
pre-patch:
26
pre-patch:
27
	@${FIND} ${WRKDIR} -type f -print0 | \
27
	@${FIND} ${WRKDIR} -type f -print0 | \
28
		${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
28
		${XARGS} -0 ${FILE_CMD} | ${GREP} 'CRLF' | \
29
		${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
29
		${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
30
		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
30
		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
31
.   endif
31
.   endif
(-)science/afni/Makefile (-1 / +1 lines)
Lines 104-110 Link Here
104
	${MV}	${INSTALL_WRKSRC}/README* \
104
	${MV}	${INSTALL_WRKSRC}/README* \
105
		${STAGE}/doc
105
		${STAGE}/doc
106
	${MV}	${INSTALL_WRKSRC}/abut ${INSTALL_WRKSRC}/afni_abut
106
	${MV}	${INSTALL_WRKSRC}/abut ${INSTALL_WRKSRC}/afni_abut
107
	for binary in `${FILE} ${INSTALL_WRKSRC}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
107
	for binary in `${FILE_CMD} ${INSTALL_WRKSRC}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
108
		${MV} $${binary} ${STAGE}/bin ; \
108
		${MV} $${binary} ${STAGE}/bin ; \
109
	done
109
	done
110
	${MV}	${INSTALL_WRKSRC}/* \
110
	${MV}	${INSTALL_WRKSRC}/* \
(-)sysutils/daemontools/Makefile (-1 / +1 lines)
Lines 84-90 Link Here
84
84
85
do-install:
85
do-install:
86
	(while read cmd; do \
86
	(while read cmd; do \
87
		if ${FILE} ${WRKSRC}/$$cmd | ${GREP} -q "shell script"; then \
87
		if ${FILE_CMD} ${WRKSRC}/$$cmd | ${GREP} -q "shell script"; then \
88
			${INSTALL_SCRIPT} ${WRKSRC}/$$cmd ${PREFIX}/bin; \
88
			${INSTALL_SCRIPT} ${WRKSRC}/$$cmd ${PREFIX}/bin; \
89
		else \
89
		else \
90
			${INSTALL_PROGRAM} ${WRKSRC}/$$cmd ${PREFIX}/bin; \
90
			${INSTALL_PROGRAM} ${WRKSRC}/$$cmd ${PREFIX}/bin; \

Return to bug 165623