| From: | Hiroki Sato <hrs@xxxxxxxxxx> |
| Date: | Sun, 26 Dec 2004 21:04:55 +0900 (JST) |
Hi,
In bsd.port.mk rev.1.23 the dependency extraction routine
has been broken when a port override is used because redirection to
dfports does not preserve ${.MAKEFLAGS} (for example, "make clean"
does not work correctly now), and some essential targets for the
bulk build (such as make ignorelist and make package-name) have
become non-functional, too. I think a warning for use of dfports
should go to stderr since the output message needs to be kept
intact in some make targets.
A patch is attached.
--
| Hiroki SATO
Index: bsd.port.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 bsd.port.mk
--- bsd.port.mk 28 Nov 2004 22:29:19 -0000 1.23
+++ bsd.port.mk 26 Dec 2004 11:29:17 -0000
@@ -85,13 +85,14 @@
_DFPORTS_REDIRECT=
.if !make(package-depends-list) && !make(all-depends-list) && \
!make(run-depends-list) && !make(build-depends-list) && \
- !make(describe)
+ !make(describe) && !make(package-name) && \
+ !make(ignorelist)
.BEGIN:
- @echo "WARNING, USING DRAGONFLY OVERRIDE ${DFPORTSDIR}/${PORTPATH}"
- cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGETS}
+ @${ECHO_CMD} "WARNING, USING DRAGONFLY OVERRIDE ${DFPORTSDIR}/${PORTPATH}" 1>&2
+ @cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.MAKEFLAGS} ${.TARGETS}
.else
.BEGIN:
- @cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGETS}
+ @cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.MAKEFLAGS} ${.TARGETS}
.endif
.endif
Attachment:
pgp00001.pgp
Description: PGP signature