conf/137487: [PATCH] unbreak world WITHOUT_NETGRAPH

[bf]

>Number:         137487
>Category:       conf
>Synopsis:       [PATCH] unbreak world WITHOUT_NETGRAPH
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 06 15:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        8-BETA2 amd64
>Organization:
-
>Environment:
>Description:
WITHOUT_NETGRAPH=yes breaks the buildworld target when PPP_NO_NETGRAPH is not also defined:

..
mkdep -f .depend -a    -DNOINET6 -DNOATM /usr/src/usr.sbin/ppp/acf.c /usr/src/usr.sbin/ppp/arp.c /usr/src/usr.sbin/ppp/async.c /usr/src/usr.sbin/ppp/auth.c /usr/src/usr.sbin/ppp/bundle.c /usr/src/usr.sbin/ppp/cbcp.c /usr/src/usr.sbin/ppp/ccp.c /usr/src/usr.sbin/ppp/chap.c /usr/src/usr.sbin/ppp/chat.c /usr/src/usr.sbin/ppp/command.c /usr/src/usr.sbin/ppp/datalink.c /usr/src/usr.sbin/ppp/deflate.c /usr/src/usr.sbin/ppp/defs.c /usr/src/usr.sbin/ppp/exec.c /usr/src/usr.sbin/ppp/filter.c /usr/src/usr.sbin/ppp/fsm.c /usr/src/usr.sbin/ppp/hdlc.c /usr/src/usr.sbin/ppp/iface.c /usr/src/usr.sbin/ppp/ip.c /usr/src/usr.sbin/ppp/ipcp.c /usr/src/usr.sbin/ppp/ipv6cp.c /usr/src/usr.sbin/ppp/iplist.c /usr/src/usr.sbin/ppp/lcp.c /usr/src/usr.sbin/ppp/link.c /usr/src/usr.sbin/ppp/log.c /usr/src/usr.sbin/ppp/lqr.c /usr/src/usr.sbin/ppp/main.c /usr/src/usr.sbin/ppp/mbuf.c /usr/src/usr.sbin/ppp/mp.c /usr/src/usr.sbin/ppp/ncp.c /usr/src/usr.sbin/ppp/ncpaddr.c /usr/src/usr.sbin/ppp/pap.c /usr/src/us
 r.sbin/ppp/physical.c /usr/src/usr.sbin/ppp/pred.c /usr/src/usr.sbin/ppp/probe.c /usr/src/usr.sbin/ppp/prompt.c /usr/src/usr.sbin/ppp/proto.c /usr/src/usr.sbin/ppp/route.c /usr/src/usr.sbin/ppp/server.c /usr/src/usr.sbin/ppp/sig.c /usr/src/usr.sbin/ppp/slcompress.c /usr/src/usr.sbin/ppp/sync.c /usr/src/usr.sbin/ppp/systems.c /usr/src/usr.sbin/ppp/tcp.c /usr/src/usr.sbin/ppp/tcpmss.c /usr/src/usr.sbin/ppp/throughput.c /usr/src/usr.sbin/ppp/timer.c /usr/src/usr.sbin/ppp/tty.c /usr/src/usr.sbin/ppp/tun.c /usr/src/usr.sbin/ppp/udp.c /usr/src/usr.sbin/ppp/vjcomp.c /usr/src/usr.sbin/ppp/nat_cmd.c /usr/src/usr.sbin/ppp/id.c /usr/src/usr.sbin/ppp/chap_ms.c /usr/src/usr.sbin/ppp/mppe.c /usr/src/usr.sbin/ppp/radius.c /usr/src/usr.sbin/ppp/ether.c
/usr/src/usr.sbin/ppp/tty.c:46:22: error: netgraph.h: No such file or directory
/usr/src/usr.sbin/ppp/id.c:36:22: error: netgraph.h: No such file or directory
/usr/src/usr.sbin/ppp/ether.c:35:22: error: netgraph.h: No such file or directory
mkdep: compile failed
*** Error code 1

Stop in /usr/src/usr.sbin/ppp.
*** Error code 1

Stop in /usr/src/usr.sbin.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- src/usr.sbin/ppp/Makefile.orig	2009-08-06 10:26:26.000000000 -0400
+++ src/usr.sbin/ppp/Makefile	2009-08-06 07:31:01.000000000 -0400
@@ -28,6 +28,9 @@
 .if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif
+.if ${MK_NETGRAPH} == "no"
+PPP_NO_NETGRAPH=
+.endif
 
 .if defined(PPP_NO_SUID)
 BINMODE=550


>Release-Note:
>Audit-Trail:
>Unformatted: