From owner-freebsd-stable@FreeBSD.ORG Sat Nov 12 05:23:30 2005 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0522D16A41F for ; Sat, 12 Nov 2005 05:23:30 +0000 (GMT) (envelope-from ringworm01@gmail.com) Received: from zproxy.gmail.com (zproxy.gmail.com [64.233.162.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86E5243D49 for ; Sat, 12 Nov 2005 05:23:27 +0000 (GMT) (envelope-from ringworm01@gmail.com) Received: by zproxy.gmail.com with SMTP id 8so768621nzo for ; Fri, 11 Nov 2005 21:23:27 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:subject:date:user-agent:cc:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=sKMHBkgwlJWxEWDrws0qfcnFjBE3ur0MKorcyPpwjEkpJed6Tj1Rfvzte5YzgQaz1D3Mzzt/86YpI0ZVlKZ3qEUEeyGsloEgVJeUFA8P3a5hVitO0soagf7es4NLTXMsloEeuLAPmVsmY6SLNMWJRnCxLVhdb/3o64gEZNrLf8U= Received: by 10.36.77.10 with SMTP id z10mr2043791nza; Fri, 11 Nov 2005 21:23:27 -0800 (PST) Received: from ?192.168.1.10? ( [71.102.14.129]) by mx.gmail.com with ESMTP id 8sm168236nzn.2005.11.11.21.23.23; Fri, 11 Nov 2005 21:23:26 -0800 (PST) From: "Michael C. Shultz" To: Jan Grant Date: Fri, 11 Nov 2005 21:14:01 -0800 User-Agent: KMail/1.8.3 References: <43726E40.3090701@iaces.com> <200511110639.47578.ringworm01@gmail.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200511112114.02704.ringworm01@gmail.com> Cc: freebsd-stable@freebsd.org Subject: Re: gnome-upgrade.sh X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Nov 2005 05:23:30 -0000 On Friday 11 November 2005 07:23, Jan Grant wrote: > On Fri, 11 Nov 2005, Michael C. Shultz wrote: > > > > One last thing, if you make a script that does the conversion, might > > > > I have a copy? Here is how I'll set up pm-020.conf to work: > > > > > > Surely. pkgtools.conf is actually a ruby script: I've no idea how > > > dynamically the rules are evaluated but something that works ona > > > prettystock bunch of settings should be close to trivial. > > > > Thank you. If it works well I might use it to have portmanager pick up > > settings from portupgrade "on the fly", or at least provide some sort > > of conversion command. Thanks :) > > Attached uses ruby to parse the pkgtools.conf (it relies on the > portupgrade ruby package) - it'll spit out the appropriate sections > (HOLD_PKGS, BEFOREBUILD, AFTERINSTALL and MAKE_ARGS) in what I think the > portmanager format is (although the script is trivial, as you can see). > Note that the MAKE_ARGS etc go through a hash/dictionary and > consequently are unordered. A small snippet of the output I get from > this: > > [[[ > CATEGORY/PORT|OPTION=| # do not delete this line! > > # Ignored packages from HOLD_PKGS > > IGNORE|bsdpan-*| > IGNORE|x11/nvidia-driver| > IGNORE|editors/openoffice*| > > # STOP entries come from BEFOREBUILD > > > # START entries come from AFTERINSTALL > > START|/databases/postgresql7 chmod a+x > /usr/local/share/postgresql/502.pgsql| START|/www/jakarta-tomcat5 chmod a-x > /usr/local/etc/rc.d/020.jakarta-tomcat*.sh| > > # Package options from MAKE_ARGS > # Note: pkgtools.conf will use the UNION of all matching lines > > security/gnupg|WITH_SUID_GPG=yes| > devel/subversion|WITH_PYTHON=yes WITH_MOD_DAV_SVN=yes WITHOUT_BDB=yes| > x11/kde3|| > deskutils/kdepim3|WITH_KPILOT=yes| > www/gallery|| > www/rt*|WITH_FASTCGI=yes WITH_APACHE2=yes DB_TYPE=Pg DB_HOST=localhost > DB_DATABASE=rt3 DB_USER=rt3| www/apache2|WITH_PROXY_MODULES=yes| > multimedia/kdemultimedia*|WITH_LAME=yes WITH_XINE=yes WITH_MPEGLIB=yes| > */*|BATCH=yes| > java/jdk14|NATIVE_BOOTSTRAP=yes JAVA_HOME=| > */kde*|WITH_KDE_DEBUG=yes| > mail/exim|WITH_EXIMON=yes WITH_EXISCAN_ACL=yes WITH_TCP_WRAPPERS=yes > WITH_PGSQL=yes WITHOUT_PERL=yes | ]]] Hey Jan, May I have a copy of your pkgtools.conf for testing purposes? Barring no more bugs to squash I'd like to start incorporating your script into portmanager tomorrow. I've decided to make a WITH_PKGTOOLS_CONF knob so if people compile that way portmanager just loads pkgtools.conf when it starts (using your script to do the translation). There will also be a command line switch that lets people use your script to add pkgtools.conf to the end of pm-020.conf if they prefer to go that way. -Mike