Date: Mon, 19 Jul 2004 21:27:32 +0900 (JST) From: Hideyuki KURASHINA <rushani@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: cy@FreeBSD.org Subject: ports/69282: [PATCH] misc/screen: Fix deinstall Message-ID: <20040719.212732.59560038.rushani@FreeBSD.org> Resent-Message-ID: <200407191230.i6JCURhu035535@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69282 >Category: ports >Synopsis: [PATCH] misc/screen: Fix deinstall >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 19 12:30:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Hideyuki KURASHINA >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD ***.*******.jp 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Jul 4 13:40:24 JST 2004 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/*** i386 >Description: Fix deinstall. In previous PR, I've introduced bugs into ports/misc/screen/pkg-plist... 1) At @unexec, if cmp -s %D/etc/screenrc %%EXAMPLESDIR%%/screenrc does not work because 2nd argument of cmp is not ``%D/%%EXAMPLESDIR%%/screenrc''. 2) At @exec, [ -f %B/screenrc ] || cp %B/%f %B/screenrc makes no sense, because last expanded path-name is ``%%EXAMPLESDIR%%''. This should be ``%D/etc/screenrc''. >How-To-Repeat: # cd /usr/ports/misc/screen # make install # diff /usr/local/etc/screenrc /usr/local/share/examples/screen/screenrc To confirm there are no differences between those files # make deinstall To confirm both files are removed or not. >Fix: Apply following patch (inspired by recent comit by @ume). Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/misc/screen/pkg-plist,v retrieving revision 1.28 diff -u -r1.28 pkg-plist --- pkg-plist 19 Jul 2004 07:21:17 -0000 1.28 +++ pkg-plist 19 Jul 2004 12:02:02 -0000 @@ -16,9 +16,9 @@ %%DATADIR%%/utf8encodings/cc %%DATADIR%%/utf8encodings/cd %%DATADIR%%/utf8encodings/d6 -@unexec if cmp -s %D/etc/screenrc %%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi +@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi %%EXAMPLESDIR%%/screenrc -@exec [ -f %B/screenrc ] || cp %B/%f %B/screenrc +@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc @dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%%/utf8encodings @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040719.212732.59560038.rushani>