4 files changed, 101 insertions, 1 deletions

diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index 63bb4be8e343..73925bd4e43a 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/xdg-utils/Makefile,v 1.2 2006/09/02 21:01:28 ahze Exp $
+#    $MCom: ports-stable/devel/xdg-utils/Makefile,v 1.1 2006/10/27 20:43:38 ahze Exp $
 #
 
 PORTNAME=	xdg-utils
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://portland.freedesktop.org/download/
 EXTRACT_SUFX=	.tgz
@@ -29,4 +30,11 @@ PLIST_FILES+=	bin/${file}
 MAN1+=		${file}.1
 .endfor
 
+pre-patch:
+	@${RM} -f ${WRKSRC}/*/*.orig
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/scripts/xdg-*
+
 .include <bsd.port.mk>
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu b/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
new file mode 100644
index 000000000000..f7c23f312947
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
@@ -0,0 +1,52 @@
+--- scripts/xdg-desktop-menu.orig	Fri Oct 27 16:15:47 2006
++++ scripts/xdg-desktop-menu	Fri Oct 27 16:37:13 2006
+@@ -696,7 +696,7 @@
+     
+     for MIME in $mimetypes ; do
+         xdg_default_dirs="$XDG_DATA_DIRS"
+-        [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/
++        [ -n "$xdg_default_dirs" ] || xdg_default_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+         if [ x"$mode" = x"user" ] ; then
+             xdg_user_dir="$XDG_DATA_HOME"
+             [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
+@@ -739,7 +739,7 @@
+     xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+     xdg_system_dirs="$XDG_CONFIG_DIRS"
+-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/etc/xdg
++    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/etc/xdg
+     xdg_global_dir=
+     for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
+         if [ -w $x/$xdg_dir_name ] ; then
+@@ -1099,7 +1099,7 @@
+ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ xdg_global_dir=
+ for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
+     if [ -w $x/$xdg_dir_name ] ; then
+@@ -1166,7 +1166,7 @@
+ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ xdg_global_dir=
+ for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
+     if [ -w $x/$xdg_dir_name ] ; then
+@@ -1176,11 +1176,11 @@
+ done
+ 
+ kde_user_dir="$HOME/.kde/share/applnk"
+-kde_global_dir="/usr/share/applnk"
++kde_global_dir="%%LOCALBASE%%/share/applnk"
+ [ -w $kde_global_dir ] || kde_global_dir=
+ 
+ gnome_user_dir="$HOME/.gnome/apps"
+-gnome_global_dir="/usr/share/gnome/apps"
++gnome_global_dir="%%LOCALBASE%%/share/gnome/apps"
+ [ -w $gnome_global_dir ] || gnome_global_dir=
+ 
+ [ -f /etc/mandriva-release ] && need_mandriva_fix=true
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-icon-resource b/devel/xdg-utils/files/patch-scripts_xdg-icon-resource
new file mode 100644
index 000000000000..5dc5218755b2
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-icon-resource
@@ -0,0 +1,11 @@
+--- scripts/xdg-icon-resource.orig	Fri Oct 27 16:38:23 2006
++++ scripts/xdg-icon-resource	Fri Oct 27 16:38:57 2006
+@@ -612,7 +612,7 @@
+ xdg_global_dir=
+ xdg_global_prefix=
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs="/usr/local/share/:/usr/share/"
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs="%%LOCALBASE%%/share:/usr/local/share/:/usr/share/"
+ for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do
+    if [ -w $x/$xdg_dir_name ] ; then
+       xdg_global_prefix="$x/icons"
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-mime b/devel/xdg-utils/files/patch-scripts_xdg-mime
new file mode 100644
index 000000000000..7a1b8487a153
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-mime
@@ -0,0 +1,29 @@
+--- scripts/xdg-mime.orig	Fri Oct 27 16:39:27 2006
++++ scripts/xdg-mime	Fri Oct 27 16:40:23 2006
+@@ -557,7 +557,7 @@
+     [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
+     xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+     xdg_system_dirs="$XDG_DATA_DIRS"
+-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ 
+     for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
+        DEBUG 2 "Checking $x/applications/defaults.list"
+@@ -827,7 +827,7 @@
+ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ for x in `echo $xdg_system_dirs | sed 's/:/ /g'`; do
+     if [ -w $x/$xdg_dir_name ] ; then
+         [ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"
+@@ -859,7 +859,7 @@
+ # TODO: Gnome legacy support
+ # See http://forums.fedoraforum.org/showthread.php?t=26875
+ gnome_user_dir="$HOME/.gnome/apps"
+-gnome_global_dir=/usr/share/gnome/apps
++gnome_global_dir=%%LOCALBASE%%/share/gnome/apps
+ [ -w $gnome_global_dir ] || gnome_global_dir=
+ DEBUG 3 "gnome_user_dir: $gnome_user_dir"
+ DEBUG 3 "gnome_global_dir: $gnome_global_dir"