[Midnightbsd-cvs] mports: misc/kde-xdg-env: Update for KDE 3.5.8

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update for KDE 3.5.8

Modified Files:
--------------
    mports/misc/kde-xdg-env:
        Makefile (r1.1 -> r1.2)
    mports/misc/kde-xdg-env/files:
        xdg-env.sh.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/kde-xdg-env/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L misc/kde-xdg-env/Makefile -L misc/kde-xdg-env/Makefile -u -r1.1 -r1.2
--- misc/kde-xdg-env/Makefile
+++ misc/kde-xdg-env/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xdg
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
@@ -19,6 +19,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Script which hooks into startkde and helps KDE pick up XDG apps/menus
+LICENSE=	unknown
 
 .if defined(KDE_PREFIX)
 PREFIX=		${KDE_PREFIX}
Index: xdg-env.sh.in
===================================================================
RCS file: /home/cvs/mports/misc/kde-xdg-env/files/xdg-env.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L misc/kde-xdg-env/files/xdg-env.sh.in -L misc/kde-xdg-env/files/xdg-env.sh.in -u -r1.1 -r1.2
--- misc/kde-xdg-env/files/xdg-env.sh.in
+++ misc/kde-xdg-env/files/xdg-env.sh.in
@@ -1,15 +1,25 @@
 #!/bin/sh
 
-# $FreeBSD: ports/misc/kde-xdg-env/files/xdg-env.sh.in,v 1.2 2006/06/21 03:34:00 lofi Exp $
+# $FreeBSD: ports/misc/kde-xdg-env/files/xdg-env.sh.in,v 1.4 2007/07/17 23:04:22 lofi Exp $
 #
 # Submit missing XDG-file locations to kde at freebsd.org!
 
-export XDG_CONFIG_DIRS=\
-${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%X11BASE%%/etc/xdg:\
-%%LOCALBASE%%/etc/xdg/xfce4:%%KDE_PREFIX%%/etc/xdg
-
-export XDG_DATA_DIRS=\
-${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:\
-%%X11BASE%%/share:%%X11BASE%%/share/gnome:%%KDE_PREFIX%%/share
+XDG_CONFIG_DIRS=\
+${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%LOCALBASE%%/etc/xdg/xfce4
+
+if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then
+    XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS}:%%KDE_PREFIX%%/etc/xdg
+fi
+
+export XDG_CONFIG_DIRS
+
+XDG_DATA_DIRS=\
+${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome
+
+if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then
+    XDG_DATA_DIRS=${XDG_DATA_DIRS}:%%KDE_PREFIX%%/share
+fi
+
+export XDG_DATA_DIRS
 
 kbuildsycoca