From 7d071cb5af33505fab86a2e67ec8f6e9c575f58b Mon Sep 17 00:00:00 2001 From: lofi Date: Tue, 17 Jul 2007 23:04:22 +0000 Subject: Remove duplicate path element from XDG_*_DIRS to avoid crashes in Firefox. PR: ports/114678 Submitted by: Mark Hobden --- misc/kde-xdg-env/Makefile | 2 +- misc/kde-xdg-env/files/xdg-env.sh.in | 6 ++---- misc/kde4-xdg-env/Makefile | 2 +- misc/kde4-xdg-env/files/xdg-env.sh.in | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'misc') diff --git a/misc/kde-xdg-env/Makefile b/misc/kde-xdg-env/Makefile index f5ba6eef59d..44afb4e880c 100644 --- a/misc/kde-xdg-env/Makefile +++ b/misc/kde-xdg-env/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdg PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= misc kde MASTER_SITES= # none diff --git a/misc/kde-xdg-env/files/xdg-env.sh.in b/misc/kde-xdg-env/files/xdg-env.sh.in index 394d578ae71..31771ed9e6b 100644 --- a/misc/kde-xdg-env/files/xdg-env.sh.in +++ b/misc/kde-xdg-env/files/xdg-env.sh.in @@ -5,8 +5,7 @@ # Submit missing XDG-file locations to kde@freebsd.org! XDG_CONFIG_DIRS=\ -${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%X11BASE%%/etc/xdg:\ -%%LOCALBASE%%/etc/xdg/xfce4 +${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 @@ -15,8 +14,7 @@ fi export XDG_CONFIG_DIRS XDG_DATA_DIRS=\ -${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome:\ -%%X11BASE%%/share:%%X11BASE%%/share/gnome +${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then XDG_DATA_DIRS=${XDG_DATA_DIRS}:%%KDE_PREFIX%%/share diff --git a/misc/kde4-xdg-env/Makefile b/misc/kde4-xdg-env/Makefile index f5ba6eef59d..44afb4e880c 100644 --- a/misc/kde4-xdg-env/Makefile +++ b/misc/kde4-xdg-env/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdg PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= misc kde MASTER_SITES= # none diff --git a/misc/kde4-xdg-env/files/xdg-env.sh.in b/misc/kde4-xdg-env/files/xdg-env.sh.in index 394d578ae71..31771ed9e6b 100644 --- a/misc/kde4-xdg-env/files/xdg-env.sh.in +++ b/misc/kde4-xdg-env/files/xdg-env.sh.in @@ -5,8 +5,7 @@ # Submit missing XDG-file locations to kde@freebsd.org! XDG_CONFIG_DIRS=\ -${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%X11BASE%%/etc/xdg:\ -%%LOCALBASE%%/etc/xdg/xfce4 +${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 @@ -15,8 +14,7 @@ fi export XDG_CONFIG_DIRS XDG_DATA_DIRS=\ -${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome:\ -%%X11BASE%%/share:%%X11BASE%%/share/gnome +${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then XDG_DATA_DIRS=${XDG_DATA_DIRS}:%%KDE_PREFIX%%/share -- cgit