gdm2 pkg-plist conditions

[Joe Marcus Clarke]

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
> - at exec [ ! -f %B/Default ] && cp %B/%f %B/Default
> + at 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
> - at exec [ ! -f %B/Default ] && cp %B/%f %B/Default
> + at 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
> - at exec [ ! -f %B/Default ] && cp %B/%f %B/Default
> + at 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
> - at exec [ ! -f %B/Gnome ] && cp %B/%f %B/Gnome
> + at 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
> - at exec [ ! -f %B/Xsession ] && cp %B/%f %B/Xsession
> + at 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
> - at exec [ ! -f %B/XKeepsCrashing ] && cp %B/%f %B/XKeepsCrashing
> + at 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
> - at exec [ ! -f %B/gnomerc ] && cp %B/%f %B/gnomerc
> + at 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
> - at exec [ ! -f %B/gdm.conf ] && cp %B/%f %B/gdm.conf
> + at 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
> - at exec [ ! -f %B/locale.alias ] && cp %B/%f %B/locale.alias
> + at 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 at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe at freebsd.org"
>
>

PGP Key : http://www.marcuscom.com/pgp.asc