From owner-freebsd-ports@FreeBSD.ORG Fri Dec 28 09:26:59 2012 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 56657B3B for ; Fri, 28 Dec 2012 09:26:59 +0000 (UTC) (envelope-from mueller23@insightbb.com) Received: from mail.insightbb.com (smtp.insight.synacor.com [208.47.185.22]) by mx1.freebsd.org (Postfix) with ESMTP id 148808FC0C for ; Fri, 28 Dec 2012 09:26:58 +0000 (UTC) X_CMAE_Category: 0,0 Undefined,Undefined X-CNFS-Analysis: v=2.0 cv=AYoz7grG c=1 sm=0 a=Dm9TOXL4taQ+Gy1KovpL+A==:17 a=v2HD-ER0yicA:10 a=jLN7EqiLvroA:10 a=9YQ-1ebCAAAA:8 a=r66okj2nC0wA:10 a=pGLkceISAAAA:8 a=R25vNNWckD13EeScf7EA:9 a=Mly9r9EdQkoA:10 a=MSl-tDqOz04A:10 a=Dm9TOXL4taQ+Gy1KovpL+A==:117 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine Authentication-Results: smtp01.insight.synacor.com header.from=mueller23@insightbb.com; sender-id=softfail Authentication-Results: smtp01.insight.synacor.com smtp.mail=mueller23@insightbb.com; spf=softfail; sender-id=softfail Received-SPF: softfail (smtp01.insight.synacor.com: transitional domain insightbb.com does not designate 74.130.198.7 as permitted sender) Received: from [74.130.198.7] ([74.130.198.7:52108] helo=localhost) by mail.insightbb.com (envelope-from ) (ecelerity 2.2.3.49 r(42060/42061)) with ESMTP id 2C/A2-25232-CD56DD05; Fri, 28 Dec 2012 04:26:52 -0500 Date: Fri, 28 Dec 2012 04:26:52 -0500 Message-ID: <2C.A2.25232.CD56DD05@smtp01.insight.synacor.com> From: "Thomas Mueller" To: freebsd-ports@freebsd.org Subject: Re: Can't build kernel with ndis Cc: Kevin Oberman X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Dec 2012 09:26:59 -0000 > Once you get used to it, the merge operation in mergemaster is pretty > easy to use on most files. Always use 'r' for the $FreeBSD$ line and > 'l' for the sections that are modified. In the password and group > files, it is usually just 'r' followed by a few 'l's. I run the > "pre-buildworld" run (-p) as is and use -iPF options with the 'main' > mergemaster run. You can also use 'U' which will save a lot of time in > the main run, but it is NOT fool-proof and can bite you on rather rare > occasions, so I have stopped using it. Believe me when I tell you it > was a LOT worse in the days before mergemaster was written and all of > the merging had to be done by hand. That was really a pain! > Good luck with ndis. I've had mixed success with it over the years, > but have no devices that require it ATM and even when I did, I used > the module. > -- > R. Kevin Oberman, Network Engineer > E-mail: kob6558@gmail.com I guess doing all the merging by hand, prior to mergemaster, was error-prone. NetBSD has etcupdate. I am not decided which is better between NetBSD etcupdate and FreeBSD mergemaster. I think etcupdate is less destructive. With mergemaster, you really need to make a backup copy of /etc. Tom