Remove USE_DIRS from pkgsrc.

Shared directories can now be created independently by the pacakges
needing them and will be removed automatically by pkg_delete when empty.

Packages needing empty directories can use the @pkgdir command in PLIST.

Discussed and ok'd in thread starting at
http://mail-index.netbsd.org/tech-pkg/2009/06/30/msg003546.html

27 files changed, 27 insertions, 54 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 9900087356f..a0b93bae45b 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/07/06 15:22:14 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:45 wiz Exp $
 #
 
 DISTNAME=	brasero-2.26.2
@@ -20,7 +20,6 @@ BUILD_DEPENDS+=         gnome-common>=2.26.0:../../devel/gnome-common
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake intltool gawk msgfmt
-USE_DIRS+=	gnome2-1.6
 
 CONFIGURE_ARGS+=	--disable-inotify
 
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index dd264a7f497..e1781accea6 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/03/18 13:30:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:45 wiz Exp $
 #
 
 CONSOLEKIT_VER=		0.3.0
@@ -26,7 +26,6 @@ BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		PKG_SYSCONFBASE
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.4
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_TOOLS+=		autoconf automake autoreconf
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile
index 85a9cb1a605..b18e9ef2049 100644
--- a/sysutils/desktop-file-utils/Makefile
+++ b/sysutils/desktop-file-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=	desktop-file-utils-0.15
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 81126efa52c..fcece4f4d72 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2009/07/22 09:01:46 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -12,7 +12,6 @@ DEPENDS+=	cdrdao-${CDRDAO_VER}{,nb*}:../../sysutils/cdrdao
 
 WRKSRC=		${WRKDIR}/cdrdao-${CDRDAO_VER}
 
-USE_DIRS+=		xdg-1.1
 CONFIGURE_ARGS+=	--without-posix-threads
 CONFIGURE_ARGS+=	--with-xdao
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/applications share/pixmaps
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index fcb9405e448..6b31986d9c8 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=		gcombust-0.1.54
@@ -16,7 +16,6 @@ DEPENDS+=		cdrtools>=1.10:../../sysutils/cdrtools
 DEPENDS+=		cdlabelgen-[0-9]*:../../graphics/cdlabelgen
 DEPENDS+=		gv-[0-9]*:../../print/gv
 
-USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index 6a27d82c639..b510d11bfe6 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/27 12:34:16 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=	gnome-device-manager-0.2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://hal.freedesktop.org/
 COMMENT=	GNOME program to manage devices and device drivers
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 8ec90c9796d..1c001427523 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/07/09 17:53:23 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=	gnome-menus-2.26.2
@@ -13,7 +13,6 @@ COMMENT=	Implementation of the desktop menu specification for GNOME
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.2
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index d87965dfcf4..5d364801fac 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/19 07:05:11 abs Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=		gnome-mount-0.8
@@ -11,7 +11,6 @@ HOMEPAGE=	http://hal.freedesktop.org/
 COMMENT=	Programs for mounting, unmounting and ejecting storage devices
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 9c1bdb78f75..daccf6813e2 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		intltool msgfmt pkg-config
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 
 GCONF_SCHEMAS=		gnome-pkgview.schemas
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index e7d8919c524..134e6e27fe9 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/10 19:19:57 hasso Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=	gnome-power-manager-2.24.4
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index f80ccbb495c..86f072e4c74 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/26 18:47:40 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/22 09:01:46 wiz Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.26.2
@@ -12,7 +12,6 @@ COMMENT=	GNOME 2 system monitor program
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 3be06c486ee..4dee63e8054 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/22 18:20:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=		gnome-system-tools-2.22.2
@@ -23,7 +23,6 @@ PKG_SUGGESTED_OPTIONS=	hal
 .endif
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 8cf7f559b6e..1faf3cdb84a 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/24 15:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=	gnome-volume-manager-2.24.1
@@ -15,7 +15,6 @@ DEPENDS+=	gnome-mount>=0.8:../../sysutils/gnome-mount
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index bbe59818e5a..9eb777f2040 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=		hal-info-20090414
@@ -13,7 +13,6 @@ COMMENT=		FreeDesktop hardware abstraction layer (info subpackage)
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.4
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 59c4ad3c8ff..56c411d28fc 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/03/18 13:30:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:47 wiz Exp $
 
 DISTNAME=		hal-0.5.11
 PKGREVISION=		23
@@ -14,7 +14,6 @@ BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.4
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_TOOLS+=		autoconf automake autoreconf
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 058eb27851d..a61ca969b2e 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/07 15:16:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=	libgksu-2.0.7
@@ -15,7 +15,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 MAKE_ENV+=	GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 
-USE_DIRS+=	xdg-1.4
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool pkg-config
 
diff --git a/sysutils/liboobs/Makefile b/sysutils/liboobs/Makefile
index e08cf9b228e..09a232972ed 100644
--- a/sysutils/liboobs/Makefile
+++ b/sysutils/liboobs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/11/23 02:50:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=		liboobs-2.22.0
@@ -22,7 +22,6 @@ PKG_SUGGESTED_OPTIONS+=	hal
 .endif
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 531b2f29d3c..5443dbc7d13 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2008/12/02 19:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.24.0
@@ -12,7 +12,6 @@ COMMENT=	CD burner view for Nautilus
 
 DEPENDS+=		cdrtools-[0-9]*:../../sysutils/cdrtools
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/sysutils/nautilus-sendto/Makefile b/sysutils/nautilus-sendto/Makefile
index a86e538f2fa..60f8d1fadca 100644
--- a/sysutils/nautilus-sendto/Makefile
+++ b/sysutils/nautilus-sendto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/13 09:44:14 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=		nautilus-sendto-1.1.1
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 COMMENT=		Convenience application to send a file via email or instant messenger
 
 USE_PKGLOCALEDIR=	yes
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 GCONF_SCHEMAS=		nst.schemas
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 5217bb9a1b8..c41e688b6be 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2009/05/19 21:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2009/07/22 09:01:47 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.26.3
@@ -15,7 +15,6 @@ COMMENT=		Nautilus file manager for GNOME2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
-USE_DIRS+=		gnome2-1.6
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index d7cb2984f27..0b670a5cc1a 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/06/30 11:05:06 obache Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:47 wiz Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES+=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_DIRS+=	xdg-1.4
 
 PLIST_SRC=	PLIST.common
 
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 540cc4a3983..a95a7d3e4c0 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/12/21 16:14:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:48 wiz Exp $
 #
 
 DISTNAME=		system-tools-backends-2.6.0
@@ -28,7 +28,6 @@ EGDIR=		${PREFIX}/share/examples/system-tools-backends
 CONF_FILES+=	${EGDIR}/system-tools-backends.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/system-tools-backends.conf
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.4
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile
index 6d36840ca9c..77d4d4789ce 100644
--- a/sysutils/xfce4-thunar/Makefile
+++ b/sysutils/xfce4-thunar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/12/19 23:54:47 hira Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:48 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -14,7 +14,6 @@ COMMENT=	Xfce file manager
 
 #DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
-USE_DIRS+=	xdg-1.2
 
 PKGCONFIG_OVERRIDE+=	thunar-vfs/thunar-vfs-1.pc.in
 PKGCONFIG_OVERRIDE+=	thunarx/thunarx-1.pc.in
diff --git a/sysutils/xfce4-volman/Makefile b/sysutils/xfce4-volman/Makefile
index 08e2bfa6f1d..4b7ba606c73 100644
--- a/sysutils/xfce4-volman/Makefile
+++ b/sysutils/xfce4-volman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/09 10:32:26 ahoka Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:48 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -12,7 +12,6 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/thunar-volman/
 COMMENT=	Thunar volume manager
 
-USE_DIRS+=	xdg-1.4
 
 .include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
diff --git a/sysutils/xfce4-xarchiver/Makefile b/sysutils/xfce4-xarchiver/Makefile
index e25e8d327aa..a5da2a143ac 100644
--- a/sysutils/xfce4-xarchiver/Makefile
+++ b/sysutils/xfce4-xarchiver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/06 18:41:26 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:48 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -13,7 +13,6 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xarchiver/}
 COMMENT=	Xfce archiver handler
 
-USE_DIRS+=	xdg-1.1
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index bb265388d3a..a270086a0ff 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/07/14 12:56:13 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:48 wiz Exp $
 
 DISTNAME=	xfe-1.04
 CATEGORIES=	sysutils
@@ -10,7 +10,6 @@ COMMENT=	Fast MS-Explorer like filemanager for X
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 70c80611ea4..b3ae9bbe73f 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/06/30 00:07:23 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2009/07/22 09:01:48 wiz Exp $
 
 DISTNAME=	xnc-5.0.4.src
 PKGNAME=	xnc-5.0.4
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_DIRS+=	xdg-1.1
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	msgfmt