From owner-p4-projects@FreeBSD.ORG Fri Oct 12 17:05:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABF2F16A421; Fri, 12 Oct 2007 17:05:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DC6616A41B for ; Fri, 12 Oct 2007 17:05:11 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4392D13C45B for ; Fri, 12 Oct 2007 17:05:11 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CH5BUo075534 for ; Fri, 12 Oct 2007 17:05:11 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CH5BMm075531 for perforce@freebsd.org; Fri, 12 Oct 2007 17:05:11 GMT (envelope-from cnst@FreeBSD.org) Date: Fri, 12 Oct 2007 17:05:11 GMT Message-Id: <200710121705.l9CH5BMm075531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Oct 2007 17:05:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=127439 Change 127439 by cnst@dale on 2007/10/12 17:05:02 integrate Affected files ... .. //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#4 integrate .. //depot/projects/soc2007/cnst-sensors/share.man.man9/Makefile#5 integrate .. //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#4 integrate Differences ... ==== //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.319 2007/10/12 16:35:36 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -207,6 +207,12 @@ ppp_profile="papchap" # Which profile to use from /etc/ppp/ppp.conf. ppp_user="root" # Which user to run ppp as +# Start multiple instances of ppp at boot time +#ppp_profile="profile1 profile2 profile3" # Which profiles to use +#ppp_profile1_mode="ddial" # Override ppp mode for profile1 +#ppp_profile2_nat="NO" # Override nat mode for profile2 +# profile3 uses default ppp_mode and ppp_nat + ### Network daemon (miscellaneous) ### hostapd_enable="NO" # Run hostap daemon. syslogd_enable="YES" # Run syslog daemon (or NO). ==== //depot/projects/soc2007/cnst-sensors/share.man.man9/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.309 2007/09/05 19:46:23 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.310 2007/10/05 22:50:44 marius Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -856,6 +856,7 @@ pci.9 pci_enable_busmaster.9 \ pci.9 pci_enable_io.9 \ pci.9 pci_find_bsf.9 \ + pci.9 pci_find_dbsf.9 \ pci.9 pci_find_device.9 \ pci.9 pci_get_powerstate.9 \ pci.9 pci_read_config.9 \ ==== //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.373 2007/10/01 18:22:32 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.375 2007/10/09 23:31:11 obrien Exp $ .include @@ -269,7 +269,7 @@ _authpf= authpf .endif -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _pppctl= pppctl .endif @@ -278,7 +278,7 @@ .endif .if ${MK_NS_CACHING} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _nscd= nscd .endif .endif