Attachment 6543 Details for Bug 14760 – file.diff

[patch] file.diff

file.diff (text/plain), 3.27 KB, created by reg on 1999-11-07 10:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: reg

Created: 1999-11-07 10:20:02 UTC

Size: 3.27 KB

patch

obsolete

>Index: bsd.port.mk
>===================================================================
>RCS file: /usr/home/ncvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.323
>diff -u -r1.323 bsd.port.mk
>--- bsd.port.mk	1999/10/10 17:19:49	1.323
>+++ bsd.port.mk	1999/11/07 10:17:07
>@@ -2328,24 +2499,32 @@
> 
> .endif
> 
>+# Clean dependency lists: build and runtime.  Print out directory names.
>+
>+clean-depends-list:
>+	@${CLEAN-DEPENDS-LIST}
>+
>+CLEAN-DEPENDS-LIST= \
>+	checked="${PARENT_CHECKED}"; \
>+	for dir in $$(${ECHO} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \
>+		if [ -d $$dir ]; then \
>+			if (${ECHO} $$checked | ${GREP} -qwv "$$dir"); then \
>+				child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" clean-depends-list); \
>+				for d in $$child; do ${ECHO} $$d; done; \
>+				${ECHO} $$dir; \
>+				checked="$$dir $$child $$checked"; \
>+			fi; \
>+		else \
>+			${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
>+		fi; \
>+	done | sort -u
>+
> .if !target(clean-depends)
> clean-depends:
>-.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) \
>-	|| defined(RUN_DEPENDS)
>-	@for dir in `${ECHO} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u`; do \
>-		if [ -d $$dir ] ; then \
>-			(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean clean-depends); \
>-		fi \
>-	done
>-.endif
>-.if defined(DEPENDS)
>-	@for dir in `${ECHO} "${DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \
>-		if [ -d $$dir ] ; then \
>-			(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean clean-depends); \
>-		fi \
>+	@for dir in `${CLEAN-DEPENDS-LIST}`; do \
>+		(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \
> 	done
> .endif
>-.endif
> 
> # Dependency lists: build and runtime.  Print out directory names.
> 
>@@ -2373,14 +2552,29 @@
> 		fi; \
> 	done | sort -u
> 
>-# This one does not print out directory names -- it could take a long time.
>-package-depends:
>-	@for dir in `${ECHO} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u` `${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \
>+# Clean dependency lists: build and runtime.  Print out directory names.
>+
>+package-depends-list:
>+	@${PACKAGE-DEPENDS-LIST}
>+
>+PACKAGE-DEPENDS-LIST= \
>+	checked="${PARENT_CHECKED}"; \
>+	for dir in $$(${ECHO} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \
> 		if [ -d $$dir ]; then \
>-			(cd $$dir ; ${MAKE} package-name package-depends); \
>+			if (${ECHO} $$checked | ${GREP} -qwv "$$dir"); then \
>+				child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" package-depends-list); \
>+				for d in $$child; do ${ECHO} $$d; done; \
>+				${ECHO} $$dir; \
>+				checked="$$dir $$child $$checked"; \
>+			fi; \
> 		else \
> 			${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
> 		fi; \
>+	done | sort -u
>+
>+package-depends:
>+	@for dir in `${PACKAGE-DEPENDS-LIST}`; do \
>+		(cd $$dir; ${MAKE} package-name); \
> 	done
> 
> ################################################################

Actions: View | Diff

Attachments on bug 14760: 6543