From owner-freebsd-hackers@FreeBSD.ORG Sat Aug 23 05:36:04 2008 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31E9C106567F for ; Sat, 23 Aug 2008 05:36:04 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.154]) by mx1.freebsd.org (Postfix) with ESMTP id B13D38FC18 for ; Sat, 23 Aug 2008 05:36:03 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: by fg-out-1718.google.com with SMTP id l26so785150fgb.35 for ; Fri, 22 Aug 2008 22:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=kyaIYQWrPMxR+acVhWuYXFK7xkRABO9v9dXksaUVIpc=; b=E51Xepezb2kVcc8/k0R0anKQ3E5Acjx+NP2d4lfonuQv49b3atYsMe/WzetcZS1HiZ pk8LUt4oK6eeJc1IJI/8+iyt9XXlVbY467kx15vwSZP4USSGVj3Q7cVkLTegDaN/9ouj 7YwU1MXvoqQK1/NdCDsiOTmIHBjliZv3tA0XY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=VYMRulwR6klw0GgeOLlU6t7QasYwAOshX3IKNRmplP/X6xOTfqXthzBleQVBZnUdGl fhD3r+KQ+y9eoSzZgBBSb6+yakC5AaN7rsHmFwI1i+vShfeI97QQ4ZkXkakQo6ph7qU3 jOZRSYUGs/velxx2mNpudLM1DScL2FtnC0q8o= Received: by 10.86.92.7 with SMTP id p7mr1448893fgb.8.1219469762219; Fri, 22 Aug 2008 22:36:02 -0700 (PDT) Received: by 10.86.62.14 with HTTP; Fri, 22 Aug 2008 22:36:02 -0700 (PDT) Message-ID: <7d6fde3d0808222236t45103e4eseb8f174ffb89fdca@mail.gmail.com> Date: Fri, 22 Aug 2008 22:36:02 -0700 From: "Garrett Cooper" To: "Anders Nore" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1d3ed48c0808211456h779bec94n9b6597c66f7741b2@mail.gmail.com> <1d3ed48c0808211500i4445b443t4a67da7cf514adaa@mail.gmail.com> Cc: "freebsd-hackers@freebsd.org" , Kevin Downey Subject: Re: pkg_improved GSoC 2008 finished X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2008 05:36:04 -0000 On Fri, Aug 22, 2008 at 2:56 AM, Anders Nore wrote: > On Fri, 22 Aug 2008 00:00:01 +0200, Kevin Downey wrote: > >> On Thu, Aug 21, 2008 at 2:56 PM, Kevin Downey wrote: >>> >>> On Thu, Aug 21, 2008 at 6:10 AM, Anders Nore >>> wrote: >>>> >>>> Hello hackers, >>>> it's been a great summer for me working with the FreeBSD-project. It has >>>> truly been an educational experience for me and I would like to continue >>>> working on my project as well as other aspects of FreeBSD in the future. >>>> >>>> You can read about my project on the wiki-page[1] where you can read >>>> about >>>> the new features and some technical detail, there you will also find >>>> testing >>>> instructions for those of you who want to try it out. You can also >>>> download >>>> the source[2]. It will be greatly appreciated if you test it and report >>>> any >>>> bugs you discover. >>>> >>>> >>>> Thanks for a great summer! >>>> - Anders Nore >>>> >>>> >>>> [1] http://wiki.freebsd.org/AndersNore/pkg_improved >>>> [2] http://home.no.net/andenore/patches/pkg_install-20080708.tar.gz >>> >>> Is there a patch against 7-STABLE? Neither of the two patches on the >>> website (-CURRENT and 7.0-RELEASE) or the tarball build on 7-STABLE. >>> The patches are also kind of a pain because they contain diffs against >>> files like "/usr/src/usr.sbin/pkg_install/CVS/Entries" which you don't >>> seem to have if you just use csup. >>> > > The CVS entries should be removed from the latest patches and a patch for > RELENG_7_0 has been added. > You can get the new patches from http://home.no.net/andenore/patches/ > >>> >>> -- >>> The Mafia way is that we pursue larger goals under the guise of >>> personal relationships. >>> Fisheye >>> >> >> sorry, I tried the tarball again, and it built. I must have missed >> something. >> > > Maybe you tried to compile from a different directory than > /usr/src/usr.sbin/pkg_install ? > Makefile.inc will try to `.include "../Makefile.inc"' to get BINDIR, so if > you comment this out and specify your own BINDIR variable `BINDIR?= > /usr/sbin' it should be ok. > > > Thanks for your input! > - Anders Nore How about this? For standalone packages, specify: Makefile.inc <-- redefine variables here. pkg_install/ <-- sources go here. Seems like a simple solution ;). As for diff, you probably what to use: --exclude-from=SCM_patterns.txt where SCM_patterns.txt consists of: -------------- CVS .git .svn .CC -------------- ... etc. As for patch, `patch -p0 < pkg_install.patch' does the trick if you do `diff -Naur .'. Cheers and good work on finishing off this awesome task. I'll gladly write up tests for you if you like =], -Garrett