Re: dfports override system broken?

[YONETANI Tomokazu <qhwt+dfly@xxxxxxxxxx>]

Hi.
On Thu, Nov 25, 2004 at 10:50:51AM -0800, walt wrote:
> walt wrote:
> >"/usr/share/mk/bsd.port.mk", line 85: warning: duplicate script for target
> >".BEGIN" ignored

Maybe just check to see if we already have special target .BEGIN
before adding it?

Index: bsd.port.mk
===================================================================
RCS file: /home/source/dragonfly/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.20
diff -u -r1.20 bsd.port.mk
--- bsd.port.mk	16 Nov 2004 20:09:26 -0000	1.20
+++ bsd.port.mk	25 Nov 2004 23:38:05 -0000
@@ -78,7 +78,8 @@
 TARGETS+=	tags
 
 .undef PORTSDIR
-.if !make(package-depends-list) && !make(all-depends-list) && \
+.if !target(.BEGIN) && \
+    !make(package-depends-list) && !make(all-depends-list) && \
     !make(run-depends-list) && !make(build-depends-list) && \
     !make(describe)
 .BEGIN:


> If we really want 'make' to warn about duplicate scripts I suppose
> we could teach portupgrade to ignore stderr.

Yes, go ahead :)