ports/110004: fix sysutils/xfce4-utils

[Tomas Verbaitis]

>Number:         110004
>Category:       ports
>Synopsis:       fix sysutils/xfce4-utils
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 06 19:20:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Tomas Verbaitis
>Release:        RELENG_6
>Organization:
Megalogika Ltd
>Environment:
FreeBSD margo.lan 6.2-STABLE FreeBSD 6.2-STABLE #1: Mon Mar  5 20:43:31 EET 2007     tomasv at margo.lan:/usr/obj/usr/src/sys/MARGO  i386
>Description:
sysutils/xfce4-utils port creates the script /usr/local/bin/startxfce4

due to a recent move from /usr/X11 to /usr/local, it sets XDG_DATA_DIRS to a value like '/usr/share:/usr/local/share:/usr/local/share' which triggers a GTK+ bug as described in http://lists.freebsd.org/mailman/htdig/freebsd-gnome/2006-December/016302.html

proposed diff tries to workaround this bug
>How-To-Repeat:

>Fix:
diff -u -ruN --exclude=CVS /usr/ports/sysutils/xfce4-utils/files/patch-scripts-startxfce4.
in /usr/home/tomasv/ports/sysutils/xfce4-utils/files/patch-scripts-startxfce4.in
--- /usr/ports/sysutils/xfce4-utils/files/patch-scripts-startxfce4.in   Thu Jan  1 03:00:0
0 1970
+++ /usr/home/tomasv/ports/sysutils/xfce4-utils/files/patch-scripts-startxfce4.in       Tu
e Mar  6 21:08:13 2007
@@ -0,0 +1,16 @@
+--- scripts/startxfce4.in      Sat Jan 20 19:02:51 2007
++++ scripts/startxfce4.in      Tue Mar  6 21:03:35 2007
+@@ -28,7 +28,12 @@
+ 
+ if test x"$XDG_DATA_DIRS" = x""
+ then
+-  XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
++  if test x"/usr/local/share" = x"@datadir@"
++  then
++    XDG_DATA_DIRS="/usr/share:@datadir@"
++  else
++    XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
++  fi
+ else
+   XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
+ fi

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