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

23 files changed, 23 insertions, 46 deletions

diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index df68cdfd2eb..91b4ba4314e 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/20 00:58:23 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:36 wiz Exp $
 
 DISTNAME=	celestia-1.4.1
 PKGREVISION=	7
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DISTINFO_FILE=	${.CURDIR}/../../misc/celestia/distinfo
 PATCHDIR=	${.CURDIR}/../../misc/celestia/patches
 
-USE_DIRS+=		xdg-1.3
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/misc/celestia/options.mk b/misc/celestia/options.mk
index af90ca1be1f..83240a7e440 100644
--- a/misc/celestia/options.mk
+++ b/misc/celestia/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/09/25 10:25:19 hira Exp $
+# $NetBSD: options.mk,v 1.4 2009/07/22 09:01:36 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.celestia
 PKG_SUPPORTED_OPTIONS=		# empty
@@ -30,7 +30,6 @@ PLIST_SRC=		${PKGDIR}/PLIST.gtk
 .if !empty(PKG_OPTIONS:Mkde)
 CONFIGURE_ARGS+=	--with-kde
 PLIST_SRC=		${PKGDIR}/PLIST.kde
-USE_DIRS+=		kde3-1.0
 .  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .  include "../../x11/kdelibs3/buildlink3.mk"
 .endif
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 48e44e13e27..51e90d11012 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/07/08 11:21:22 abs Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=	deskbar-applet-2.26.2
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile
index 666f54c5375..e5ea57f077d 100644
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=	fbreader-sources-0.10.1
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.fbreader.org/
 COMMENT=	Ebook reader software
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_DIRS+=	xdg-1.4
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
diff --git a/misc/gaupol/Makefile b/misc/gaupol/Makefile
index b63ebbc04a7..f21d43a1809 100644
--- a/misc/gaupol/Makefile
+++ b/misc/gaupol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/15 23:24:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=	gaupol-0.13.1
@@ -16,7 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.12:../../x11/py-gtk2
 
 PYTHON_VERSIONS_ACCEPTED=	25
 PYDISTUTILSPKG= 		yes
-USE_DIRS+=			xdg-1.4
 USE_LANGUAGES=			# none
 USE_TOOLS+=			intltool msgfmt
 PKG_DESTDIR_SUPPORT=		user-destdir
diff --git a/misc/gelemental/Makefile b/misc/gelemental/Makefile
index 1d0ede8a2ed..270389d091f 100644
--- a/misc/gelemental/Makefile
+++ b/misc/gelemental/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/13 18:15:05 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=	gelemental-1.2.0
@@ -16,7 +16,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool gmake msgfmt
 USE_LANGUAGES=	c c++
-USE_DIRS+=	xdg-1.1
 
 PKGCONFIG_OVERRIDE+=	data/libelemental.pc.in
 
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 0aa47827c18..a9ac91ec4f7 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/19 15:05:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=	gnome-devel-docs-2.26.2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake pkg-config msgfmt
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 922163d9e43..8d262e6f7e9 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/05/19 14:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=	gnome-user-docs-2.26.2
@@ -17,7 +17,6 @@ CONFLICTS+=		gnome2-user-docs-[0-9]*
 
 MAKE_JOBS_SAFE=		no
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake pkg-config msgfmt
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 748a500bd7c..eaa4c2e4cf4 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2009/03/17 12:07:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.93 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=		gnome-utils-2.26.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/misc/goffice0.6/Makefile b/misc/goffice0.6/Makefile
index b087d93897e..b229a732214 100644
--- a/misc/goffice0.6/Makefile
+++ b/misc/goffice0.6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/01/20 20:41:23 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=		goffice-0.6.6
@@ -18,7 +18,6 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoffice.pc.in
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 1c92fe14d21..acdd1b7187d 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2009/03/22 19:01:39 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2009/07/22 09:01:36 wiz Exp $
 #
 
 DISTNAME=		gok-2.26.0
@@ -12,7 +12,6 @@ COMMENT=		GNOME On-Screen Keyboard
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake msgfmt pkg-config intltool
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index f764c89cbe5..c78a16a78e8 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/06/20 01:09:26 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/07/22 09:01:37 wiz Exp $
 
 DISTNAME=		gperiodic-2.0.8
 PKGREVISION=		3
@@ -11,7 +11,6 @@ COMMENT=		Displays a periodic table of the elements
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 
diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index 2d49c6350a0..5a26065842e 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/03/22 17:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	gwaei-0.15.3
@@ -14,7 +14,6 @@ DEPENDS+=	rsync-[0-9]*:../../net/rsync
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS=		xdg-1.4 gnome2-1.6
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake perl pkg-config
 
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 603691c0efb..04b9b8bc823 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/07/14 12:56:08 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	gxmame-0.35beta1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=		xmame>=0.87:../../emulators/xmame
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		intltool gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
diff --git a/misc/mnemosyne/Makefile b/misc/mnemosyne/Makefile
index 4a270c77f6c..6e333ca799c 100644
--- a/misc/mnemosyne/Makefile
+++ b/misc/mnemosyne/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	mnemosyne-1.2.1
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=	xdg-1.4
 USE_LANGUAGES=	# none
 
 EGG_NAME=	${DISTNAME:S/^m/M/}
diff --git a/misc/mousetweaks/Makefile b/misc/mousetweaks/Makefile
index a75c089ad7d..a2ad2b64e2c 100644
--- a/misc/mousetweaks/Makefile
+++ b/misc/mousetweaks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/19 14:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	mousetweaks-2.26.2
@@ -19,7 +19,6 @@ GCONF_SCHEMAS+=	mousetweaks.schemas
 GCONF_SCHEMAS+=	pointer-capture-applet.schemas
 
 USE_TOOLS+=	gmake intltool msgfmt pkg-config
-USE_DIRS+=	gnome2-1.6
 
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.16.0
 .include "../../devel/GConf/schemas.mk"
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 59438cbe710..b701efca4a3 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2009/06/14 22:58:05 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2009/07/22 09:01:37 wiz Exp $
 #
 
 OO_VER=			2.4.2
@@ -37,7 +37,6 @@ CONFIGURE_DIRS=		config_office
 GCC_REQD+=		3.4
 USE_LANGUAGES+=		c c++
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		bash gmake imake perl pkg-config tar
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 49406c867c6..82ad28d79ac 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/06/14 22:58:05 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2009/07/22 09:01:37 wiz Exp $
 #
 
 OO_VER=			3.1.0
@@ -44,7 +44,6 @@ CONFLICTS+=		openoffice2-bin-[0-9]*
 CONFLICTS+=		openoffice3-bin-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		bash gmake imake perl pkg-config tar
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index bfe450b2418..1f5509be44b 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/07/10 22:22:47 abs Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	orca-2.26.2
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config gmake msgfmt
-USE_DIRS+=	xdg-1.1
 
 PYTHON_VERSIONS_ACCEPTED= 26 25 24
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index c0958120214..2abcaa27991 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/20 00:58:24 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	tellico-1.3.5
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_DIRS+=		kde3-1.0
 USE_TOOLS+=		gmake perl:build pkg-config
 
 .include "options.mk"
diff --git a/misc/theme-dirs/Makefile b/misc/theme-dirs/Makefile
index f159648d825..f12ba14424a 100644
--- a/misc/theme-dirs/Makefile
+++ b/misc/theme-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/09 00:48:09 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:37 wiz Exp $
 #
 
 DISTNAME=	theme-dirs-1.1
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 PLIST_SRC=	# empty
-USE_DIRS=	xdg-1.1
 USE_LANGUAGES=	# empty
 WRKSRC=		${WRKDIR}
 
diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile
index 088a4d2360e..5e59fe95a21 100644
--- a/misc/xchm/Makefile
+++ b/misc/xchm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/09/22 20:21:03 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:38 wiz Exp $
 #
 
 DISTNAME=	xchm-1.13
@@ -11,7 +11,6 @@ COMMENT=	CHM viewer for UNIX
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 13f808f60ac..6e81a073179 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2009/03/17 12:19:35 jmcneill Exp $
+# $NetBSD: Makefile,v 1.80 2009/07/22 09:01:38 wiz Exp $
 #
 
 DISTNAME=		yelp-2.26.0
@@ -16,7 +16,6 @@ DEPENDS+=		docbook>=4.2:../../textproc/docbook
 
 BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.4
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes