From owner-freebsd-gnome@FreeBSD.ORG Fri Jun 6 04:28:52 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 732DA37B401 for ; Fri, 6 Jun 2003 04:28:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01D6543F75 for ; Fri, 6 Jun 2003 04:28:52 -0700 (PDT) (envelope-from olgeni@FreeBSD.org) Received: from freefall.freebsd.org (olgeni@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h56BSpUp077647 for ; Fri, 6 Jun 2003 04:28:51 -0700 (PDT) (envelope-from olgeni@freefall.freebsd.org) Received: (from olgeni@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h56BSpVO077646 for gnome@FreeBSD.org; Fri, 6 Jun 2003 04:28:51 -0700 (PDT) Date: Fri, 6 Jun 2003 04:28:51 -0700 (PDT) From: Jimmy Olgeni Message-Id: <200306061128.h56BSpVO077646@freefall.freebsd.org> To: gnome@FreeBSD.org Subject: 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 11:28:52 -0000 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 :) 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