Attachment 52709 Details for Bug 79823 – file.diff

[patch] file.diff

file.diff (text/plain), 1.46 KB, created by Anton Berezin on 2005-04-12 14:00:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Berezin

Created: 2005-04-12 14:00:51 UTC

Size: 1.46 KB

patch

obsolete

>Index: bsd.port.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.511
>diff -u -r1.511 bsd.port.mk
>--- bsd.port.mk	17 Mar 2005 23:22:07 -0000	1.511
>+++ bsd.port.mk	12 Apr 2005 12:45:09 -0000
>@@ -4225,7 +4225,7 @@
> ${deptype:L}-depends:
> .if defined(${deptype}_DEPENDS)
> .if !defined(NO_DEPENDS)
>-	@for i in ${${deptype}_DEPENDS}; do \
>+	@for i in `${ECHO_CMD} "${${deptype}_DEPENDS}"`; do \
> 		prog=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \
> 		dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \
> 		if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
>@@ -4254,7 +4254,21 @@
> 				notfound=1; \
> 			fi; \
> 		else \
>-			if ${WHICH} "$$prog" > /dev/null 2>&1 ; then \
>+			pkg="`${ECHO_CMD} $$prog | ${SED} -e 's/^$.*$[>=<][>=<]*.*/\1/'`" ; \
>+			if [ "$$pkg" != "" ]; then \
>+				if ${PKG_INFO} "$$prog" > /dev/null 2>&1 ; then \
>+					${ECHO_MSG} "===>   ${PKGNAME} depends on package: $$prog - found"; \
>+					if [ ${_DEPEND_ALWAYS} = 1 ]; then \
>+						${ECHO_MSG} "       (but building it anyway)"; \
>+						notfound=1; \
>+					else \
>+						notfound=0; \
>+					fi; \
>+				else \
>+					${ECHO_MSG} "===>   ${PKGNAME} depends on package: $$prog - not found"; \
>+					notfound=1; \
>+				fi; \
>+			elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \
> 				${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - found"; \
> 				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
> 					${ECHO_MSG} "       (but building it anyway)"; \

Actions: View | Diff

Attachments on bug 79823: 52709