ports/118660: [patch] xkeyboard-config pkg-plist error prevents install

[Warren Block]

>Number:         118660
>Category:       ports
>Synopsis:       [patch] xkeyboard-config pkg-plist error prevents install
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 13 14:50:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Warren Block
>Release:        6-STABLE
>Organization:
>Environment:
FreeBSD speedy.wonkity.com 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #0: Sun Nov 11 20:02:36 MST 2007     root at speedy.wonkity.com:/usr/obj/usr/src/sys/SPEEDY  i386
>Description:
The "compiled" directory of xkb is listed as a file in the port's pkg-plist.  The deinstall can't remove it, and subsequent installs fail because the post-install ln -s fails:

gmake[1]: Leaving directory /usr/ports/x11/xkeyboard-config/work/xkeyboard-config-1.0'
/bin/mkdir -p /var/lib/xkb
/bin/ln -s /var/lib/xkb /usr/local/share/X11/xkb/compiled
ln: /usr/local/share/X11/xkb/compiled/xkb: File exists
*** Error code 1

Stop in /usr/ports/x11/xkeyboard-config.
>How-To-Repeat:
Attempt to install or upgrade the latest version of the port after a previous version was present.
>Fix:
Manually remove the "compiled" directory before install:

rm -rf /usr/local/share/X11/xkb/compiled

Correct the port's pkg-plist with the attached patch.

Patch attached with submission follows:

--- pkg-plist.orig	2007-12-13 07:37:49.000000000 -0700
+++ pkg-plist	2007-12-13 07:38:41.000000000 -0700
@@ -18,7 +18,6 @@
 share/X11/xkb/compat/xfree86
 share/X11/xkb/compat/xtest
 share/X11/xkb/compat/README
-share/X11/xkb/compiled
 share/X11/xkb/geometry/digital_vndr/lk
 share/X11/xkb/geometry/digital_vndr/pc
 share/X11/xkb/geometry/digital_vndr/unix
@@ -291,6 +290,7 @@
 share/X11/xkb/xkbcomp
 @exec mkdir -p /var/lib/xkb
 @dirrm share/X11/xkb/compat
+ at dirrm share/X11/xkb/compiled
 @dirrm share/X11/xkb/geometry/digital_vndr
 @dirrm share/X11/xkb/geometry/sgi_vndr
 @dirrm share/X11/xkb/geometry


>Release-Note:
>Audit-Trail:
>Unformatted: