From owner-freebsd-gnome@FreeBSD.ORG Fri Jun 6 09:42:38 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D96837B401; Fri, 6 Jun 2003 09:42:38 -0700 (PDT) Received: from shumai.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D82A43FBD; Fri, 6 Jun 2003 09:42:37 -0700 (PDT) (envelope-from marcus@freebsd.org) Received: from shumai.marcuscom.com (localhost.marcuscom.com [127.0.0.1]) by shumai.marcuscom.com (8.12.9/8.12.9) with ESMTP id h56GgW0u074484; Fri, 6 Jun 2003 12:42:32 -0400 (EDT) (envelope-from marcus@freebsd.org) Received: from localhost (marcus@localhost)h56GgWkk074481; Fri, 6 Jun 2003 12:42:32 -0400 (EDT) X-Authentication-Warning: shumai.marcuscom.com: marcus owned process doing -bs Date: Fri, 6 Jun 2003 12:42:32 -0400 (EDT) From: Joe Marcus Clarke X-X-Sender: marcus@shumai.marcuscom.com To: Jimmy Olgeni In-Reply-To: <200306061128.h56BSpVO077646@freefall.freebsd.org> Message-ID: <20030606124029.K74334@shumai.marcuscom.com> References: <200306061128.h56BSpVO077646@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: gnome@freebsd.org Subject: Re: gdm2 pkg-plist conditions X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2003 16:42:38 -0000 On Fri, 6 Jun 2003, Jimmy Olgeni wrote: > > Hi, > > I made a patch for the gdm2 port to change some conditions in pkg-plist. > > The current conditions are like this one: > > [ ! -f %B/Default ] && cp %B/%f %B/Default > > This may evaluate to "false" if the file exists, and cause pkg_add to complain. > > I changed them to: > > [ -f %B/Default ] || cp %B/%f %B/Default > > so that pkg_add will always be happy :) Thanks, Jimmy. Could you please commit this? Thanks. Joe > > Index: pkg-plist > =================================================================== > RCS file: /home/pcvs/ports/x11/gdm2/pkg-plist,v > retrieving revision 1.28 > diff -u -r1.28 pkg-plist > --- pkg-plist 6 May 2003 01:55:28 -0000 1.28 > +++ pkg-plist 6 Jun 2003 11:23:48 -0000 > @@ -12,31 +12,31 @@ > bin/gdmthemetester > @unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi > etc/gdm/Init/factory-Default > -@exec [ ! -f %B/Default ] && cp %B/%f %B/Default > +@exec [ -f %B/Default ] || cp %B/%f %B/Default > @unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi > etc/gdm/PostSession/factory-Default > -@exec [ ! -f %B/Default ] && cp %B/%f %B/Default > +@exec [ -f %B/Default ] || cp %B/%f %B/Default > @unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi > etc/gdm/PreSession/factory-Default > -@exec [ ! -f %B/Default ] && cp %B/%f %B/Default > +@exec [ -f %B/Default ] || cp %B/%f %B/Default > @unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi > etc/gdm/Sessions/factory-Gnome > -@exec [ ! -f %B/Gnome ] && cp %B/%f %B/Gnome > +@exec [ -f %B/Gnome ] || cp %B/%f %B/Gnome > @unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi > etc/gdm/Sessions/factory-Xsession > -@exec [ ! -f %B/Xsession ] && cp %B/%f %B/Xsession > +@exec [ -f %B/Xsession ] || cp %B/%f %B/Xsession > @unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi > etc/gdm/factory-XKeepsCrashing > -@exec [ ! -f %B/XKeepsCrashing ] && cp %B/%f %B/XKeepsCrashing > +@exec [ -f %B/XKeepsCrashing ] || cp %B/%f %B/XKeepsCrashing > @unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi > etc/gdm/factory-gnomerc > -@exec [ ! -f %B/gnomerc ] && cp %B/%f %B/gnomerc > +@exec [ -f %B/gnomerc ] || cp %B/%f %B/gnomerc > @unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi > etc/gdm/factory-gdm.conf > -@exec [ ! -f %B/gdm.conf ] && cp %B/%f %B/gdm.conf > +@exec [ -f %B/gdm.conf ] || cp %B/%f %B/gdm.conf > @unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi > etc/gdm/factory-locale.alias > -@exec [ ! -f %B/locale.alias ] && cp %B/%f %B/locale.alias > +@exec [ -f %B/locale.alias ] || cp %B/%f %B/locale.alias > etc/rc.d/gdm.sh.sample > sbin/gdm-restart > sbin/gdm-safe-restart > > -- > jimmy > _______________________________________________ > freebsd-gnome@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" > > PGP Key : http://www.marcuscom.com/pgp.asc