summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2009-07-22 09:01:16 +0000
committerwiz <wiz@pkgsrc.org>2009-07-22 09:01:16 +0000
commit6f7c23cfe57ceb1348ee3be0d8e8515ddd743b8c (patch)
treef31edaeb6360332619fa574baabd5871d646f682
parentc92320d92678dfa68215d796d1b3b5ca18ef72aa (diff)
downloadpkgsrc-6f7c23cfe57ceb1348ee3be0d8e8515ddd743b8c.tar.gz
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
-rw-r--r--archivers/file-roller/Makefile3
-rw-r--r--audio/amarok/Makefile3
-rw-r--r--audio/audacious/Makefile3
-rw-r--r--audio/bmp/Makefile.common3
-rw-r--r--audio/bmpx/Makefile3
-rw-r--r--audio/easytag-current/Makefile3
-rw-r--r--audio/easytag/Makefile3
-rw-r--r--audio/exaile/Makefile3
-rw-r--r--audio/gimmix/Makefile3
-rw-r--r--audio/glurp/Makefile3
-rw-r--r--audio/gmpc/Makefile3
-rw-r--r--audio/gnome-audio/Makefile3
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/gtkpod/Makefile5
-rw-r--r--audio/jack-rack/Makefile3
-rw-r--r--audio/libcanberra/Makefile3
-rw-r--r--audio/liteamp/Makefile3
-rw-r--r--audio/padevchooser/Makefile3
-rw-r--r--audio/paman/Makefile3
-rw-r--r--audio/paprefs/Makefile3
-rw-r--r--audio/pavucontrol/Makefile3
-rw-r--r--audio/pavumeter/Makefile3
-rw-r--r--audio/picard/Makefile3
-rw-r--r--audio/pulseaudio/Makefile3
-rw-r--r--audio/py-karaoke/Makefile3
-rw-r--r--audio/qjackctl/Makefile3
-rw-r--r--audio/rhythmbox/Makefile3
-rw-r--r--audio/solfege/Makefile3
-rw-r--r--audio/sonata/Makefile3
-rw-r--r--audio/sound-juicer/Makefile3
-rw-r--r--audio/sound-theme-freedesktop/Makefile3
-rw-r--r--audio/streamtuner/Makefile3
-rw-r--r--audio/sweep/Makefile3
-rw-r--r--biology/arka/Makefile3
-rw-r--r--chat/amsn/Makefile3
-rw-r--r--chat/empathy/Makefile3
-rw-r--r--chat/gnomeicu/Makefile3
-rw-r--r--chat/gossip/Makefile3
-rw-r--r--chat/gtmess/Makefile3
-rw-r--r--chat/kadu/Makefile3
-rw-r--r--chat/libpurple/Makefile3
-rw-r--r--chat/pidgin/Makefile3
-rw-r--r--chat/xchat/Makefile3
-rw-r--r--chat/xchat/options.mk4
-rw-r--r--comms/gnome-pilot/Makefile3
-rw-r--r--comms/jpilot/Makefile3
-rw-r--r--comms/multisync-gui/Makefile3
-rw-r--r--databases/gnome-mime-data/Makefile3
-rw-r--r--databases/gourmet/Makefile3
-rw-r--r--databases/gq/Makefile3
-rw-r--r--databases/gramps2/Makefile3
-rw-r--r--databases/gramps3/Makefile5
-rw-r--r--databases/libgnomedb/Makefile3
-rw-r--r--databases/mergeant/Makefile3
-rw-r--r--devel/accerciser/Makefile3
-rw-r--r--devel/anjuta/Makefile3
-rw-r--r--devel/bouml/Makefile3
-rw-r--r--devel/bzr-gtk/Makefile3
-rw-r--r--devel/devhelp/Makefile3
-rw-r--r--devel/diffuse/Makefile3
-rw-r--r--devel/eel/Makefile3
-rw-r--r--devel/geany/Makefile3
-rw-r--r--devel/glade/Makefile3
-rw-r--r--devel/glade3/Makefile3
-rw-r--r--devel/libbonoboui/Makefile3
-rw-r--r--devel/libgnomeui/Makefile3
-rw-r--r--devel/meld/Makefile3
-rw-r--r--devel/monodevelop/Makefile3
-rw-r--r--devel/valide/Makefile3
-rw-r--r--editors/abiword/Makefile.common3
-rw-r--r--editors/beaver/Makefile3
-rw-r--r--editors/conglomerate/Makefile3
-rw-r--r--editors/dasher/Makefile3
-rw-r--r--editors/emacs-snapshot/Makefile3
-rw-r--r--editors/gconf-editor/Makefile3
-rw-r--r--editors/gedit/Makefile3
-rw-r--r--editors/ghex/Makefile3
-rw-r--r--editors/gobby/Makefile3
-rw-r--r--editors/gtranslator/Makefile3
-rw-r--r--editors/leafpad/Makefile3
-rw-r--r--editors/lyx-qt/Makefile.common3
-rw-r--r--editors/lyx15/Makefile3
-rw-r--r--editors/mlview/Makefile3
-rw-r--r--editors/notecase/Makefile3
-rw-r--r--editors/poedit/Makefile3
-rw-r--r--editors/tomboy/Makefile3
-rw-r--r--emulators/e-uae/Makefile3
-rw-r--r--emulators/raine/Makefile3
-rw-r--r--emulators/snes9x-gtk/Makefile3
-rw-r--r--emulators/stella/Makefile3
-rw-r--r--emulators/wine-devel/Makefile3
-rw-r--r--emulators/wine/Makefile3
-rw-r--r--emulators/yabause/Makefile3
-rw-r--r--finance/gnucash-docs/Makefile3
-rw-r--r--finance/gnucash/Makefile3
-rw-r--r--fonts/ec-fonts-mftraced/Makefile3
-rw-r--r--fonts/gucharmap/Makefile3
-rw-r--r--fonts/tex-uhc-fonts-base/Makefile.common3
-rw-r--r--fonts/tex-unttf/Makefile3
-rw-r--r--games/atomix/Makefile3
-rw-r--r--games/ccgo/Makefile3
-rw-r--r--games/crimsonfields/Makefile3
-rw-r--r--games/dopewars/Makefile3
-rw-r--r--games/enigma/Makefile3
-rw-r--r--games/exult/Makefile3
-rw-r--r--games/freesci/Makefile3
-rw-r--r--games/gamazons/Makefile3
-rw-r--r--games/gbrainy/Makefile3
-rw-r--r--games/gcompris/Makefile3
-rw-r--r--games/ggz-client-libs/Makefile3
-rw-r--r--games/gnome-games-extra-data/Makefile3
-rw-r--r--games/gnome-games/Makefile3
-rw-r--r--games/gnome-mastermind/Makefile3
-rw-r--r--games/grhino/Makefile3
-rw-r--r--games/gtetrinet/Makefile3
-rw-r--r--games/liquidwar/Makefile3
-rw-r--r--games/openttd/Makefile3
-rw-r--r--games/pioneers/Makefile3
-rw-r--r--games/pokerth/Makefile3
-rw-r--r--games/pytraffic/Makefile3
-rw-r--r--games/quarry/Makefile3
-rw-r--r--games/scummvm/Makefile3
-rw-r--r--games/sirius/Makefile3
-rw-r--r--games/teg/Makefile3
-rw-r--r--games/warzone2100/Makefile3
-rw-r--r--games/wesnoth/Makefile3
-rw-r--r--games/wormux/Makefile3
-rw-r--r--games/xbreaky/Makefile3
-rw-r--r--games/xpuyopuyo/Makefile3
-rw-r--r--geography/viking/Makefile3
-rw-r--r--graphics/cheese/Makefile3
-rw-r--r--graphics/comix/Makefile3
-rw-r--r--graphics/denemo/Makefile3
-rw-r--r--graphics/dia/Makefile3
-rw-r--r--graphics/dia/options.mk3
-rw-r--r--graphics/digikam-doc/Makefile3
-rw-r--r--graphics/eog/Makefile3
-rw-r--r--graphics/f-spot/Makefile3
-rw-r--r--graphics/frameworks/Makefile3
-rw-r--r--graphics/g3d/Makefile3
-rw-r--r--graphics/geeqie/Makefile3
-rw-r--r--graphics/gimageview/Makefile3
-rw-r--r--graphics/gimmage/Makefile3
-rw-r--r--graphics/gimp-ufraw/Makefile3
-rw-r--r--graphics/gimp/Makefile3
-rw-r--r--graphics/gliv/Makefile3
-rw-r--r--graphics/gnome-backgrounds/Makefile3
-rw-r--r--graphics/gnome-icon-theme/Makefile3
-rw-r--r--graphics/gphoto/Makefile3
-rw-r--r--graphics/gqview-devel/Makefile3
-rw-r--r--graphics/gqview-gtk1/Makefile3
-rw-r--r--graphics/gqview/Makefile3
-rw-r--r--graphics/gthumb/Makefile3
-rw-r--r--graphics/gtkam/Makefile3
-rw-r--r--graphics/hicolor-icon-theme/Makefile3
-rw-r--r--graphics/icon-naming-utils/Makefile3
-rw-r--r--graphics/inkscape/Makefile3
-rw-r--r--graphics/librsvg/Makefile3
-rw-r--r--graphics/pornview/Makefile3
-rw-r--r--graphics/scigraphica/Makefile3
-rw-r--r--graphics/xdvipresent/Makefile3
-rw-r--r--ham/fldigi/Makefile3
-rw-r--r--ham/xdx/Makefile3
-rw-r--r--ham/xlog/Makefile3
-rw-r--r--inputmethod/imhangul_status_applet/Makefile3
-rw-r--r--inputmethod/uim/Makefile3
-rw-r--r--mail/akonadi/Makefile3
-rw-r--r--mail/balsa/Makefile3
-rw-r--r--mail/claws-mail/Makefile3
-rw-r--r--mail/evolution-data-server/Makefile3
-rw-r--r--mail/evolution/Makefile3
-rw-r--r--mail/mail-notification/Makefile3
-rw-r--r--mail/sylpheed/Makefile3
-rw-r--r--mail/thunderbird/Makefile-thunderbird.common3
-rw-r--r--math/galculator/Makefile3
-rw-r--r--math/gcalctool/Makefile3
-rw-r--r--math/genius/Makefile3
-rw-r--r--math/gnumeric/Makefile3
-rw-r--r--math/graphopt/Makefile3
-rw-r--r--math/octave/Makefile3
-rw-r--r--meta-pkgs/kde3/kde3.mk3
-rw-r--r--misc/celestia/Makefile3
-rw-r--r--misc/celestia/options.mk3
-rw-r--r--misc/deskbar-applet/Makefile3
-rw-r--r--misc/fbreader/Makefile3
-rw-r--r--misc/gaupol/Makefile3
-rw-r--r--misc/gelemental/Makefile3
-rw-r--r--misc/gnome-devel-docs/Makefile3
-rw-r--r--misc/gnome-user-docs/Makefile3
-rw-r--r--misc/gnome-utils/Makefile3
-rw-r--r--misc/goffice0.6/Makefile3
-rw-r--r--misc/gok/Makefile3
-rw-r--r--misc/gperiodic/Makefile3
-rw-r--r--misc/gwaei/Makefile3
-rw-r--r--misc/gxmame/Makefile3
-rw-r--r--misc/mnemosyne/Makefile3
-rw-r--r--misc/mousetweaks/Makefile3
-rw-r--r--misc/openoffice2/Makefile3
-rw-r--r--misc/openoffice3/Makefile3
-rw-r--r--misc/orca/Makefile3
-rw-r--r--misc/tellico/Makefile3
-rw-r--r--misc/theme-dirs/Makefile3
-rw-r--r--misc/xchm/Makefile3
-rw-r--r--misc/yelp/Makefile3
-rw-r--r--multimedia/alevt/Makefile3
-rw-r--r--multimedia/avidemux/Makefile3
-rw-r--r--multimedia/dvdstyler/Makefile3
-rw-r--r--multimedia/gmencoder/Makefile3
-rw-r--r--multimedia/gnome-media/Makefile3
-rw-r--r--multimedia/gopchop/Makefile3
-rw-r--r--multimedia/gxine/Makefile3
-rw-r--r--multimedia/handbrake/Makefile3
-rw-r--r--multimedia/libassetml/Makefile3
-rw-r--r--multimedia/mediatomb/Makefile3
-rw-r--r--multimedia/phonon/Makefile3
-rw-r--r--multimedia/subtitleeditor/Makefile3
-rw-r--r--multimedia/swfdec-gnome/Makefile3
-rw-r--r--multimedia/swfdec-mozilla/Makefile3
-rw-r--r--multimedia/totem/Makefile.common3
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--multimedia/vlc08/Makefile3
-rw-r--r--multimedia/xfmedia/Makefile3
-rw-r--r--multimedia/xine-ui/Makefile3
-rw-r--r--net/amule/Makefile3
-rw-r--r--net/avahi/Makefile3
-rw-r--r--net/bug-buddy/Makefile3
-rw-r--r--net/dc_gui2/Makefile3
-rw-r--r--net/ed2k-gtk-gui/Makefile3
-rw-r--r--net/ekiga/Makefile3
-rw-r--r--net/etherape/Makefile3
-rw-r--r--net/gnome-netstatus/Makefile3
-rw-r--r--net/gnome-nettool/Makefile3
-rw-r--r--net/logjam/Makefile3
-rw-r--r--net/skype/Makefile3
-rw-r--r--net/tsclient/Makefile3
-rw-r--r--net/twitux/Makefile3
-rw-r--r--net/urlgfe/Makefile3
-rw-r--r--net/vinagre/Makefile3
-rw-r--r--net/vino/Makefile3
-rw-r--r--news/lottanzb/Makefile3
-rw-r--r--news/pan/Makefile3
-rw-r--r--pkgtools/gnome-packagekit/Makefile3
-rw-r--r--print/advi/Makefile3
-rw-r--r--print/dvipdfmx/Makefile3
-rw-r--r--print/epdfview/Makefile3
-rw-r--r--print/evince/Makefile.common3
-rw-r--r--print/glabels/Makefile3
-rw-r--r--print/lgrind/Makefile3
-rw-r--r--print/scribus/Makefile3
-rw-r--r--print/tex-abc/Makefile3
-rw-r--r--print/tex-algorithm2e/Makefile3
-rw-r--r--print/tex-chemarrow/Makefile3
-rw-r--r--print/tex-cooking/Makefile3
-rw-r--r--print/tex-dhucs/Makefile3
-rw-r--r--print/tex-draftwatermark/Makefile3
-rw-r--r--print/tex-everypage/Makefile3
-rw-r--r--print/tex-fixme/Makefile3
-rw-r--r--print/tex-foiltex/Makefile3
-rw-r--r--print/tex-glossaries/Makefile3
-rw-r--r--print/tex-hlatex/Makefile3
-rw-r--r--print/tex-igo/Makefile3
-rw-r--r--print/tex-memhangul-ucs/Makefile3
-rw-r--r--print/tex-musixtex/Makefile3
-rw-r--r--print/tex-ocrb/Makefile3
-rw-r--r--print/tex-pgf/Makefile3
-rw-r--r--print/tex-prosper/Makefile3
-rw-r--r--print/tex-resume/Makefile3
-rw-r--r--print/tex-ucs/Makefile3
-rw-r--r--security/gnome-keyring-manager/Makefile3
-rw-r--r--security/gpass/Makefile3
-rw-r--r--security/policykit-gnome/Makefile3
-rw-r--r--security/policykit/Makefile3
-rw-r--r--security/seahorse-plugins/Makefile3
-rw-r--r--security/seahorse/Makefile3
-rw-r--r--sysutils/brasero/Makefile3
-rw-r--r--sysutils/consolekit/Makefile3
-rw-r--r--sysutils/desktop-file-utils/Makefile3
-rw-r--r--sysutils/gcdmaster/Makefile3
-rw-r--r--sysutils/gcombust/Makefile3
-rw-r--r--sysutils/gnome-device-manager/Makefile3
-rw-r--r--sysutils/gnome-menus/Makefile3
-rw-r--r--sysutils/gnome-mount/Makefile3
-rw-r--r--sysutils/gnome-pkgview/Makefile3
-rw-r--r--sysutils/gnome-power-manager/Makefile3
-rw-r--r--sysutils/gnome-system-monitor/Makefile3
-rw-r--r--sysutils/gnome-system-tools/Makefile3
-rw-r--r--sysutils/gnome-volume-manager/Makefile3
-rw-r--r--sysutils/hal-info/Makefile3
-rw-r--r--sysutils/hal/Makefile3
-rw-r--r--sysutils/libgksu/Makefile3
-rw-r--r--sysutils/liboobs/Makefile3
-rw-r--r--sysutils/nautilus-cd-burner/Makefile3
-rw-r--r--sysutils/nautilus-sendto/Makefile3
-rw-r--r--sysutils/nautilus/Makefile3
-rw-r--r--sysutils/open-vm-tools/Makefile3
-rw-r--r--sysutils/system-tools-backends/Makefile3
-rw-r--r--sysutils/xfce4-thunar/Makefile3
-rw-r--r--sysutils/xfce4-volman/Makefile3
-rw-r--r--sysutils/xfce4-xarchiver/Makefile3
-rw-r--r--sysutils/xfe/Makefile3
-rw-r--r--sysutils/xnc/Makefile3
-rw-r--r--textproc/gnome-doc-utils/Makefile3
-rw-r--r--textproc/gnome-spell/Makefile3
-rw-r--r--textproc/gtk-doc/Makefile3
-rw-r--r--textproc/latex2html/Makefile3
-rw-r--r--time/cairo-clock/Makefile3
-rw-r--r--time/evolution-webcal/Makefile3
-rw-r--r--time/gnotime/Makefile3
-rw-r--r--time/gtodo-applet/Makefile3
-rw-r--r--time/gtodo/Makefile3
-rw-r--r--time/hamster-applet/Makefile3
-rw-r--r--time/planner/Makefile3
-rw-r--r--wm/afterstep/Makefile3
-rw-r--r--wm/ccsm/Makefile3
-rw-r--r--wm/e16menuedit2/Makefile3
-rw-r--r--wm/matchbox-wm/Makefile3
-rw-r--r--wm/metacity/Makefile3
-rw-r--r--wm/obconf/Makefile3
-rw-r--r--wm/openbox/Makefile3
-rw-r--r--wm/sawfish/Makefile3
-rw-r--r--wm/xfce4-wm-themes/Makefile3
-rw-r--r--wm/xfce4-wm/Makefile3
-rw-r--r--www/amaya/Makefile3
-rw-r--r--www/bluefish/Makefile3
-rw-r--r--www/drivel/Makefile3
-rw-r--r--www/epiphany-extensions/Makefile3
-rw-r--r--www/epiphany/Makefile3
-rw-r--r--www/galeon/Makefile3
-rw-r--r--www/kazehakase/Makefile3
-rw-r--r--www/liferea-current/Makefile3
-rw-r--r--www/liferea/Makefile3
-rw-r--r--www/midori/Makefile3
-rw-r--r--x11/Xaw-Xpm/Makefile3
-rw-r--r--x11/alacarte/Makefile3
-rw-r--r--x11/driconf/Makefile3
-rw-r--r--x11/fast-user-switch-applet/Makefile3
-rw-r--r--x11/gdm/Makefile3
-rw-r--r--x11/gnome-applets/Makefile3
-rw-r--r--x11/gnome-control-center/Makefile3
-rw-r--r--x11/gnome-desktop/Makefile3
-rw-r--r--x11/gnome-mag/Makefile3
-rw-r--r--x11/gnome-panel/Makefile3
-rw-r--r--x11/gnome-screensaver/Makefile3
-rw-r--r--x11/gnome-session/Makefile3
-rw-r--r--x11/gnome-terminal/Makefile3
-rw-r--r--x11/gnome-themes-extras/Makefile3
-rw-r--r--x11/gnome-themes/Makefile3
-rw-r--r--x11/gnopernicus/Makefile3
-rw-r--r--x11/grandr_applet/Makefile3
-rw-r--r--x11/gtk-engines/Makefile3
-rw-r--r--x11/gtk/Makefile3
-rw-r--r--x11/gtk2-engines-bluecurve/Makefile3
-rw-r--r--x11/gtk2-engines-murrine/Makefile3
-rw-r--r--x11/gtk2-engines/Makefile3
-rw-r--r--x11/gtk2/Makefile3
-rw-r--r--x11/gtkstep/Makefile3
-rw-r--r--x11/libgnomekbd/Makefile3
-rw-r--r--x11/matchbox-panel-manager/Makefile3
-rw-r--r--x11/matchbox-panel/Makefile3
-rw-r--r--x11/matchbox-themes-extra/Makefile3
-rw-r--r--x11/tile/Makefile3
-rw-r--r--x11/vte/Makefile3
-rw-r--r--x11/wdm/Makefile3
-rw-r--r--x11/x11vnc/Makefile3
-rw-r--r--x11/xdesktopwaves/Makefile3
-rw-r--r--x11/xfce4-gtk2-engine/Makefile3
-rw-r--r--x11/xfce4-session/Makefile3
-rw-r--r--x11/xpad/Makefile3
-rw-r--r--x11/xscreensaver-demo/Makefile3
-rw-r--r--x11/xterm/Makefile3
-rw-r--r--x11/zenity/Makefile3
372 files changed, 373 insertions, 750 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 7a22a7ac964..babc717c033 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/07/09 18:21:44 drochner Exp $
+# $NetBSD: Makefile,v 1.95 2009/07/22 09:01:16 wiz Exp $
#
DISTNAME= file-roller-2.26.3
@@ -18,7 +18,6 @@ DEPENDS+= zip>=2.3nb2:../../archivers/zip
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index df5a0b7b4c0..b50bb3ea16c 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2009/05/20 00:58:05 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2009/07/22 09:01:17 wiz Exp $
DISTNAME= amarok-${VERSION}
VERSION= 1.4.10
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config msgfmt
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 94de0cc0397..0765007a07a 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/11 12:36:58 hasso Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= audacious-1.5.1
@@ -14,7 +14,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-USE_DIRS+= xdg-1.4
CONFIGURE_ARGS+= --enable-chardet --enable-nls
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 65cee46b647..4df46d26bdb 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2007/09/21 13:03:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.25 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= bmp-0.9.7.1
@@ -17,7 +17,6 @@ PATCHFILES= bmp-0.9.7-ipv6-simple.diff
PATCH_DIST_STRIP+= -p1
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index b3415dcab49..d44c3acbe1b 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/03/26 23:12:22 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= bmpx-0.40.14
@@ -15,7 +15,6 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.2 kde3-1.0
USE_LANGUAGES= c c++
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
diff --git a/audio/easytag-current/Makefile b/audio/easytag-current/Makefile
index b972c44c5e6..6e54512b288 100644
--- a/audio/easytag-current/Makefile
+++ b/audio/easytag-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/11/08 21:13:27 bjs Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= easytag-2.1.6
@@ -14,7 +14,6 @@ COMMENT= GTK+ tag editor for MP3, Ogg Vorbis files, and others (development vers
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index e3ea224cbdc..c86d57950cc 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/02/24 16:16:24 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= easytag-2.1
@@ -14,7 +14,6 @@ COMMENT= GTK+ tag editor for MP3, Ogg Vorbis files, and others
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 675142b3bc9..0c590daf50a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/03 07:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= exaile_0.2.14
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config gmake intltool msgfmt
-USE_DIRS+= xdg-1.1
PYTHON_PATCH_SCRIPTS= exaile.py
MAKE_ENV+= PYTHONBIN=${PYTHONBIN}
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 791bee26a84..f12a3399657 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/30 01:39:09 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= gimmix-0.5.6.1
@@ -17,7 +17,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool gmake msgfmt pkg-config
-USE_DIRS+= xdg-1.1
# fixes broken symbolic link to /usr/share/intltool/Makefile.in.in
post-extract:
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 6d86953b467..83b58351157 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:17 wiz Exp $
#
DISTNAME= glurp-0.11.6
@@ -13,7 +13,6 @@ COMMENT= Graphical GTK+2-based client for musicpd
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_TOOLS+= intltool pkg-config
.include "../../devel/glib2/buildlink3.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index afb41ba297b..6006e05d4af 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/05/30 01:25:19 obache Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= gmpc-0.18.0
@@ -18,7 +18,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= intltool msgfmt pkg-config gmake
PKGCONFIG_OVERRIDE= data/gmpc.pc.in
-USE_DIRS+= xdg-1.1
.include "options.mk"
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index ac26257ea90..ac3d1563a0f 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/29 17:15:59 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= gnome-audio-2.22.2
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= YES
NO_BUILD= YES
-USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 38968c3adcf..ae51f897665 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/01/12 21:12:40 shattered Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:18 wiz Exp $
DISTNAME= gqmpeg-0.91.1
PKGREVISION= 6
@@ -16,8 +16,6 @@ DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
DEPENDS+= xmp>=2.0.2:../../audio/xmp
USE_TOOLS+= msgfmt pkg-config
-USE_DIRS+= gnome2-1.5
-USE_DIRS+= xdg-1.2
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 06531cb0795..775756d2e55 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/01/12 21:12:40 shattered Exp $
+# $NetBSD: Makefile,v 1.95 2009/07/22 09:01:18 wiz Exp $
DISTNAME= gqmpeg-0.20.0
PKGREVISION= 11
@@ -16,8 +16,6 @@ DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
DEPENDS+= xmp>=2.0.2:../../audio/xmp
USE_TOOLS+= msgfmt
-USE_DIRS+= gnome1-1.5
-USE_DIRS+= xdg-1.2
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 25bbd110a6c..1ce1277e55e 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/14 19:29:44 hasso Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= gtkpod-0.99.14
@@ -12,7 +12,6 @@ COMMENT= GUI for iPod using GTK2
GNU_CONFIGURE= yes
-USE_DIRS= xdg-1.4
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool gmake lex msgfmt perl:run pkg-config
@@ -33,8 +32,6 @@ DEPENDS+= bash>=3.2.9:../../shells/bash
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.4.2
-USE_DIRS+= xdg-1.4
-
.include "options.mk"
.include "../../audio/libgpod/buildlink3.mk"
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 83ebd12ff4d..cc3bf436a5a 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/19 20:32:12 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= jack-rack-1.4.7
@@ -13,7 +13,6 @@ COMMENT= Effects "rack" for JACK
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt pkg-config
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index d5891a26018..d18473d4f91 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/02 16:29:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= libcanberra-0.11
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
-USE_DIRS+= gnome2-1.5
GCONF_SCHEMAS+= libcanberra.schemas
PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index ec97dd7c0d7..f4b8c787460 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/07/14 12:55:57 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2009/07/22 09:01:18 wiz Exp $
DISTNAME= liteamp-0.2.4.2
PKGREVISION= 13
@@ -11,7 +11,6 @@ COMMENT= Light-weight Music Player for GNOME2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 62122ae74d2..d1948253044 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/20 18:38:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= padevchooser-0.9.3
@@ -15,7 +15,6 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS= pkg-config gmake
USE_LIBTOOL= yes
-USE_DIRS+= gnome2-1.5
CONFIGURE_ARGS+= --disable-lynx
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index cefb88b82a5..83e67f3d641 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/19 07:04:44 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:18 wiz Exp $
#
DISTNAME= paman-0.9.4
@@ -12,7 +12,6 @@ COMMENT= GTK frontend for the PulseAudio sound server
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS= gnome2-1.5
USE_TOOLS+= pkg-config gmake
USE_LANGUAGES= c++
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 0cc4dcf7639..943d9605d0f 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/31 15:59:03 abs Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= paprefs-0.9.7
@@ -12,7 +12,6 @@ COMMENT= Configuration dialog for the PulseAudio sound server
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config gmake intltool perl msgfmt
-USE_DIRS+= gnome2-1.5
CONFIGURE_ARGS+= --disable-lynx
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 9e0df97a28f..80bbc53f345 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/31 16:07:19 abs Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= pavucontrol-0.9.7
@@ -12,7 +12,6 @@ COMMENT= Volume control tool ("mixer") for the PulseAudio sound server
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config gmake intltool perl msgfmt
-USE_DIRS+= gnome2-1.5
CONFIGURE_ARGS+= --disable-lynx
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index d63a21ea653..469ad936d1e 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/31 16:08:47 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= pavumeter-0.9.3
@@ -12,7 +12,6 @@ COMMENT= Volume meter for the PulseAudio sound server
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config gmake intltool perl
-USE_DIRS+= gnome2-1.5
CONFIGURE_ARGS+= --disable-lynx
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 5d788247105..6948bcda909 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/07/18 14:58:17 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= picard-0.11
@@ -12,7 +12,6 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
PYDISTUTILSPKG= yes
-USE_DIRS+= xdg-1.1
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= msgfmt
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index d9d0ae06bc0..45bad68416f 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/05 10:42:53 obache Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:19 wiz Exp $
# NOTE: Please send a copy of any patches that are not pkgsrc-specific
# to <pulseaudio-discuss@mail.0pointer.de>
@@ -18,7 +18,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \
autoconf automake autoreconf
-USE_DIRS+= xdg-1.4
AUTOCONF_REQD= 2.62
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 0b54bdf2fa0..9b98a1c31f9 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/07/14 09:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= pykaraoke-0.6
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
# for .kar files, untested for lack of files
#DEPENDS+= timidity-[0-9]*:../../audio/timidity
-USE_DIRS+= xdg-1.4
PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= yes
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index ece9f034483..ea4a469241b 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/07/31 04:02:40 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= qjackctl-0.3.3
@@ -12,7 +12,6 @@ COMMENT= JACK Audio Connection Kit Qt4 GUI
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.4
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9309ab2b556..9a89bb63b26 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2009/06/04 11:44:24 drochner Exp $
+# $NetBSD: Makefile,v 1.66 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= rhythmbox-0.12.2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "options.mk"
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 2f331845be4..b92ed85f306 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/07/08 13:55:58 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:19 wiz Exp $
#
DISTNAME= solfege-3.14.1
@@ -12,7 +12,6 @@ COMMENT= Practice several musical ear training exercises
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
BUILD_DEPENDS+= txt2man-[0-9]*:../../converters/txt2man
-USE_DIRS+= xdg-1.2
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 0a05caf1d7b..1f945f02a6f 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/26 18:24:58 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= sonata-1.6.2
@@ -17,7 +17,6 @@ DEPENDS+= musicpd>0:../../audio/musicpd
PYTHON_VERSIONS_ACCEPTED= 25 24
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
-USE_DIRS+= xdg-1.4
USE_TOOLS+= pkg-config msgfmt
# gtk threading bugfix
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 6878203e494..b8a2a418cad 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/04/07 10:38:54 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= sound-juicer-2.26.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_DIRS= xdg-1.4 gnome2-1.6
USE_TOOLS+= gmake pkg-config intltool msgfmt
USE_LANGUAGES= c c++
diff --git a/audio/sound-theme-freedesktop/Makefile b/audio/sound-theme-freedesktop/Makefile
index ecfa4d09d2a..5b4aa635474 100644
--- a/audio/sound-theme-freedesktop/Makefile
+++ b/audio/sound-theme-freedesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/15 10:43:13 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= sound-theme-freedesktop-0.2
@@ -13,7 +13,6 @@ COMMENT= Set of audio files for FreeDesktop
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake intltool msgfmt
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 7c145e7814d..8a0d53ef946 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/03/08 15:56:43 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= streamtuner-0.99.99
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEPENDS+= hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake msgfmt pkg-config intltool
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 2e9f4ed41ba..ff5eebad8c6 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/02/21 13:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= sweep-0.9.3
@@ -12,7 +12,6 @@ COMMENT= Full-featured digital sound editor
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
USE_TOOLS+= gmake msgfmt pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/biology/arka/Makefile b/biology/arka/Makefile
index 2541f6e9712..6b0fd6e7a3b 100644
--- a/biology/arka/Makefile
+++ b/biology/arka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/16 21:56:15 zafer Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= arka-0.11
@@ -15,7 +15,6 @@ DEPENDS+= gp-[0-9]*:../../biology/gp
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
CONF_FILES= ${PREFIX}/share/examples/arka/arkarc ${PKG_SYSCONFDIR}/arkarc
CPPFLAGS+= -DARKA_GLOBAL=\"${PKG_SYSCONFDIR}/arkarc\"
diff --git a/chat/amsn/Makefile b/chat/amsn/Makefile
index 98a493b3d10..ece93237f14 100644
--- a/chat/amsn/Makefile
+++ b/chat/amsn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/01/05 20:27:16 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= amsn-0.97
@@ -31,7 +31,6 @@ REPLACE_BASH= utils/update-amsn.sh
USE_TOOLS+= perl:run bash:run
USE_TOOLS+= autoconf gmake
-USE_DIRS+= xdg-1.4
pre-configure:
cd ${WRKSRC} && autoconf
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index a2c3eefa1a8..5092727a704 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/03/22 19:01:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:20 wiz Exp $
DISTNAME= empathy-2.24.1
PKGREVISION= 1
@@ -14,7 +14,6 @@ DEPENDS+= telepathy-gabble-[0-9]*:../../chat/telepathy-gabble
DEPENDS+= telepathy-idle-[0-9]*:../../chat/telepathy-idle
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gawk gmake intltool msgfmt pkg-config
USE_TOOLS+= autoconf
USE_LIBTOOL= yes
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index bce9dcdcfb0..a6853cf8540 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/03/08 15:56:44 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2009/07/22 09:01:20 wiz Exp $
DISTNAME= gnomeicu-0.99.12
PKGREVISION= 6
@@ -13,7 +13,6 @@ COMMENT= GNOME ICQ client
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 1f4e2eb2a74..439c4135dc4 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/03/08 15:56:44 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2009/07/22 09:01:20 wiz Exp $
#
DISTNAME= gossip-0.10.2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/chat/gtmess/Makefile b/chat/gtmess/Makefile
index 980fbfd9e26..dff2b0ca7fc 100644
--- a/chat/gtmess/Makefile
+++ b/chat/gtmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/07/14 12:55:59 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:21 wiz Exp $
#
DISTNAME= gtmess-0.91
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= tk-[0-9]*:../../x11/tk
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile
index 64736106585..b777e25cdae 100644
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/02/21 13:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:21 wiz Exp $
DISTNAME= kadu-0.5.0
PKGREVISION= 2
@@ -13,7 +13,6 @@ COMMENT= Chat client for Gadu-Gadu network (Poland)
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/kadu
-USE_DIRS+= xdg-1.2
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake bash:run
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index c3f89f41ca7..0d0a8a8ce42 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/05/17 22:56:17 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/22 09:01:21 wiz Exp $
#
PKGNAME= libpurple-${PIDGIN_VERSION}
@@ -12,7 +12,6 @@ CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
USE_TOOLS+= msgfmt intltool
-## #USE_DIRS+= xdg-1.2
GCONF_SCHEMAS+= purple.schemas
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index ba0c7938138..617f255c11d 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/06/12 16:31:39 smb Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:21 wiz Exp $
#
# XXX appease pkglint
#PKGNAME= pidgin-${PIDGIN_VERSION}
@@ -10,7 +10,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
#PKGREVISION= 1
-USE_DIRS+= xdg-1.4
USE_TOOLS+= msgfmt intltool
PKGCONFIG_OVERRIDE+= gaim.pc.in
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 546b141c56b..7de98df0139 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2008/08/22 06:37:39 tron Exp $
+# $NetBSD: Makefile,v 1.62 2009/07/22 09:01:21 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -12,7 +12,6 @@ CONFLICTS= xchat-gnome-[0-9]*
USE_TOOLS+= msgfmt
USE_PKGLOCALEDIR= YES
-USE_DIRS+= xdg-1.1
GCONF_SCHEMAS= apps_xchat_url_handler.schemas
CONFIGURE_ARGS+= --enable-tcl=no
diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk
index 753089cf2cc..20487feb154 100644
--- a/chat/xchat/options.mk
+++ b/chat/xchat/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2008/05/26 14:39:24 tron Exp $
+# $NetBSD: options.mk,v 1.13 2009/07/22 09:01:21 wiz Exp $
.include "../../mk/bsd.prefs.mk"
@@ -57,13 +57,11 @@ SUBST_STAGE.gconf+= pre-configure
SUBST_MESSAGE.gconf+= Disabling schema registration/installation.
SUBST_SED.gconf+= -e 's,DO_GCONF_TRUE,DO_GCONF_FALSE,g'
SUBST_FILES.gconf+= src/common/dbus/Makefile.in
-USE_DIRS+= gnome2-1.5
. include "../../devel/GConf/schemas.mk"
. include "../../sysutils/dbus-glib/buildlink3.mk"
.else
# We set this to ${FALSE} to avoid detection.
CONFIGURE_ARGS+= --disable-dbus
-USE_DIRS+= xdg-1.1
.endif
###
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index b8a8c52e13a..d3a74d3589b 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2009/05/20 00:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2009/07/22 09:01:21 wiz Exp $
#
DISTNAME= gnome-pilot-2.0.17
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEPENDS+= gob2-[0-9]*:../../devel/gob2
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index b20ae7ca08c..e329b26c373 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2009/05/20 00:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2009/07/22 09:01:21 wiz Exp $
#
DISTNAME= jpilot-1.6.0
@@ -15,7 +15,6 @@ CONFLICTS+= jpilot-libplugin-[0-9]*
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_OLD_DES_API= YES
-USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LANGUAGES+= c
diff --git a/comms/multisync-gui/Makefile b/comms/multisync-gui/Makefile
index 29eafef90d7..442b5583ba7 100644
--- a/comms/multisync-gui/Makefile
+++ b/comms/multisync-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/04 11:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:21 wiz Exp $
#
DISTNAME= multisync-gui-0.91.0
@@ -11,7 +11,6 @@ COMMENT= GUI for libopensync
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_TOOLS+= pkg-config
HAS_CONFIGURE= yes
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 123588b6f2a..f1f667cbda9 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/06/20 01:09:10 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:21 wiz Exp $
#
DISTNAME= gnome-mime-data-2.18.0
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= gnome-vfs<=1.0.3
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_TOOLS+= intltool msgfmt perl gmake
GNU_CONFIGURE= YES
diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile
index 8c1f4a7085b..80bff7803fd 100644
--- a/databases/gourmet/Makefile
+++ b/databases/gourmet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/02/09 22:56:22 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= gourmet-0.8.5.14
@@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://grecipe-manager.sourceforge.net/
COMMENT= Recipe database
-USE_DIRS+= xdg-1.2
USE_PKGLOCALEDIR= yes
PYDISTUTILSPKG= yes
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 6de819ce3f9..fd27d083a8d 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/06/01 15:34:02 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:22 wiz Exp $
DISTNAME= gq-1.2.3
PKGREVISION= 2
@@ -11,7 +11,6 @@ COMMENT= GTK-based LDAP client
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake perl pkg-config intltool
GNU_CONFIGURE= yes
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 22931c3a4fa..230dc657e11 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/09/18 16:56:55 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= gramps-2.2.10
@@ -12,7 +12,6 @@ COMMENT= Genealogical Research and Analysis Management Programming System
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_TOOLS+= msgfmt pkg-config intltool msgconv
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index 75ee7a9965c..c156a5a6b41 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/04 17:29:41 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= gramps-3.1.1
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
# not clear, leave off for now
MAKE_JOBS_SAFE= no
-USE_DIRS+= xdg-1.1
USE_TOOLS+= msgfmt pkg-config intltool msgconv
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -37,7 +36,7 @@ PYTHON_VERSIONS_ACCEPTED= 25 24
# librsvg2 (svg icon view)
# recommended:
# graphviz
-# xdg (above via USE_DIRS??)
+# xdg
# optional (skipping for now)
# gtkspell
# ttf-freefont
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index e824e58051d..e38a7b19fbf 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2009/05/20 00:58:10 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= libgnomedb-3.0.0
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index cd6cd8ca3f0..4f8e2d90866 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2009/05/20 00:58:10 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= mergeant-0.66
@@ -13,7 +13,6 @@ COMMENT= GNOME2 GNOME-DB database front-end
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool perl pkg-config msgfmt
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile
index abe1c8f5877..769da9808cc 100644
--- a/devel/accerciser/Makefile
+++ b/devel/accerciser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/28 21:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= accerciser-1.6.1
@@ -14,7 +14,6 @@ LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index dab414ac158..917371b4225 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/06/11 08:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/07/22 09:01:22 wiz Exp $
DISTNAME= anjuta-2.24.2
PKGREVISION= 1
@@ -22,7 +22,6 @@ DEPENDS+= yelp>=2.4.2:../../misc/yelp
BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-USE_DIRS+= gnome2-1.5
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index 075b9f3ec7a..07f59d7b878 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/09/01 12:24:54 tonnerre Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:22 wiz Exp $
#
DISTNAME= bouml_${BOUMLVERSION}
@@ -18,7 +18,6 @@ USE_LIBTOOL= YES
USE_TOOLS+= gmake pax
USE_LANGUAGES= c++
BUILD_TARGET= compile
-USE_DIRS+= xdg-1.3
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 9f3c5534aa8..cf25d52dbe8 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/13 11:18:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:23 wiz Exp $
DISTNAME= bzr-gtk-${VER}
CATEGORIES= devel
@@ -16,7 +16,6 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 25
-USE_DIRS+= xdg-1.1
USE_TOOLS+= msgfmt
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index ee1f78c2620..f47ac293418 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2008/10/24 16:56:55 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2009/07/22 09:01:23 wiz Exp $
DISTNAME= devhelp-0.21
CATEGORIES= devel x11
@@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://developer.imendio.com/projects/devhelp
COMMENT= Documentation viewer based on GNOME2
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 562ef4f6116..75e09973024 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:23 wiz Exp $
#
DISTNAME= diffuse-0.3.3
@@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= # none
-USE_DIRS= xdg-1.4 gnome2-1.6
CONF_FILES+= ${PREFIX}/share/examples/diffuse/diffuserc \
${PKG_SYSCONFDIR}/diffuserc
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index a20ec7ec790..e21228ad0c4 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2009/03/16 12:37:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/22 09:01:23 wiz Exp $
DISTNAME= eel-2.26.0
CATEGORIES= devel gnome
@@ -11,7 +11,6 @@ COMMENT= Eazel Extensions Library for GNOME2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 611c8854705..ef2c542310d 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/07/18 19:37:42 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:23 wiz Exp $
DISTNAME= geany-0.17
CATEGORIES= devel
@@ -15,7 +15,6 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config msgfmt gmake perl:run intltool
USE_LANGUAGES= c c++
-USE_DIRS+= xdg-1.1
CONFIGURE_ARGS+= --enable-plugins
CONFIGURE_ARGS+= --enable-vte
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 4c5158c1e6e..b78f139c9d0 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/06/15 12:03:05 obache Exp $
+# $NetBSD: Makefile,v 1.61 2009/07/22 09:01:23 wiz Exp $
DISTNAME= glade-2.12.2
PKGREVISION= 1
@@ -17,7 +17,6 @@ CONFLICTS+= glade2-[0-9]* glade2-gnome-[0-9]*
CONFLICTS+= glade-gnome-[0-9]*
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index f62592eabd8..ccac66c4058 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/20 01:09:12 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:23 wiz Exp $
#
DISTNAME= glade3-3.4.5
@@ -16,7 +16,6 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
PKGCONFIG_OVERRIDE+= data/gladeui-1.0.pc.in
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index e459bc0ab20..c16110b5da8 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2009/03/07 13:28:36 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2009/07/22 09:01:23 wiz Exp $
#
DISTNAME= libbonoboui-2.24.1
@@ -13,7 +13,6 @@ COMMENT= GNOME2 Object activation framework library (graphical version)
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 975bb2aaaca..250bac9c933 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2009/03/07 13:40:31 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2009/07/22 09:01:23 wiz Exp $
#
DISTNAME= libgnomeui-2.24.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= gnome-libs<=1.4.2nb1
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt perl pkg-config intltool
USE_LIBTOOL= yes
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index ab1bf5d777b..02a7c545157 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:23 wiz Exp $
#
DISTNAME= meld-1.3.0
@@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.6 xdg-1.3
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake msgfmt intltool
MAKE_FLAGS+= prefix=${PREFIX}
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 17c72ccaf6a..c5e92b59a5a 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/05/28 21:18:40 zafer Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/22 09:01:24 wiz Exp $
DISTNAME= monodevelop-2.0
CATEGORIES= devel
@@ -15,7 +15,6 @@ USE_TOOLS+= gmake perl:run pkg-config bash:run msgfmt
EXTRACT_USING= gtar
MAKE_JOBS_SAFE= no
-USE_DIRS+= xdg-1.4
REPLACE_BASH+= mdtool.in
REPLACE_BASH+= monodevelop.in
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index 0fd69773017..d49b6645c43 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/21 18:06:16 ahoka Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:24 wiz Exp $
#
DISTNAME= valide-0.4.0
@@ -12,7 +12,6 @@ COMMENT= IDE for the Vala programming language
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config msgfmt intltool
-USE_DIRS+= xdg-1.4
PYTHON_FOR_BUILD_ONLY= yes
REPLACE_PYTHON+= wscript waf \
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index e99926de61a..69751dddad7 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2009/04/07 16:27:08 drochner Exp $
+# $NetBSD: Makefile.common,v 1.39 2009/07/22 09:01:24 wiz Exp $
# Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
ABIWORD_VERSION= 2.6.8
@@ -11,7 +11,6 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.abisource.com/
MAKE_FILE= GNUmakefile
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_TOOLS+= gmake msgfmt pkg-config
USE_LANGUAGES= c c++
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 2c299dd8a8f..15980c7cfb3 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/08/04 21:34:39 bjs Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/22 09:01:24 wiz Exp $
#
DISTNAME= beaver${BEAVER_VERSION:S/./_/g}
@@ -16,7 +16,6 @@ COMMENT= Lightweight GTK+ text editor with syntax highlighting
PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DIRS= src
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index b8268b09c73..001f508090a 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/03/08 15:56:45 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2009/07/22 09:01:24 wiz Exp $
#
DISTNAME= conglomerate-0.9.1
@@ -16,7 +16,6 @@ DEPENDS+= docbook-xsl>=1.64.1:../../textproc/docbook-xsl
DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 9c2480d5f62..ee9fe88ae1a 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2009/05/21 16:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2009/07/22 09:01:24 wiz Exp $
DISTNAME= dasher-4.10.1
CATEGORIES= editors gnome
@@ -12,7 +12,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index 7d461d84439..5fa7a7c1cd8 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/07/12 11:56:54 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:24 wiz Exp $
DISTNAME= emacs-snapshot_20090710.orig
PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
@@ -16,7 +16,6 @@ CONFLICTS+= emacs-nox11-[0-9]*
GNU_CONFIGURE= yes
INFO_FILES= yes
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake makeinfo gzip
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/\.[0-9]*$//}
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 95d5d85ff73..a7a73eb569f 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/03/18 01:59:43 jmcneill Exp $
+# $NetBSD: Makefile,v 1.64 2009/07/22 09:01:24 wiz Exp $
#
DISTNAME= gconf-editor-2.26.0
@@ -13,7 +13,6 @@ COMMENT= Editor for the GConf configuration system
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/editors/gedit/Makefile b/editors/gedit/Makefile
index 2fd51a48b50..006e0f02b83 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2009/07/09 18:23:26 drochner Exp $
+# $NetBSD: Makefile,v 1.97 2009/07/22 09:01:24 wiz Exp $
#
DISTNAME= gedit-2.26.3
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= YES
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 0c418573d94..60e5c9df9d5 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/05 17:46:45 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= ghex-2.24.0
@@ -13,7 +13,6 @@ COMMENT= Hex editor
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool msgfmt gmake
-USE_DIRS+= xdg-1.1 gnome2-1.5
PKGCONFIG_OVERRIDE+= gtkhex.pc.in
GCONF_SCHEMAS= ghex2.schemas
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index bf71456aee0..da62b8547ae 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/05/22 17:39:50 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= gobby-0.4.5
@@ -16,7 +16,6 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS= gmake msgfmt pkg-config
-USE_DIRS+= xdg-1.4
.include "options.mk"
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 88888f1118f..4ab02f0657b 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/03/08 15:56:45 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/22 09:01:25 wiz Exp $
DISTNAME= gtranslator-1.1.7
PKGREVISION= 4
@@ -11,7 +11,6 @@ COMMENT= Gettext po file editor for the GNOME2 desktop environment
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 2c990a9ba5c..cb8f0794eb9 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:03 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= leafpad-0.8.4
@@ -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
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 628c8f1365b..497475cd9e5 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2009/05/21 00:17:32 zafer Exp $
+# $NetBSD: Makefile.common,v 1.48 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= lyx-1.4.5.1
@@ -24,7 +24,6 @@ PLIST_SRC= ${.CURDIR}/../../editors/lyx-qt/PLIST.common
UNLIMIT_RESOURCES+= datasize
-USE_DIRS+= texmf-1.0
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_TOOLS+= gmake perl:run
diff --git a/editors/lyx15/Makefile b/editors/lyx15/Makefile
index a8bb4451da8..68cdf6e254d 100644
--- a/editors/lyx15/Makefile
+++ b/editors/lyx15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/28 19:56:45 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= lyx-1.5.4
@@ -22,7 +22,6 @@ CONFLICTS= lyx-qt-[0-9]*
CONFLICTS+= lyx-xforms-[0-9]*
UNLIMIT_RESOURCES+= datasize
-USE_DIRS+= texmf-1.0
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 0bac8227412..92811191278 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2009/06/11 08:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= mlview-0.9.0
@@ -14,7 +14,6 @@ COMMENT= XML editor for the GNOME environment
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_LANGUAGES+= c c++
diff --git a/editors/notecase/Makefile b/editors/notecase/Makefile
index 899916fef9b..d3e34202b92 100644
--- a/editors/notecase/Makefile
+++ b/editors/notecase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/05/15 19:18:06 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= notecase-1.8.8_src
@@ -14,7 +14,6 @@ WRKSRC= ${WRKDIR}/notecase-1.8.8
USE_LANGUAGES= c c++
USE_TOOLS+= gmake msgfmt pkg-config gsed
TOOLS_PLATFORM.gsed= #empty, override nonsense in tools
-USE_DIRS+= xdg-1.1
INSTALLATION_DIRS= share/doc/notecase share/locale/fr_CA/LC_MESSAGES \
share/locale/no/LC_MESSAGES
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 418d37e273d..1742993e3af 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/01/18 08:45:57 shattered Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= poedit-1.3.6
@@ -15,7 +15,6 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip
BROKEN= Requires Unicode version of wxGTK
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.2 gnome2-1.5
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile
index c5cd01bb8c3..084a47464f5 100644
--- a/editors/tomboy/Makefile
+++ b/editors/tomboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/11 08:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:25 wiz Exp $
#
DISTNAME= tomboy-0.14.2
@@ -14,7 +14,6 @@ LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS= xdg-1.4 gnome2-1.6
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
index b78e169cb97..e364d2cb5a3 100644
--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/30 00:07:15 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:26 wiz Exp $
DISTNAME= e-uae-0.8.28
PKGREVISION= 3
@@ -19,7 +19,6 @@ CONFLICTS+= uae-[0-9]*
USE_LIBTOOL= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
.include "options.mk"
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 321f00d5f44..b937024c5c7 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/19 19:14:59 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:26 wiz Exp $
#
DISTNAME= raines-0.43.3
@@ -20,7 +20,6 @@ MAKE_ENV+= OSTYPE=linux
REPLACE_PERL= makedep
PTHREAD_OPTS+= require
-USE_DIRS+= xdg-1.1
# XXX Really?
ONLY_FOR_PLATFORM= *-*-i386
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index eafe1bd41d8..dce830e95b5 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/04 01:37:43 hasso Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:26 wiz Exp $
#
DISTNAME= snes9x-1.51-src-gtk-70
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/snes9x-1.51-src/gtk
GNU_CONFIGURE= yes
-USE_DIRS= xdg-1.4
USE_LANGUAGES= c c++
USE_TOOLS+= intltool pkg-config msgfmt
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 78f31b26c76..1bbf5e7ee5a 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/07/12 16:31:59 dholland Exp $
+# $NetBSD: Makefile,v 1.34 2009/07/22 09:01:26 wiz Exp $
STELLA_VERSION= 2.8.4
DISTNAME= stella-${STELLA_VERSION}-src
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-USE_DIRS+= xdg-1.1
UNLIMIT_RESOURCES= datasize
HAS_CONFIGURE= YES
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index c57f98badb7..c8cf1a743cd 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/02/28 15:30:13 adam Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:26 wiz Exp $
DISTNAME= wine-1.1.16
CATEGORIES= emulators
@@ -18,7 +18,6 @@ BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c
USE_LIBTOOL= yes
USE_NCURSES= yes
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 1fbde7c4032..9dca44a808d 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2009/04/20 18:55:42 adam Exp $
+# $NetBSD: Makefile,v 1.152 2009/07/22 09:01:26 wiz Exp $
DISTNAME= wine-1.0.1
PKGREVISION= 2
@@ -19,7 +19,6 @@ ONLY_FOR_PLATFORM+= *-*-x86_64
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c
USE_LIBTOOL= yes
USE_NCURSES= yes
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 1b7f6963d6a..00eaf1babfc 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/05/13 18:29:57 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:26 wiz Exp $
DISTNAME= yabause-0.9.5
CATEGORIES= emulators
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_TOOLS+= pkg-config
-USE_DIRS+= xdg-1.4
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/gtkglext/buildlink3.mk"
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index e2c56751df1..e45a526bb54 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/03/08 15:56:45 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:26 wiz Exp $
DISTNAME= gnucash-docs-2.2.0
CATEGORIES= finance
@@ -13,7 +13,6 @@ COMMENT= Documentation for GnuCash - personal double-entry accounting program
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 33ce841d649..43dff264a69 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2009/05/20 00:58:16 wiz Exp $
+# $NetBSD: Makefile,v 1.135 2009/07/22 09:01:26 wiz Exp $
#
DISTNAME= gnucash-2.2.9
@@ -17,7 +17,6 @@ DEPENDS+= guile-www>=2.21:../../devel/guile-www
DEPENDS+= p5-Finance-Quote-[0-9]*:../../finance/p5-Finance-Quote
DEPENDS+= p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool makeinfo msgfmt perl:run pkg-config
diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile
index 49a6ab98121..4b1a03d9c41 100644
--- a/fonts/ec-fonts-mftraced/Makefile
+++ b/fonts/ec-fonts-mftraced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/30 00:07:15 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:27 wiz Exp $
#
DISTNAME= ec-fonts-mftraced-1.0.8
@@ -12,7 +12,6 @@ COMMENT= EC PostScript Type1 fonts with TFMs for TeX
MAKE_JOBS_SAFE= no
-USE_DIRS+= texmf-1.1
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
USE_TOOLS+= gmake
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 6e70209ea83..fd667889fcd 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2009/07/09 18:04:31 drochner Exp $
+# $NetBSD: Makefile,v 1.65 2009/07/22 09:01:27 wiz Exp $
#
DISTNAME= gucharmap-2.26.3.1
@@ -14,7 +14,6 @@ COMMENT= Unicode/ISO10646 character map and font viewer
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/fonts/tex-uhc-fonts-base/Makefile.common b/fonts/tex-uhc-fonts-base/Makefile.common
index 491b9d178a4..5b6313afbb5 100644
--- a/fonts/tex-uhc-fonts-base/Makefile.common
+++ b/fonts/tex-uhc-fonts-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2009/07/22 09:01:27 wiz Exp $
DISTNAME= uhc-fonts-1.0
CATEGORIES= fonts
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
NO_CONFIGURE= yes
-USE_DIRS+= texmf-1.0
.include "../../print/teTeX/module.mk"
diff --git a/fonts/tex-unttf/Makefile b/fonts/tex-unttf/Makefile
index 560ae7f0609..20404e64747 100644
--- a/fonts/tex-unttf/Makefile
+++ b/fonts/tex-unttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:18 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:27 wiz Exp $
#
DISTNAME= fonts-unttf-20070507
@@ -17,7 +17,6 @@ DEPENDS+= un-extra-ttf>=1.0.1:../../fonts/un-extra-ttf
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/fonts-unttf
-USE_DIRS+= texmf-1.0
USE_TOOLS+= pax
NO_CONFIGURE= yes
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 4e81594493c..7657a2e2c5a 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/06 14:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:27 wiz Exp $
#
DISTNAME= atomix-2.14.0
@@ -14,7 +14,6 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
USE_TOOLS+= intltool pkg-config gmake
-USE_DIRS+= xdg-1.1 gnome2-1.6
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 964c3fb138a..5ad64a79280 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/02/09 21:11:52 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2009/07/22 09:01:27 wiz Exp $
DISTNAME= ccgo-0.3.6.3
CATEGORIES= games
@@ -14,7 +14,6 @@ DEPENDS+= gnugo>=3.4:../../games/gnugo
USE_LANGUAGES= c c++
USE_TOOLS+= msgfmt pkg-config
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/games/crimsonfields/Makefile b/games/crimsonfields/Makefile
index 22c41404bfb..e54951270eb 100644
--- a/games/crimsonfields/Makefile
+++ b/games/crimsonfields/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/06/12 02:14:30 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:27 wiz Exp $
#
DISTNAME= crimson-0.5.2
@@ -13,7 +13,6 @@ COMMENT= Tactical war game in the tradition of Battle Isle
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
# not standard locale files
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 3a2833fe6e5..451fe03f1a2 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/07/08 17:03:35 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:27 wiz Exp $
DISTNAME= dopewars-1.5.12
CATEGORIES= games
@@ -10,7 +10,6 @@ COMMENT= Make a fortune dealing drugs on the streets of New York
PKG_DESTDIR_SUPPORT= destdir
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index c13ae4fe70c..dee77c5fd60 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/06/14 17:55:03 heinz Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/22 09:01:27 wiz Exp $
DISTNAME= enigma-1.01
CATEGORIES= games
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
GCC_REQD+= 3.3
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 0719262f51c..4b350f2b344 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/06/30 00:07:15 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:27 wiz Exp $
#
DISTNAME= exult-1.2
@@ -12,7 +12,6 @@ COMMENT= Open-source Ultima 7 engine
MAKE_JOBS_SAFE= no
-USE_DIRS+= xdg-1.2
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 7991ce0bd3d..2086cd2a5a7 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/20 00:58:16 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/22 09:01:28 wiz Exp $
#
DISTNAME= freesci-0.3.5
@@ -10,7 +10,6 @@ MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://freesci.linuxgames.com/
COMMENT= Interpreter for Sierra On-Line's SCI games
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= wish:run
diff --git a/games/gamazons/Makefile b/games/gamazons/Makefile
index 23184d8a4a3..7041e5096d3 100644
--- a/games/gamazons/Makefile
+++ b/games/gamazons/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:28 wiz Exp $
#
DISTNAME= gamazons-0.83
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config gmake
-USE_DIRS+= gnome2-1.6 xdg-1.4
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index c64314f6342..45dd39ad54b 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/06/14 19:42:12 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/22 09:01:28 wiz Exp $
#
DISTNAME= gbrainy-1.11
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
USE_LANGUAGES= c
USE_TOOLS+= intltool pkg-config bash:run msgfmt
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 41729120803..f79a5ac732a 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/22 09:01:28 wiz Exp $
DISTNAME= gcompris-8.4.4
PKGREVISION= 3
@@ -18,7 +18,6 @@ USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh
-USE_DIRS+= xdg-1.1 gnome2-1.5
INFO_FILES= yes
DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index 24f715ec0d0..e124aafb12f 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/09/25 14:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:28 wiz Exp $
#
DISTNAME= ggz-client-libs-0.0.14.1
@@ -13,7 +13,6 @@ COMMENT= GGZ Gaming Zone libraries
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
USE_TOOLS+= msgfmt
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 22e4a73b137..62a42b89639 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/15 19:31:19 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:28 wiz Exp $
DISTNAME= gnome-games-extra-data-2.26.0
CATEGORIES= games gnome
@@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME2 games collection - extra data files
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 2318b1bc82b..b7a0c7e743b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2009/07/15 09:53:11 joerg Exp $
+# $NetBSD: Makefile,v 1.100 2009/07/22 09:01:28 wiz Exp $
DISTNAME= gnome-games-2.26.3
CATEGORIES= games gnome
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= xbill-[0-9]*
SUPERSEDES= glchess-[0-9]*
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_CONFIG_WRAPPER= yes
diff --git a/games/gnome-mastermind/Makefile b/games/gnome-mastermind/Makefile
index 5a367262ff4..4b2a8f6eadf 100644
--- a/games/gnome-mastermind/Makefile
+++ b/games/gnome-mastermind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/07/14 12:56:04 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:28 wiz Exp $
#
DISTNAME= gnome-mastermind-0.3.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
-USE_DIRS+= xdg-1.1 gnome2-1.5
.include "../../devel/glib2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index e250de0dd61..9ccaae2a60d 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/06/20 01:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:28 wiz Exp $
#
DISTNAME= grhino-0.16.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config msgfmt
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 0490783f976..fb3e2d902b5 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/06/20 01:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= gtetrinet-0.7.11
@@ -13,7 +13,6 @@ COMMENT= Multiplayer tetris game for GNOME2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 3459669be48..e30999f810b 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/09 03:04:00 dsainty Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= liquidwar-5.6.4
@@ -11,7 +11,6 @@ COMMENT= Unique multiplayer wargame
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index f687c23d81c..5d944693c71 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2009/03/22 16:39:14 hasso Exp $
+# $NetBSD: Makefile,v 1.32 2009/07/22 09:01:29 wiz Exp $
DISTNAME= openttd-0.6.3-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -12,7 +12,6 @@ EXTRACT_SUFX= .tar.bz2
HAS_CONFIGURE= yes
USE_LANGUAGES+= c c++
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config
# Setting the below results in binaries looking in ${DESTDIR} for datafiles
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 3e757af88cf..ac5f4489314 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/03/08 15:56:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= pioneers-0.11.3
@@ -13,7 +13,6 @@ COMMENT= GNOME version of the Settlers of Catan board game
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config msgfmt
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index d8a02c6ae3a..96c4648b117 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/07/14 15:53:20 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= PokerTH-0.7.1-src
@@ -14,7 +14,6 @@ COMMENT= Texas Holdem poker with online play
USE_TOOLS= gmake
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-USE_DIRS+= xdg-1.4
PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 share/pokerth \
diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile
index c0e4c879b39..5bd86f0bb9f 100644
--- a/games/pytraffic/Makefile
+++ b/games/pytraffic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/02/09 22:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= pytraffic-2.5.4
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
# pytraffic-2.5.4 distfile was changed after release
DIST_SUBDIR= pytraffic-2.5.4-070313
-USE_DIRS+= xdg-1.1
PYDISTUTILSPKG= yes
.include "../../lang/python/application.mk"
diff --git a/games/quarry/Makefile b/games/quarry/Makefile
index c424c1f00f0..64ab662a83a 100644
--- a/games/quarry/Makefile
+++ b/games/quarry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/03/08 15:56:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= quarry-0.2.0
@@ -12,7 +12,6 @@ COMMENT= Multi-purpose GUI for several board games
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 484a36bcb47..72e1f4ea87d 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2009/04/28 06:28:09 adam Exp $
+# $NetBSD: Makefile,v 1.58 2009/07/22 09:01:29 wiz Exp $
DISTNAME= scummvm-0.13.1
CATEGORIES= games
@@ -11,7 +11,6 @@ COMMENT= LucasArts Script Creation Utility for Maniac Mansion
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
HAS_CONFIGURE= yes
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index a3d69f4bc80..e51ecffcdd5 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/06/20 01:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:29 wiz Exp $
#
DISTNAME= sirius-0.8.0
@@ -13,7 +13,6 @@ COMMENT= Othello game for GNOME2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 79bceddc644..844856cac32 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/07 23:23:53 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/22 09:01:30 wiz Exp $
DISTNAME= teg-0.11.1
PKGREVISION= 12
@@ -11,7 +11,6 @@ COMMENT= Round-based computer board game
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS= xdg-1.2 gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 3d1d5aa0781..f15977bc433 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/20 00:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:30 wiz Exp $
#
DISTNAME= warzone2100-2.1.1
@@ -19,7 +19,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-USE_DIRS+= xdg-1.4
USE_TOOLS+= pkg-config bison msgfmt intltool gmake gsed gawk flex
TOOLS_PLATFORM.gsed= #empty, override nonsense in tools
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 74a6743f57b..52f51d58d08 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2009/07/18 14:02:24 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2009/07/22 09:01:30 wiz Exp $
DISTNAME= wesnoth-1.6.4
CATEGORIES= games
@@ -15,7 +15,6 @@ BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
PKG_DESTDIR_SUPPORT= user-destdir
CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs}
-USE_DIRS= xdg-1.4
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
diff --git a/games/wormux/Makefile b/games/wormux/Makefile
index c6069a59828..9374ea58eeb 100644
--- a/games/wormux/Makefile
+++ b/games/wormux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/23 13:10:07 adam Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:30 wiz Exp $
DISTNAME= wormux-0.8.3
CATEGORIES= games
@@ -11,7 +11,6 @@ COMMENT= Battle game
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config msgfmt
diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile
index 2869d701232..1f344f9c37d 100644
--- a/games/xbreaky/Makefile
+++ b/games/xbreaky/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:56 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/22 09:01:30 wiz Exp $
#
DISTNAME= xbreaky-0.0.5
@@ -10,7 +10,6 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://xbreaky.sourceforge.net/
COMMENT= Breakout game for X11
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index a2a2760a544..79c62aea1b2 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/07/14 12:56:04 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:30 wiz Exp $
DISTNAME= xpuyopuyo-0.9.1
PKGREVISION= 6
@@ -12,7 +12,6 @@ COMMENT= Tetris-like puzzle game
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome1-1.5
USE_TOOLS+= automake autoconf gmake
USE_X11BASE= YES
USE_LIBTOOL= YES
diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index a32a132a0a7..30a480095b5 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/29 15:42:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:30 wiz Exp $
#
DISTNAME= viking-0.9.8
@@ -18,7 +18,6 @@ REPLACE_PERL= viking-remote
USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_DIRS+= xdg-1.4
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../geography/gpsd/buildlink3.mk"
diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index 2f85e21117b..0eaed4b8227 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/20 15:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/22 09:01:30 wiz Exp $
DISTNAME= cheese-2.26.2
CATEGORIES= graphics
@@ -23,7 +23,6 @@ DEPENDS+= gst-plugins0.10-v4l2>=0.10.10:../../multimedia/gst-plugins0.10-v4l2
.endif
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= pkg-config perl intltool gmake msgfmt
USE_TOOLS+= autoconf automake autoreconf
USE_LIBTOOL= yes
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 98f994c9f6c..05c9a6262dd 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:30 wiz Exp $
#
DISTNAME= comix-4.0.4
@@ -20,7 +20,6 @@ DEPENDS+= unrar-[0-9]*:../../archivers/unrar
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
.endif
-USE_DIRS+= xdg-1.3
MANCOMPRESSED= yes
SUBST_CLASSES+= install-path
diff --git a/graphics/denemo/Makefile b/graphics/denemo/Makefile
index a45cc115bfe..aeac1e002b5 100644
--- a/graphics/denemo/Makefile
+++ b/graphics/denemo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/07/14 12:56:05 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:30 wiz Exp $
#
DISTNAME= denemo-0.7.6
@@ -16,7 +16,6 @@ DEPENDS+= lilypond-[0-9]*:../../print/lilypond
BROKEN_IN= pkgsrc-2006Q4
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.4
USE_TOOLS+= pkg-config
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 03a8fc367e2..a4c6637c4dd 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2007/10/29 22:34:32 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2009/07/22 09:01:31 wiz Exp $
#
.include "Makefile.common"
PKGREVISION= 2
-USE_DIRS+= xdg-1.1
.include "options.mk"
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index ba663cba612..9f3ce070a87 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:01 jlam Exp $
+# $NetBSD: options.mk,v 1.7 2009/07/22 09:01:31 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dia
#PKG_SUPPORTED_OPTIONS= gnome cairo
@@ -10,7 +10,6 @@ PKG_SUGGESTED_OPTIONS= gnome
PLIST_VARS+= cairo gnome
.if !empty(PKG_OPTIONS:Mgnome)
-USE_DIRS+= gnome2-1.5
CONFIGURE_ARGS+= --enable-gnome
. include "../../devel/libgnome/buildlink3.mk"
. include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile
index 5c66434f348..ccb9ff27b4d 100644
--- a/graphics/digikam-doc/Makefile
+++ b/graphics/digikam-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/02/20 19:49:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:31 wiz Exp $
DISTNAME= digikam-doc-0.9.5
CATEGORIES= graphics kde
@@ -11,7 +11,6 @@ COMMENT= Documentation for Digikam
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake perl
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 1aba7b59274..b6406f140c9 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2009/07/09 18:18:58 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/22 09:01:31 wiz Exp $
#
DISTNAME= eog-2.26.3
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= yes
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 72820057fce..302f26c4a61 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/11 08:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:31 wiz Exp $
#
DISTNAME= f-spot-0.5.0.3
@@ -14,7 +14,6 @@ COMMENT= Full-featured personal photo management application
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt
-USE_DIRS+= gnome2-1.6
MAKE_JOBS_SAFE= no
diff --git a/graphics/frameworks/Makefile b/graphics/frameworks/Makefile
index 56b3ebbae02..68fc450fb4d 100644
--- a/graphics/frameworks/Makefile
+++ b/graphics/frameworks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/10 21:48:51 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:31 wiz Exp $
#
DISTNAME= frameworks-0.3.7
@@ -13,7 +13,6 @@ COMMENT= Stop-motion animation frame capture software
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config gmake autoconf
-USE_DIRS+= xdg-1.4
SUBST_CLASSES= xdg
SUBST_STAGE.xdg= pre-configure
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index 20b9e6256dd..465ae2e0b50 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/06/20 01:09:21 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/22 09:01:31 wiz Exp $
#
DISTNAME= g3d-0.0.2
@@ -12,7 +12,6 @@ COMMENT= 3D modeller with a view of 3D modelling
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/g3d
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
USE_TOOLS+= gmake
USE_X11BASE= YES
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 6bbbf24270f..918790fe4c4 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/09 12:18:28 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:31 wiz Exp $
#
DISTNAME= geeqie-1.0alpha3
@@ -13,7 +13,6 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS= pkg-config gmake msgfmt
-USE_DIRS+= xdg-1.1
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index acb5e78e5e0..1b0bb3e7a76 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2009/02/25 01:17:01 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2009/07/22 09:01:31 wiz Exp $
DISTNAME= gimageview-0.2.27
PKGREVISION= 15
@@ -11,7 +11,6 @@ COMMENT= GTK+ based image viewer with tabbed browsing
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile
index 7a34a15ac5e..e07f10afb93 100644
--- a/graphics/gimmage/Makefile
+++ b/graphics/gimmage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/15 04:04:13 reed Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:32 wiz Exp $
#
DISTNAME= gimmage-0.2.3
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
INSTALLATION_DIRS= share/doc/gimmage
-USE_DIRS+= xdg-1.4
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 1491aedf80b..77076a464c3 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2009/01/07 01:43:49 gdt Exp $
+# $NetBSD: Makefile,v 1.53 2009/07/22 09:01:32 wiz Exp $
DISTNAME= ufraw-0.15
PKGNAME= gimp-${DISTNAME}
@@ -16,7 +16,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config msgfmt
USE_TOOLS+= perl:run pod2man
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --enable-mime
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index ec4e54d1ef8..a4590fa3650 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.182 2009/07/07 10:48:53 obache Exp $
+# $NetBSD: Makefile,v 1.183 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gimp-2.6.6
CATEGORIES= graphics
@@ -22,7 +22,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_DIRS+= xdg-1.1
PKG_SYSCONFSUBDIR= gimp/2.0
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 9f027277065..41410ce2fa4 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/07/21 04:50:40 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gliv-1.9.6
PKGREVISION= 1
@@ -12,7 +12,6 @@ COMMENT= OpenGL image viewer
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gawk gmake msgfmt pkg-config
GNU_CONFIGURE= yes
diff --git a/graphics/gnome-backgrounds/Makefile b/graphics/gnome-backgrounds/Makefile
index c506dd2d5ac..b6e872ea5c6 100644
--- a/graphics/gnome-backgrounds/Makefile
+++ b/graphics/gnome-backgrounds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/03/22 15:59:36 snj Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gnome-backgrounds-2.24.1
CATEGORIES= graphics gnome
@@ -12,7 +12,6 @@ COMMENT= Set of background images for the GNOME Desktop
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.3
USE_TOOLS+= gmake intltool msgfmt
USE_LANGUAGES= c
USE_PKGLOCALEDIR= YES
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 8aa9c41b818..4c93afc198f 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/03/17 00:12:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.64 2009/07/22 09:01:32 wiz Exp $
#
DISTNAME= gnome-icon-theme-2.26.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
NOT_FOR_BULK_PLATFORM= HPUX-*-*
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 8894bf027b9..71b4d3b8342 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/06/30 00:07:17 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gphoto-0.4.3
PKGREVISION= 9
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
-USE_DIRS+= gnome1-1.0
USE_X11BASE= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= yes
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index af67a40780f..65efa991b27 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/06/20 01:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gqview-2.1.5
PKGREVISION= 1
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= msgfmt pkg-config
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gqview-gtk1/Makefile b/graphics/gqview-gtk1/Makefile
index b752ea76f1f..a3ac4d72c92 100644
--- a/graphics/gqview-gtk1/Makefile
+++ b/graphics/gqview-gtk1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gqview-1.2.2
PKGREVISION= 4
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= msgfmt
-USE_DIRS+= xdg-1.1 gnome1-1.5
USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 4dfe0889638..0c1b9aaef77 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2008/11/24 22:19:09 tnn Exp $
+# $NetBSD: Makefile,v 1.67 2009/07/22 09:01:32 wiz Exp $
DISTNAME= gqview-2.0.4
CATEGORIES= graphics x11
@@ -12,7 +12,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= msgfmt pkg-config
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
LIBS+= -lm
LIBS.SunOS+= -lsocket
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index c7c48c7d0ce..7778f578eaa 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/04/07 11:43:57 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2009/07/22 09:01:33 wiz Exp $
DISTNAME= gthumb-2.10.11
CATEGORIES= graphics
@@ -11,7 +11,6 @@ COMMENT= Image viewer and browser for the GNOME Desktop
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= intltool msgfmt pkg-config gmake
-USE_DIRS+= xdg-1.1 gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index e924727384a..3dfe1c424d8 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2009/03/08 15:56:46 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2009/07/22 09:01:33 wiz Exp $
#
DISTNAME= gtkam-0.1.16
@@ -12,7 +12,6 @@ COMMENT= Digital camera access graphical client (GTK2)
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= intltool pkg-config perl msgfmt
diff --git a/graphics/hicolor-icon-theme/Makefile b/graphics/hicolor-icon-theme/Makefile
index d62990ee1f6..86e7b5dc2df 100644
--- a/graphics/hicolor-icon-theme/Makefile
+++ b/graphics/hicolor-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/04/30 13:38:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/22 09:01:33 wiz Exp $
#
DISTNAME= hicolor-icon-theme-0.10
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
NO_BUILD= YES
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= # none, not even C
USE_TOOLS+= gmake
diff --git a/graphics/icon-naming-utils/Makefile b/graphics/icon-naming-utils/Makefile
index c563367fcd6..28d77508547 100644
--- a/graphics/icon-naming-utils/Makefile
+++ b/graphics/icon-naming-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/02/22 15:48:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:33 wiz Exp $
#
DISTNAME= icon-naming-utils-0.8.90
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= p5-XML-Simple>=2.14:../../textproc/p5-XML-Simple
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_LANGUAGES= # none, not even C
USE_TOOLS+= gmake intltool perl:run
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 33709441205..1d6d39a322d 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/06/04 00:05:19 reed Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:33 wiz Exp $
DISTNAME= inkscape-0.46
PKGREVISION= 4
@@ -17,7 +17,6 @@ BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
.endif
GCC_REQD+= 3.0
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 9e227963341..2f0f6cbf2fa 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2009/03/17 21:19:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:33 wiz Exp $
DISTNAME= librsvg-2.26.0
CATEGORIES= graphics gnome
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= librsvg2-gtk-[0-9]* librsvg2-[0-9]*
MAKE_JOBS_SAFE= NO
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES+= c c++
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 16d4e29d39d..06f2c3d4943 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/09 10:27:17 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:33 wiz Exp $
#
PKGNAME= pornview-0.2.0pre1
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/pornview-0.2.0pre1
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 5d274ed7cab..e85643248d3 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2009/02/09 22:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/07/22 09:01:33 wiz Exp $
#
DISTNAME= scigraphica-2.1.0
@@ -10,7 +10,6 @@ MAINTAINER= drochner@NetBSD.org
HOMEPAGE= http://scigraphica.sourceforge.net/
COMMENT= Data analysis and technical graphics
-USE_DIRS+= gnome1-1.5
USE_TOOLS+= gmake intltool pkg-config
USE_GNU_READLINE= YES
diff --git a/graphics/xdvipresent/Makefile b/graphics/xdvipresent/Makefile
index 1d0d3ef1ff8..698cf6a2aa9 100644
--- a/graphics/xdvipresent/Makefile
+++ b/graphics/xdvipresent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/03/17 21:40:46 darcy Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:33 wiz Exp $
#
DISTNAME= xdvipresent-0.6p14
@@ -18,7 +18,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/xdvipresent
NO_BUILD= yes
NO_CONFIGURE= yes
-USE_DIRS+= texmf-1.0
STYDIR= ${PKG_LOCALTEXMFPREFIX}/tex/latex/xdvipresent
EXAMPLES_DIR= ${PREFIX}/share/examples/xdvipresent
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index ba6cbc6e873..91a00d610dc 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/21 13:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:33 wiz Exp $
#
DISTNAME= fldigi-3.03
@@ -12,7 +12,6 @@ COMMENT= Digital radio modem
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile
index f9fde4dda38..84bad0ee005 100644
--- a/ham/xdx/Makefile
+++ b/ham/xdx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/22 09:01:34 wiz Exp $
#
DISTNAME= xdx-2.2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
-USE_DIRS+= xdg-1.4
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 699a4c03752..02200189f4f 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/10/31 12:52:01 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/22 09:01:34 wiz Exp $
#
DISTNAME= xlog-1.5
@@ -12,7 +12,6 @@ COMMENT= Amateur Radio logging program
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS= xdg-1.3
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
USE_TOOLS+= gmake pkg-config
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 8f075f177ed..5308142f788 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:34 wiz Exp $
#
DISTNAME= imhangul_status_applet-0.3
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= imhangul>=0.9.6:../../inputmethod/imhangul
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1 gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index b6129fd361a..af32f40f157 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2009/01/23 13:40:32 obache Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:34 wiz Exp $
#
.include "../../inputmethod/uim/Makefile.common"
@@ -7,7 +7,6 @@ COMMENT= Multilingual input method library
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool pkg-config msgfmt
diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile
index 79a92d48982..4cc7e537c41 100644
--- a/mail/akonadi/Makefile
+++ b/mail/akonadi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/06 11:08:17 markd Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:34 wiz Exp $
DISTNAME= akonadi-1.1.2
CATEGORIES= mail
@@ -18,7 +18,6 @@ BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
DEPENDS+= mysql-server-[0-9]*:../../databases/mysql5-server
DEPENDS+= qt4-mysql-[0-9]*:../../x11/qt4-mysql
-USE_DIRS+= kde4-1.0
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CMAKE= yes
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index eaeca3e7e1b..5bd72136fdc 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2009/03/08 15:56:46 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2009/07/22 09:01:34 wiz Exp $
DISTNAME= balsa-2.3.26
CATEGORIES= mail gnome
@@ -11,7 +11,6 @@ COMMENT= GNOME2 EMail client
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index ff9af9e8d9b..dd7b3bc08e3 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/05/20 00:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/22 09:01:34 wiz Exp $
.include "Makefile.common"
@@ -16,7 +16,6 @@ PKGCONFIG_OVERRIDE+= claws-mail.pc.in
PKG_SYSCONFSUBDIR= claws-mail
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-USE_DIRS+= xdg-1.4
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 58ba49ab444..a756873d57c 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2009/07/09 17:51:42 drochner Exp $
+# $NetBSD: Makefile,v 1.91 2009/07/22 09:01:34 wiz Exp $
#
DISTNAME= evolution-data-server-2.26.3
@@ -14,7 +14,6 @@ LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
USE_TOOLS+= bison gmake intltool msgfmt pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index d65d48cdafb..87f34a44bfc 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2009/07/09 18:44:20 drochner Exp $
+# $NetBSD: Makefile,v 1.151 2009/07/22 09:01:34 wiz Exp $
DISTNAME= evolution-2.26.3
CATEGORIES= mail time gnome
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "options.mk"
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= bison gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index afbde1ec13c..c60c599d00e 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/03/08 15:56:46 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2009/07/22 09:01:34 wiz Exp $
#
DISTNAME= mail-notification-5.0
@@ -14,7 +14,6 @@ COMMENT= Status icon that provides new mail notifications
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 79233a6c4b5..b2a8cc41aad 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2009/05/02 16:21:44 reed Exp $
+# $NetBSD: Makefile,v 1.116 2009/07/22 09:01:35 wiz Exp $
DISTNAME= sylpheed-2.6.0
CATEGORIES= mail news x11
@@ -14,7 +14,6 @@ CONFLICTS= sylpheed-claws-[0-9]*
PREV_PKGPATH= mail/sylpheed-devel
-USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake msgfmt pkg-config
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
index ab44ddccc31..9e6f074a2db 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.46 2009/06/24 08:45:52 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.47 2009/07/22 09:01:35 wiz Exp $
# used by mail/thunderbird/Makefile
# used by mail/thunderbird-gtk1/Makefile
@@ -24,7 +24,6 @@ CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
-USE_DIRS+= xdg-1.4
.PHONY: install-desktop
post-install: install-desktop
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index bef5105dd01..4604e6a18b5 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/25 19:50:19 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/22 09:01:35 wiz Exp $
#
DISTNAME= galculator-1.3.4
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake msgfmt pkg-config intltool
-USE_DIRS+= xdg-1.1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 703e7a44ef0..c3bd4129818 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2009/07/09 18:39:29 drochner Exp $
+# $NetBSD: Makefile,v 1.83 2009/07/22 09:01:35 wiz Exp $
#
DISTNAME= gcalctool-5.26.3
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
CONFIGURE_ENV+= HAVE_YACC=yes
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_TOOLS+= bison gmake intltool flex msgfmt pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/math/genius/Makefile b/math/genius/Makefile
index 12720ce61c3..4845c5528f9 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/06/11 08:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/22 09:01:35 wiz Exp $
#
DISTNAME= genius-1.0.6
@@ -16,7 +16,6 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config gmake intltool msgfmt
-USE_DIRS+= gnome2-1.5
USE_GNU_READLINE= yes
do-test:
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 9aa8b466833..23827bfb101 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2009/05/20 00:58:22 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2009/07/22 09:01:35 wiz Exp $
#
DISTNAME= gnumeric-1.8.4
@@ -13,7 +13,6 @@ COMMENT= Spreadsheet program from the GNOME project (development version)
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.6 xdg-1.1
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_LIBTOOL= YES
diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile
index 68079a22b4b..72c2d704822 100644
--- a/math/graphopt/Makefile
+++ b/math/graphopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:22 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:35 wiz Exp $
#
DISTNAME= graphopt-0.4.1
@@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/graphopt/
COMMENT= Optimize graph layouts
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
diff --git a/math/octave/Makefile b/math/octave/Makefile
index e9bc59b7178..fe80e43a3c6 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2009/07/19 00:33:10 asau Exp $
+# $NetBSD: Makefile,v 1.81 2009/07/22 09:01:35 wiz Exp $
DISTNAME= octave-${OCTAVE_VER}
CATEGORIES= math
@@ -26,7 +26,6 @@ USE_GNU_READLINE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake makeinfo perl gsed pkg-config
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
GCC_REQD+= 3.0
USE_LANGUAGES= c c++ fortran
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index f823f13b1c0..7eb7ca53e75 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.16 2007/06/19 13:31:01 joerg Exp $
+# $NetBSD: kde3.mk,v 1.17 2009/07/22 09:01:35 wiz Exp $
#
# This Makefile fragment is included by packages that use the KDE3
# configure-and-build process.
@@ -99,7 +99,6 @@ _IN_ARTS_BUILD?= no
.if !empty(_IN_ARTS_BUILD:M[nN][oO])
BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.3.3nb1
.include "../../x11/qt3-libs/buildlink3.mk"
-USE_DIRS+= kde3-1.0
.endif
.include "../../x11/qt3-tools/buildlink3.mk"
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
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index df9c467ec9f..556eb138bcb 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:38 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:38 wiz Exp $
DISTNAME= alevt-1.6.1
CATEGORIES= multimedia
@@ -16,7 +16,6 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
NetBSD-1.5_ALPHA-* NetBSD-1.[56]*-* \
NetBSD-[2-9]*-* DragonFly-*-*
-USE_DIRS+= xdg-1.1
USE_X11BASE= YES
USE_TOOLS+= gmake
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 5121d593ba4..e5f13a0647b 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/05/20 00:58:24 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2009/07/22 09:01:38 wiz Exp $
#
DISTNAME= avidemux_2.4.4
@@ -19,7 +19,6 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt pkg-config
USE_CMAKE= yes
-USE_DIRS+= xdg-1.4
CMAKE_ARGS+= -DNO_ARTS=1
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index c07db7eb0e7..4687c90e341 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/09/22 20:21:03 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:38 wiz Exp $
#
DISTNAME= DVDStyler-1.5.1
@@ -15,7 +15,6 @@ DEPENDS+= dvdauthor>=0.6.10:../../multimedia/dvdauthor
DEPENDS+= dvd+rw-tools-[0-9]*:../../sysutils/dvd+rw-tools
DEPENDS+= mpgtx-[0-9]*:../../graphics/mpgtx
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config msgfmt
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 259a42ca067..cd7fc5f053b 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/06/20 01:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2009/07/22 09:01:38 wiz Exp $
#
DISTNAME= gmencoder-0.1.0
@@ -17,7 +17,6 @@ DEPENDS+= mencoder>=0.90:../../multimedia/mencoder
DEPENDS+= mplayer>=0.90:../../multimedia/mplayer
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake msgfmt pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 06b20eedf9f..ed478d8ec04 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/03/22 19:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:38 wiz Exp $
DISTNAME= gnome-media-2.26.0
CATEGORIES= multimedia gnome
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= gst-plugins0.10-pulse>=0.10.0:../../audio/gst-plugins0.10-pulse
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config xgettext
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index ec4e5f83120..d1a26ff27bd 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/03/06 10:35:21 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/22 09:01:38 wiz Exp $
#
DISTNAME= gopchop-1.1.8
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool msgfmt pkg-config
BROKEN_GETTEXT_DETECTION= yes
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 56b012f598f..21814a89b1d 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/05/19 07:07:50 abs Exp $
+# $NetBSD: Makefile,v 1.39 2009/07/22 09:01:38 wiz Exp $
DISTNAME= gxine-0.5.904
CATEGORIES= multimedia
@@ -15,7 +15,6 @@ USE_TOOLS+= gmake pkg-config perl:build
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+= --disable-lirc
-USE_DIRS+= xdg-1.1
BROKEN_GETTEXT_DETECTION= yes
PTHREAD_OPTS+= require
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 69d443c9cf6..82b0fcc3e09 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/01/28 03:41:09 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= HandBrake-0.9.3
@@ -45,7 +45,6 @@ NO_SRC_ON_FTP= ${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake perl intltool msgfmt pkg-config
USE_TOOLS+= autoconf automake aclocal autoreconf m4
USE_LIBTOOL= yes
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index a523d14cd54..a36758ef3c3 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/07/14 12:56:09 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= libassetml-1.2.1
@@ -12,7 +12,6 @@ COMMENT= Library for sharing image and audio files between projects
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5 # share/gnome/help
USE_TOOLS+= gmake pkg-config texi2html msgfmt
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index 3d89596abf0..2526069e40d 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/06/12 17:24:53 ahoka Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:39 wiz Exp $
DISTNAME= mediatomb-0.11.0
PKGREVISION= 6
@@ -13,7 +13,6 @@ GNU_CONFIGURE= yes
USE_LANGUAGES+= c c++
USE_TOOLS+= pkg-config automake autoconf autoreconf
-USE_DIRS+= xdg-1.4
RCD_SCRIPTS= mediatomb
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index c1021f07162..f60378403ca 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/11 11:41:33 markd Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:39 wiz Exp $
DISTNAME= phonon-4.3.1
CATEGORIES= multimedia
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
DEPENDS+= xine-xcb>=1.1.9:../../x11/xine-xcb
-USE_DIRS+= kde4-1.0
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CMAKE= yes
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 18f1ab4b99f..6d28556010c 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/21 14:47:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= subtitleeditor-0.30.0
@@ -11,7 +11,6 @@ COMMENT= GTK+2 tool to edit movie subtitles
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config msgfmt
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index fcde5bfd9fe..1928be86117 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/17 23:54:24 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= swfdec-gnome-2.26.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_DIRS+= gnome2-1.5 xdg-1.4
USE_PKGLOCALEDIR= YES
GCONF_SCHEMAS= swfdec-thumbnailer.schemas
diff --git a/multimedia/swfdec-mozilla/Makefile b/multimedia/swfdec-mozilla/Makefile
index 9324817bb09..8c149110215 100644
--- a/multimedia/swfdec-mozilla/Makefile
+++ b/multimedia/swfdec-mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/23 18:04:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= swfdec-mozilla-0.8.2
@@ -13,7 +13,6 @@ COMMENT= Mozilla plugin for swfdec
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
#CONFIGURE_ARGS+= --with-plugin-dir=${PREFIX}/...
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 3276eb55ff7..a36e7d26bfd 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2009/07/09 18:20:19 drochner Exp $
+# $NetBSD: Makefile.common,v 1.50 2009/07/22 09:01:39 wiz Exp $
#
# used by multimedia/totem-browser-plugin/Makefile
# used by multimedia/totem-nautilus/Makefile
@@ -19,7 +19,6 @@ FILESDIR= ${.CURDIR}/../../multimedia/totem/files
PLIST_SRC= ${.CURDIR}/../../multimedia/totem/PLIST
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config gawk
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c7cf5c6ec0c..486a951d79c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2009/07/07 16:17:47 tnn Exp $
+# $NetBSD: Makefile,v 1.79 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= vlc-${VLC_VERSION}
@@ -22,7 +22,6 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
USE_LANGUAGES= c99 c++
-USE_DIRS+= xdg-1.4
PLIST_VARS+= x86simd altivec v4l2 vcd cdda
.include "../../mk/bsd.prefs.mk"
diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile
index 2bf4bee6dca..58e670652f0 100644
--- a/multimedia/vlc08/Makefile
+++ b/multimedia/vlc08/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/06/12 17:24:54 ahoka Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:39 wiz Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -25,7 +25,6 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
USE_LANGUAGES= c c++
-USE_DIRS+= xdg-1.4
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index 40d68588a4b..33aba6c4248 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/04/13 12:56:34 martti Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:40 wiz Exp $
#
DISTNAME= xfmedia-0.9.2
@@ -12,7 +12,6 @@ HOMEPAGE= http://spuriousinterrupt.org/projects/xfmedia/
COMMENT= Xfce media player based on xine
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.2
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 7ca5b1fbca2..3ca02d0c5f4 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2009/05/20 00:58:24 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2009/07/22 09:01:40 wiz Exp $
#
DISTNAME= xine-ui-0.99.5
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= YES
USE_TOOLS+= msgfmt pkg-config
-USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_GNU_READLINE= yes
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 942c65ab7e3..77b6d643d77 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/06/06 13:08:27 obache Exp $
+# $NetBSD: Makefile,v 1.39 2009/07/22 09:01:40 wiz Exp $
DISTNAME= aMule-2.2.5
PKGNAME= ${DISTNAME:S/aMule/amule/}
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= xmule-[0-9]*
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config perl:run
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 236adc050d5..bb45276ebfe 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/06/09 13:07:13 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/22 09:01:40 wiz Exp $
DISTNAME= avahi-0.6.25
CATEGORIES= net
@@ -12,7 +12,6 @@ LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 2e7565d6a1c..c404d37df88 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2009/03/17 09:10:03 jmcneill Exp $
+# $NetBSD: Makefile,v 1.67 2009/07/22 09:01:40 wiz Exp $
#
DISTNAME= bug-buddy-2.26.0
@@ -13,7 +13,6 @@ COMMENT= Graphical GNOME2 bug reporting tool
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_TOOLS+= autoconf
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 4b822326907..6b99ca2b976 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2009/04/30 20:57:57 zafer Exp $
+# $NetBSD: Makefile,v 1.45 2009/07/22 09:01:40 wiz Exp $
#
DISTNAME= dc_gui2-0.75
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= dctc>=0.85.4:../../net/dctc
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
CONFIGURE_ARGS+= --enable-manual-db-detect
USE_TOOLS+= gmake pkg-config msgfmt
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 6c70f35104a..e3dce76fbd4 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/06/12 02:14:39 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:40 wiz Exp $
DISTNAME= ed2k-gtk-gui-0.6.3
PKGREVISION= 4
@@ -12,7 +12,6 @@ COMMENT= GUI for the eDonkey2000 and Overnet
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CONFIGURE_LDFLAGS=${LDFLAGS:M*:Q}
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 791dfd8673c..6319cee6aab 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/02 16:21:45 reed Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= ekiga-3.2.0
@@ -14,7 +14,6 @@ COMMENT= VoIP and video conferencing application for GNOME
PKG_DESTDIR_SUPPORT= user-destdir
PREV_PKGPATH= net/ekiga-devel
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_TOOLS+= autoconf
USE_PKGLOCALEDIR= yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 853b6949d68..60314d868cb 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2009/03/08 15:56:46 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/22 09:01:41 wiz Exp $
DISTNAME= etherape-0.9.7
PKGREVISION= 5
@@ -10,7 +10,6 @@ HOMEPAGE= http://etherape.sourceforge.net/
COMMENT= Graphical network monitor
USE_TOOLS+= gmake pkg-config
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 9f36a2271b7..c5bd1de622c 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/03/12 15:19:38 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= gnome-netstatus-2.26.0
@@ -13,7 +13,6 @@ COMMENT= Network status applet for the GNOME panel
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 6373e59bdb8..be54b07bca9 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/20 01:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= gnome-nettool-2.26.2
@@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/net/logjam/Makefile b/net/logjam/Makefile
index 564e1d0c158..ece849389f2 100644
--- a/net/logjam/Makefile
+++ b/net/logjam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/10/29 02:05:47 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= logjam-4.5.3
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xmms
-USE_DIRS= xdg-1.4
USE_LIBTOOL= yes
USE_TOOLS+= perl pkg-config intltool msgfmt
diff --git a/net/skype/Makefile b/net/skype/Makefile
index f97550582e1..e30f3aecde8 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= skype_static-1.4.0.118-oss
@@ -26,7 +26,6 @@ EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base compat fontconfig freetype2 glx \
libsigc++2 resmgr x11
-USE_DIRS+= xdg-1.1
USE_TOOLS+= pax
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index c18a74f6a36..0032b1540ce 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= tsclient-0.132
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= rdesktop-[0-9]*:../../net/rdesktop
DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 1ff3470e878..fc305fbab87 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/18 13:31:19 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:41 wiz Exp $
#
DISTNAME= twitux-0.62
@@ -13,7 +13,6 @@ COMMENT= GTK+ Twitter client
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
diff --git a/net/urlgfe/Makefile b/net/urlgfe/Makefile
index 5a2cab6ca6e..87945635bf2 100644
--- a/net/urlgfe/Makefile
+++ b/net/urlgfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:32 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:42 wiz Exp $
#
DISTNAME= urlgfe-1.0.1
@@ -12,7 +12,6 @@ COMMENT= Download manager for X
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index d7e36590149..c81f5b4e353 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/27 21:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:42 wiz Exp $
#
DISTNAME= vinagre-2.26.2
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS= xdg-1.4 gnome2-1.6
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config msgfmt
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 9513a9153c9..685ed6d6caa 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/07/03 10:50:33 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2009/07/22 09:01:42 wiz Exp $
DISTNAME= vino-2.24.1
PKGREVISION= 2
@@ -12,7 +12,6 @@ COMMENT= VNC server for GNOME
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
diff --git a/news/lottanzb/Makefile b/news/lottanzb/Makefile
index e936c7c91f6..6ce04d76ddd 100644
--- a/news/lottanzb/Makefile
+++ b/news/lottanzb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:42 wiz Exp $
#
DISTNAME= lottanzb-0.4.0
@@ -17,7 +17,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
USE_PKGLOCALEDIR= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= intltool msgfmt pkg-config
PYTHON_VERSIONS_ACCEPTED= 25 24
diff --git a/news/pan/Makefile b/news/pan/Makefile
index d4567a859c9..38f8d7e1735 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2009/02/24 12:24:48 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2009/07/22 09:01:42 wiz Exp $
#
DISTNAME= pan-0.133
@@ -13,7 +13,6 @@ COMMENT= Newsreader for GTK2
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake msgfmt perl pkg-config
-USE_DIRS+= gnome2-1.5
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index 5ac094a5ac3..348d71a7cca 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/27 09:24:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:42 wiz Exp $
#
DISTNAME= gnome-packagekit-0.4.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake intltool perl msgfmt
-USE_DIRS+= gnome2-1.6
USE_PKGLOCALEDIR= yes
GCONF_SCHEMAS+= gnome-packagekit.schemas
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 8ce2598cdb0..d16151504ac 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/09/21 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:42 wiz Exp $
DISTNAME= advi-1.6.0
PKGREVISION= 5
@@ -33,7 +33,6 @@ SUBST_STAGE.paths= post-configure
SUBST_FILES.paths= userfile.ml
SUBST_SED.paths= -e "s:/etc/advirc:${PKG_SYSCONFDIR}/advirc:g"
-USE_DIRS+= texmf-1.0
.include "../../print/teTeX/module.mk"
post-extract:
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 5018976229a..9eedf0835d5 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/06/09 21:31:04 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:42 wiz Exp $
DISTNAME= dvipdfmx-20070518
PKGNAME= ${DISTNAME:S/-/-0.0.0./}
@@ -15,7 +15,6 @@ DEPENDS+= adobe-cmaps>=20060615:../../fonts/adobe-cmaps
CONFLICTS+= dvipdfm-[0-9]*
CONFLICTS+= ja-dvipdfm-[0-9]*
-USE_DIRS+= texmf-1.4
USE_TOOLS+= gs:run
GNU_CONFIGURE= YES
MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PREFIX:Q}/share/texmf-dist
diff --git a/print/epdfview/Makefile b/print/epdfview/Makefile
index 4b2e03e2458..37d1c2694ac 100644
--- a/print/epdfview/Makefile
+++ b/print/epdfview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/04 16:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:42 wiz Exp $
#
DISTNAME= epdfview-0.1.7
@@ -16,7 +16,6 @@ GNU_CONFIGURE= yes
USE_LANGUAGES+= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config msgfmt
-USE_DIRS+= xdg-1.4
.include "options.mk"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index c20cf27ac34..5ccd1b9e36e 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2009/05/19 13:45:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.29 2009/07/22 09:01:42 wiz Exp $
#
# used by print/evince/Makefile
# used by print/evince-nautilus/Makefile
@@ -16,7 +16,6 @@ PATCHDIR= ${.CURDIR}/../evince/patches
DISTINFO_FILE= ${.CURDIR}/../evince/distinfo
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index d3b972291e4..a3f9635270e 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/26 18:50:49 drochner Exp $
+# $NetBSD: Makefile,v 1.33 2009/07/22 09:01:43 wiz Exp $
#
DISTNAME= glabels-2.2.5
@@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index d442963a762..3949d2a6809 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/02/15 23:23:43 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:43 wiz Exp $
DISTNAME= lgrind
PKGNAME= lgrind-3.5
@@ -13,7 +13,6 @@ COMMENT= Source pretty printer for LaTeX
WRKSRC= ${WRKDIR}/lgrind/source
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
NO_CONFIGURE= yes
-USE_DIRS+= texmf-1.0
TEX_ACCEPTED= teTeX3
.include "../../print/teTeX/module.mk"
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index b296036f6e5..d82d5c60dc7 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2009/04/08 16:56:53 drochner Exp $
+# $NetBSD: Makefile,v 1.60 2009/07/22 09:01:43 wiz Exp $
DISTNAME= scribus-1.3.3.12
PKGREVISION= 2
@@ -12,7 +12,6 @@ COMMENT= Publishing layout with graphical interface
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.4
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
USE_TOOLS+= gmake perl pkg-config
diff --git a/print/tex-abc/Makefile b/print/tex-abc/Makefile
index d6f9cb04738..985f4ec0f5e 100644
--- a/print/tex-abc/Makefile
+++ b/print/tex-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/10 20:16:06 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:43 wiz Exp $
DISTNAME= abc
PKGNAME= tex-${DISTNAME}-1.0
@@ -13,7 +13,6 @@ COMMENT= Support ABC music notation in LaTeX
DEPENDS+= abcm2ps-[0-9]*:../../print/abcm2ps
DEPENDS+= ps2eps-[0-9]*:../../graphics/ps2eps
-USE_DIRS+= texmf-dirs-1.0
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-algorithm2e/Makefile b/print/tex-algorithm2e/Makefile
index 52f3b0c3bad..4e69fca1fc4 100644
--- a/print/tex-algorithm2e/Makefile
+++ b/print/tex-algorithm2e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/03 15:05:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:43 wiz Exp $
DISTNAME= algorithm2e
PKGNAME= tex-${DISTNAME}-3.9
@@ -13,7 +13,6 @@ COMMENT= Environment for writing algorithms
PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
-USE_DIRS+= texmf-1.4
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-chemarrow/Makefile b/print/tex-chemarrow/Makefile
index c0e0928a08b..2d222f38886 100644
--- a/print/tex-chemarrow/Makefile
+++ b/print/tex-chemarrow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:43 wiz Exp $
#
DISTNAME= chemarrow
@@ -14,7 +14,6 @@ COMMENT= New arrow heads for chemical reaction schemes
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_DIRS+= texmf-1.0
USE_TOOLS+= pax
diff --git a/print/tex-cooking/Makefile b/print/tex-cooking/Makefile
index f3b305fc5e7..1103a331a5b 100644
--- a/print/tex-cooking/Makefile
+++ b/print/tex-cooking/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/15 21:49:07 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:43 wiz Exp $
DISTNAME= cooking
PKGNAME= tex-${DISTNAME}-0.9b
@@ -12,7 +12,6 @@ COMMENT= Typeset recipes
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_DIRS+= texmf-1.0
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-dhucs/Makefile b/print/tex-dhucs/Makefile
index c116edc00dc..d82f2e5f385 100644
--- a/print/tex-dhucs/Makefile
+++ b/print/tex-dhucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/22 09:01:43 wiz Exp $
DISTNAME= dhucs-3.2.2-20070507
PKGNAME= tex-${DISTNAME:C/-[0-9]+$//}
@@ -18,7 +18,6 @@ SITES.fonts-unttf-20070507.tar.gz= \
WRKSRC= ${WRKDIR}/dhucs
NO_BUILD= yes
-USE_DIRS+= texmf-1.0
USE_TOOLS+= bzcat pax perl:run
REPLACE_PERL+= script/makeindex-dhucs.pl
diff --git a/print/tex-draftwatermark/Makefile b/print/tex-draftwatermark/Makefile
index 5ca46846894..bb08b6f33fd 100644
--- a/print/tex-draftwatermark/Makefile
+++ b/print/tex-draftwatermark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/10/26 16:59:23 reed Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:43 wiz Exp $
DISTNAME= draftwatermark
PKGNAME= tex-${DISTNAME}-1.0
@@ -15,7 +15,6 @@ DEPENDS+= tex-everypage>=1.0:../../print/tex-everypage
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_DIRS+= texmf-1.4
INSTALLATION_DIRS= share/doc/tex-draftwatermark
diff --git a/print/tex-everypage/Makefile b/print/tex-everypage/Makefile
index b375e75df36..91483ac0243 100644
--- a/print/tex-everypage/Makefile
+++ b/print/tex-everypage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/10/26 16:57:51 reed Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:43 wiz Exp $
DISTNAME= everypage
PKGNAME= tex-${DISTNAME}-1.0
@@ -13,7 +13,6 @@ COMMENT= LaTeX package for hooks to run on every page
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_DIRS+= texmf-1.4
INSTALLATION_DIRS= share/doc/tex-everypage
diff --git a/print/tex-fixme/Makefile b/print/tex-fixme/Makefile
index 31f7ba5a257..ab3ae451aeb 100644
--- a/print/tex-fixme/Makefile
+++ b/print/tex-fixme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/05/01 18:32:26 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:44 wiz Exp $
DISTNAME= fixme
PKGNAME= tex-${DISTNAME}-3.2
@@ -11,7 +11,6 @@ HOMEPAGE= http://tug.ctan.org/tex-archive/macros/latex/contrib/fixme/
COMMENT= Insert "fixme" notes into draft documents
DIST_SUBDIR= ${PKGNAME}
-USE_DIRS+= texmf-1.2
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-foiltex/Makefile b/print/tex-foiltex/Makefile
index b814cb6738a..ec497f679ef 100644
--- a/print/tex-foiltex/Makefile
+++ b/print/tex-foiltex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:44 wiz Exp $
DISTNAME= # empty
PKGNAME= tex-foiltex-2.1.4a
@@ -17,7 +17,6 @@ NO_BIN_ON_CDROM=${RESTRICTED}
NO_SRC_ON_CDROM=${RESTRICTED}
NO_CONFIGURE= YES
-USE_DIRS+= texmf-1.0
EVAL_PREFIX+= LATEX_PREFIX=latex
LATEX_PREFIX_DEFAULT=${LOCALBASE}
diff --git a/print/tex-glossaries/Makefile b/print/tex-glossaries/Makefile
index 49603b9e70f..b43e9bfb1b6 100644
--- a/print/tex-glossaries/Makefile
+++ b/print/tex-glossaries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/03 15:19:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:44 wiz Exp $
DISTNAME= glossaries
PKGNAME= tex-${DISTNAME}-1.02
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= tex-xkeyval>=2.5f:../../print/tex-xkeyval
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_DIRS+= texmf-1.4
USE_TOOLS+= perl:run
REPLACE_PERL= scripts/makeglossaries
diff --git a/print/tex-hlatex/Makefile b/print/tex-hlatex/Makefile
index 7c85971b569..bd1c74d8516 100644
--- a/print/tex-hlatex/Makefile
+++ b/print/tex-hlatex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/07 04:47:20 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:44 wiz Exp $
DISTNAME= HLaTeX-1.0.1
PKGNAME= tex-hlatex-${DISTNAME:S/HLaTeX-//}
@@ -12,7 +12,6 @@ COMMENT= LaTeX package to typeset Hangul
DEPENDS+= tex-uhc-fonts-base>=1.0:../../fonts/tex-uhc-fonts-base
-USE_DIRS+= texmf-1.0
WRKSRC= ${WRKDIR}/HLaTeX
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-igo/Makefile b/print/tex-igo/Makefile
index 70dd27f5b78..6fe99e08051 100644
--- a/print/tex-igo/Makefile
+++ b/print/tex-igo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/06/11 06:13:35 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:44 wiz Exp $
DISTNAME= igo
PKGNAME= tex-${DISTNAME}-0
@@ -10,7 +10,6 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://www.ctan.org/tex-archive/fonts/igo/
COMMENT= Fonts and macro to typeset Go diagrams
-USE_DIRS+= texmf-1.2
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-memhangul-ucs/Makefile b/print/tex-memhangul-ucs/Makefile
index 1b64a5bcb6d..67f8d763146 100644
--- a/print/tex-memhangul-ucs/Makefile
+++ b/print/tex-memhangul-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/05/13 05:36:52 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:44 wiz Exp $
DISTNAME= memhangul-ucs-1.4.4f
PKGNAME= tex-${DISTNAME}
@@ -15,7 +15,6 @@ DEPENDS+= tex-memoir>=1.618:../../print/tex-memoir
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_DIRS+= texmf-1.2
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 34e4873d6a9..232f62f68b7 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/02/25 17:55:00 minskim Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:44 wiz Exp $
#
DISTNAME= musixtex-112
@@ -18,7 +18,6 @@ TEX_ACCEPTED= teTeX3
WRKSRC= ${WRKDIR}/musixtex-T112
NO_CONFIGURE= yes
-USE_DIRS+= texmf-1.0
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/print/tex-ocrb/Makefile b/print/tex-ocrb/Makefile
index 3e5427dee1c..931e16bf9ee 100644
--- a/print/tex-ocrb/Makefile
+++ b/print/tex-ocrb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/07 03:26:16 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:44 wiz Exp $
#
DISTNAME= ocr-b
@@ -19,7 +19,6 @@ DISTFILES= ocrb10.mf ocrb10e.mf ocrb10f.mf ocrb10g.mf ocrb10l.mf \
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_DIRS+= texmf-1.0
PLIST_SUBST+= LOCALTEXMF=${PKG_LOCALTEXMFPREFIX:S/${PREFIX}\///}
diff --git a/print/tex-pgf/Makefile b/print/tex-pgf/Makefile
index 25de91b6643..076c3eb57b4 100644
--- a/print/tex-pgf/Makefile
+++ b/print/tex-pgf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/04/06 09:31:59 is Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:44 wiz Exp $
#
DISTNAME= pgf-2.00
@@ -15,7 +15,6 @@ DEPENDS= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
USE_LANGUAGES= # none
USE_TOOLS+= pax
-USE_DIRS+= texmf-1.4
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-prosper/Makefile b/print/tex-prosper/Makefile
index 5c5dd57bae5..dde28b06611 100644
--- a/print/tex-prosper/Makefile
+++ b/print/tex-prosper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:44 wiz Exp $
#
DISTNAME= prosper-1.00.4
@@ -15,7 +15,6 @@ COMMENT= LaTeX class for writing transparencies
WRKSRC= ${WRKDIR}/prosper
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_DIRS+= texmf-1.0
USE_TOOLS+= pax
diff --git a/print/tex-resume/Makefile b/print/tex-resume/Makefile
index c782237859a..bbaf14e3b43 100644
--- a/print/tex-resume/Makefile
+++ b/print/tex-resume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/03 15:22:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:45 wiz Exp $
DISTNAME= resume
PKGNAME= tex-${DISTNAME}-20010823
@@ -13,7 +13,6 @@ COMMENT= Resume document style
PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
-USE_DIRS+= texmf-1.4
.include "../../print/teTeX/module.mk"
diff --git a/print/tex-ucs/Makefile b/print/tex-ucs/Makefile
index 72bd85f47da..9840e5a025b 100644
--- a/print/tex-ucs/Makefile
+++ b/print/tex-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/07 03:55:22 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:45 wiz Exp $
#
DISTNAME= unicode
@@ -15,7 +15,6 @@ COMMENT= LaTeX UTF-8 support
WRKSRC= ${WRKDIR}/ucs
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_DIRS+= texmf-1.0
UCSFILES= ucs.sty utf8x.def ucsencs.def
UCSDIR= ${PKG_LOCALTEXMFPREFIX}/tex/latex/ucs
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index ec8f1471103..756e7480c0f 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/03/08 15:56:47 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:45 wiz Exp $
#
DISTNAME= gnome-keyring-manager-2.20.0
@@ -14,7 +14,6 @@ COMMENT= GNOME password and secret manager
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.6
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 2eb07c26774..1e1c938b4bd 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/06/20 01:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:45 wiz Exp $
#
DISTNAME= gpass-0.4.4
@@ -14,7 +14,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/security/policykit-gnome/Makefile b/security/policykit-gnome/Makefile
index ecd39721ba6..3c16e8581e1 100644
--- a/security/policykit-gnome/Makefile
+++ b/security/policykit-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/18 13:30:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:45 wiz Exp $
#
POLICYKIT_GNOME_VER= 0.9.2
@@ -17,7 +17,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEFS+= VARBASE
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/security/policykit/Makefile b/security/policykit/Makefile
index 1e55fb14da1..2b0c4879e2c 100644
--- a/security/policykit/Makefile
+++ b/security/policykit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/03/18 13:30:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:45 wiz Exp $
#
POLICYKIT_VER= 0.9
@@ -28,7 +28,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 autoconf
USE_LIBTOOL= YES
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index e90f6f77213..ea7399de71f 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/21 10:52:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/22 09:01:45 wiz Exp $
DISTNAME= seahorse-plugins-2.26.2
CATEGORIES= security
@@ -15,7 +15,6 @@ DEPENDS+= gnupg>=1.2.1:../../security/gnupg
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index a28123fdad2..959be916fc7 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2009/05/21 10:41:23 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2009/07/22 09:01:45 wiz Exp $
DISTNAME= seahorse-2.26.2
CATEGORIES= security
@@ -26,7 +26,6 @@ SSH_KEYGEN_PATH=${PREFIX}/ssh-keygen
.endif
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gawk gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
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
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index b7bdef89f4d..be07634bebc 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/07/08 13:56:00 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:48 wiz Exp $
#
DISTNAME= gnome-doc-utils-0.16.1
@@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt
DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
USE_TOOLS+= intltool pkg-config gmake gawk msgfmt
-USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= YES
TEST_TARGET= check
USE_PKGLOCALEDIR= YES
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index dffd74f4882..7ac7faa1afe 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/07/22 09:01:48 wiz Exp $
DISTNAME= gnome-spell-1.0.8
PKGREVISION= 1
@@ -13,7 +13,6 @@ COMMENT= Spell checking as you type like gtkspell
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.3
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 71d9c0ef6cd..25772b0889f 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2009/03/08 15:56:47 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/22 09:01:48 wiz Exp $
#
DISTNAME= gtk-doc-1.11
@@ -19,7 +19,6 @@ DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= gtk-doc.pc.in
CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
-USE_DIRS+= gnome2-1.6
USE_TOOLS+= gmake perl:run pkg-config
.include "options.mk"
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index cc6b3b936a0..beb44662ba5 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/05/21 16:15:44 sno Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/22 09:01:48 wiz Exp $
DISTNAME= latex2html-2008
#PKGNAME= latex2html-2008
@@ -14,7 +14,6 @@ DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
DEPENDS+= netpbm>=10.29nb2:../../graphics/netpbm
TEX_ACCEPTED= teTeX3
-USE_DIRS+= texmf-1.0
USE_TOOLS+= gs:run perl:run
GNU_CONFIGURE= yes
diff --git a/time/cairo-clock/Makefile b/time/cairo-clock/Makefile
index 03034f2e137..076dd14d6ee 100644
--- a/time/cairo-clock/Makefile
+++ b/time/cairo-clock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/12 02:14:52 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= cairo-clock_0.3.3-1
@@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/cairo-clock-0.3.3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= intltool pkg-config msgfmt
-USE_DIRS+= xdg-1.1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 3ac2e83bf45..77d9a1dfec9 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2009/03/22 17:06:53 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= evolution-webcal-2.26.0
@@ -13,7 +13,6 @@ COMMENT= GNOME URL handler for web-published iCal calendar files
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 6ceb4f76c0c..fa60a356ee8 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/20 00:58:28 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2009/07/22 09:01:49 wiz Exp $
DISTNAME= gnotime-2.3.0
PKGREVISION= 1
@@ -12,7 +12,6 @@ COMMENT= Time tracker for GNOME2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile
index 214e0af6afc..90d1d9e7c5b 100644
--- a/time/gtodo-applet/Makefile
+++ b/time/gtodo-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/30 00:53:53 zafer Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= gtodo-applet-0.1
@@ -16,7 +16,6 @@ DEPENDS+= gtodo>=0.14:../../time/gtodo
USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= YES
.include "../../devel/GConf/schemas.mk"
diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile
index 5f04175e9e8..b22d837d778 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/07/14 12:56:13 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= gtodo-0.14
@@ -13,7 +13,6 @@ COMMENT= To-do list manager for the GNOME desktop
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/time/hamster-applet/Makefile b/time/hamster-applet/Makefile
index ea9dac9edce..165dd8a65aa 100644
--- a/time/hamster-applet/Makefile
+++ b/time/hamster-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/07/17 18:11:24 hasso Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= hamster-applet-2.26.2
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config msgfmt
diff --git a/time/planner/Makefile b/time/planner/Makefile
index 84da42db3f2..f824a62af64 100644
--- a/time/planner/Makefile
+++ b/time/planner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/13 01:00:49 dsainty Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= planner-0.14.4
@@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2 # OR any later version
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index c5107aad919..105e499fa53 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2008/05/10 08:02:04 obache Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:49 wiz Exp $
DISTNAME= AfterStep-2.1.2
PKGNAME= ${DISTNAME:S/AfterStep/afterstep/}
@@ -13,7 +13,6 @@ COMMENT= Window manager based on the look and feel of the NeXTStep interface
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= bash:run gmake perl:run pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-send-postcard-to-developer
diff --git a/wm/ccsm/Makefile b/wm/ccsm/Makefile
index 799d8792206..d05fbb28045 100644
--- a/wm/ccsm/Makefile
+++ b/wm/ccsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 21:55:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= ccsm-0.6.0
@@ -13,7 +13,6 @@ COMMENT= CompizConfig Settings Manager
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config gmake msgfmt
-USE_DIRS+= xdg-1.1
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index 3eab1542f49..624c78f5c72 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/03/08 15:56:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/22 09:01:49 wiz Exp $
#
DISTNAME= e16menuedit2-0.0.3
@@ -18,7 +18,6 @@ BROKEN_GETTEXT_DETECTION= yes
GNU_CONFIGURE= yes
USE_TOOLS+= intltool msgfmt pkg-config
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/matchbox-wm/Makefile b/wm/matchbox-wm/Makefile
index c30894ccb55..4c60509222f 100644
--- a/wm/matchbox-wm/Makefile
+++ b/wm/matchbox-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/03 09:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:50 wiz Exp $
#
DISTNAME= matchbox-window-manager-1.1
@@ -11,7 +11,6 @@ HOMEPAGE= http://projects.o-hand.com/matchbox/
COMMENT= Window manager designed for computers with small displays
USE_TOOLS+= pkg-config
-USE_DIRS+= xdg-1.4
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 767f520e52c..8eeae953320 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2009/03/16 20:10:19 jmcneill Exp $
+# $NetBSD: Makefile,v 1.81 2009/07/22 09:01:50 wiz Exp $
#
DISTNAME= metacity-2.26.0
@@ -12,7 +12,6 @@ COMMENT= GNOME-compliant window manager
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5 theme-1.0 xdg-1.4
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= YES
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index 8fb797d4184..f94a19f1b4c 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/11/02 21:50:21 snj Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/22 09:01:50 wiz Exp $
DISTNAME= obconf-2.0.3
CATEGORIES= wm
@@ -13,7 +13,6 @@ COMMENT= Tool for configuring the Openbox window manager
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config
-USE_DIRS+= xdg-1.1
GNU_CONFIGURE= YES
.include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 20f5b3cbe08..2fdb0e178b2 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2009/02/16 12:04:01 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2009/07/22 09:01:50 wiz Exp $
DISTNAME= openbox-3.4.7.2
PKGREVISION= 1
@@ -16,7 +16,6 @@ DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5 xdg-1.4
USE_TOOLS+= gmake msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index d49f72b15ea..9a7a7fe4123 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2009/07/14 10:33:28 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2009/07/22 09:01:50 wiz Exp $
#
DISTNAME= sawfish-1.5.0
@@ -25,7 +25,6 @@ INFO_FILES= YES
PKGCONFIG_OVERRIDE+= sawfish.pc.in
USE_TOOLS+= gmake makeinfo msgfmt pkg-config xgettext
USE_TOOLS+= gtar:run # for librep run-time theme extraction
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index fd8dd903e74..95fe8db9803 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:50 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -10,7 +10,6 @@ PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager themes
-USE_DIRS+= theme-1.1 xdg-1.1
.include "../../wm/xfce4-wm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 10c8c095d5d..0b57cc2e48a 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/12/18 14:12:24 hira Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:50 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -10,7 +10,6 @@ PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager
-USE_DIRS+= xdg-1.4
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index b2751a944e3..ec2d8413aa2 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/09/19 19:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/07/22 09:01:50 wiz Exp $
DISTNAME= amaya-fullsrc-10.0.1
PKGNAME= ${DISTNAME:S/-fullsrc//}
@@ -14,7 +14,6 @@ COMMENT= Web browser/editor from the World Wide Web Consortium (W3C)
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config
GNU_CONFIGURE= yes
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 2a3482ce43e..29397126f30 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2008/06/12 02:14:55 joerg Exp $
+# $NetBSD: Makefile,v 1.80 2009/07/22 09:01:50 wiz Exp $
DISTNAME= bluefish-1.0.7
PKGREVISION= 5
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= weblint-[0-9]*:../../www/weblint
-USE_DIRS+= xdg-1.1
USE_TOOLS+= find gmake grep msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 5b84e9c25c1..7dfc8d92fff 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/03/08 15:56:47 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2009/07/22 09:01:51 wiz Exp $
#
DISTNAME= drivel-2.0.3
@@ -14,7 +14,6 @@ COMMENT= LiveJournal client for the GNOME Desktop
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 86e6767fee9..ade2ba1187d 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2009/03/15 19:16:58 jmcneill Exp $
+# $NetBSD: Makefile,v 1.52 2009/07/22 09:01:51 wiz Exp $
#
DISTNAME= epiphany-extensions-2.26.0
@@ -17,7 +17,6 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
-USE_DIRS+= gnome2-1.5
# Avoid -Werror, which breaks the build sometimes.
CONFIGURE_ARGS+= --enable-compile-warnings=no
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index e610f08c901..b2209e5fbb5 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2009/07/09 18:27:45 drochner Exp $
+# $NetBSD: Makefile,v 1.96 2009/07/22 09:01:51 wiz Exp $
#
DISTNAME= epiphany-2.26.3
@@ -13,7 +13,6 @@ COMMENT= The web browser for the GNOME Desktop
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 92041d6f926..92c435e5a38 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2008/06/12 02:14:55 joerg Exp $
+# $NetBSD: Makefile,v 1.117 2009/07/22 09:01:51 wiz Exp $
#
DISTNAME= galeon-2.0.5
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= galeon-devel-[0-9]*
USE_LANGUAGES= c c++
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 63af8f910c4..fd66dd556c7 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/07/03 14:00:24 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:51 wiz Exp $
#
DISTNAME= kazehakase-0.5.4
@@ -13,7 +13,6 @@ COMMENT= Web browser with multiple layout engines support
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.2
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index 79facd55fb4..4f1fde4b4be 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/07/09 19:11:23 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:51 wiz Exp $
DISTNAME= liferea-1.6.0-rc6
PKGNAME= liferea-1.6.0rc6
@@ -11,7 +11,6 @@ COMMENT= Simple FeedReader clone for reading RSS/RDF feeds
GNU_CONFIGURE= yes
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config msgfmt perl intltool
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 7891def9067..491163490f0 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2009/07/09 19:08:47 drochner Exp $
+# $NetBSD: Makefile,v 1.84 2009/07/22 09:01:51 wiz Exp $
DISTNAME= liferea-1.4.28
CATEGORIES= www
@@ -10,7 +10,6 @@ COMMENT= Simple FeedReader clone for reading RSS/RDF feeds
GNU_CONFIGURE= yes
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config msgfmt perl intltool
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 228d46be0dd..479d84e7ca3 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/06/08 21:17:04 ahoka Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:51 wiz Exp $
DISTNAME= midori-0.1.7
CATEGORIES= www
@@ -11,7 +11,6 @@ EXTRACT_SUFX= .tar.bz2
HAS_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake intltool msgfmt pkg-config
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 9f226ed407f..630fb9cb562 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/06/12 02:14:56 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:51 wiz Exp $
#
DISTNAME= Xaw-XPM-1.1
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= Xaw3d-[0-9]*
WRKSRC= ${WRKDIR}/XawXpm
-USE_DIRS+= xdg-1.1
USE_IMAKE= YES
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile
index 3258cb3ee2d..a668d8f0d72 100644
--- a/x11/alacarte/Makefile
+++ b/x11/alacarte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/07/08 08:44:36 abs Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= alacarte-0.12.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= intltool perl pkg-config gmake msgfmt
-USE_DIRS+= xdg-1.1
PYTHON_VERSIONS_ACCEPTED= 26 25 24
PY_PATCHPLIST= yes
diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile
index f4520b40da1..1f2a13a0738 100644
--- a/x11/driconf/Makefile
+++ b/x11/driconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 22:56:28 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= driconf-0.9.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
DEPENDS+= xdriinfo>=1.0.2:../../x11/xdriinfo
-USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt msgmerge xgettext
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 292542a2018..a89c9ac0fe3 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/03/26 16:49:45 roy Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= fast-user-switch-applet-2.24.0
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= gdm>=2.16.0:../../x11/gdm
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.6
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d49406701e6..e75e7ee8bc3 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2009/04/07 11:40:20 drochner Exp $
+# $NetBSD: Makefile,v 1.152 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gdm-2.20.10
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= zenity>=2.16.0:../../x11/zenity
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 27e3eb02f8a..dc280f8552d 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2009/07/09 18:07:01 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gnome-applets-2.26.3
@@ -16,7 +16,6 @@ BUILD_DEPENDS+= gst-plugins0.10-esound>=0.10.0:../../audio/gst-plugins0.10-esou
BUILD_DEPENDS+= gst-plugins0.10-oss>=0.10.0:../../audio/gst-plugins0.10-oss
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 690c39f01b4..50b9d7de6b4 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/03/22 19:01:41 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gnome-control-center-2.26.0
@@ -13,7 +13,6 @@ COMMENT= GNOME2 configuration utility
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.6
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index c82ff4f32fa..78470e7060d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/07/09 17:50:16 drochner Exp $
+# $NetBSD: Makefile,v 1.95 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gnome-desktop-2.26.3
@@ -13,7 +13,6 @@ COMMENT= Common GNOME2 desktop files and libgnome-desktop library
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_TOOLS+= automake autoconf aclocal autoreconf m4
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 651d7af117c..f59a3b813d5 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2009/05/19 08:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gnome-mag-0.15.6
@@ -13,7 +13,6 @@ LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 48157ed58a1..ace77a013d9 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2009/07/09 17:54:37 drochner Exp $
+# $NetBSD: Makefile,v 1.113 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gnome-panel-2.26.3
@@ -17,7 +17,6 @@ CONF_FILES+= ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanis
${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index eda7fa7d1eb..00b51455782 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/22 09:01:52 wiz Exp $
#
DISTNAME= gnome-screensaver-2.26.1
@@ -15,7 +15,6 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.3
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 018836c590a..32d4aff68d0 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2009/07/09 18:02:54 drochner Exp $
+# $NetBSD: Makefile,v 1.115 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= gnome-session-2.26.2
@@ -20,7 +20,6 @@ CONFLICTS+= gnome-core<1.4.2nb4
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 7a61ab0aa65..0c57e8436ab 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/09 18:42:35 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= gnome-terminal-2.26.3.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= gnome-core-[0-9]* gnome2-terminal-[0-9]*
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/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index f1046ff837c..54675c1d893 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/08/20 23:46:43 bjs Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= gnome-themes-extras-2.22.0
@@ -17,7 +17,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
EXTRACT_USING= bsdtar
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 4d00c4121d8..9b293857416 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2009/07/09 18:41:26 drochner Exp $
+# $NetBSD: Makefile,v 1.73 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= gnome-themes-2.26.3.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= clearlooks-metacity-[0-9]*
-USE_DIRS+= gnome2-1.5 theme-1.0 xdg-1.4
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index d52e8da1278..dc3c3bea115 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/03/08 15:56:48 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= gnopernicus-1.1.1
@@ -13,7 +13,6 @@ COMMENT= Collection of accessibility apps for GNOME 2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/grandr_applet/Makefile b/x11/grandr_applet/Makefile
index 658b6b1d2e0..678201ed8da 100644
--- a/x11/grandr_applet/Makefile
+++ b/x11/grandr_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= grandr_applet-0.4
@@ -16,7 +16,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config gmake msgfmt
-USE_DIRS+= xdg-1.1
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index fa3ebce4040..0ccfcc49ffc 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/07/22 09:01:53 wiz Exp $
DISTNAME= gtk-engines-0.12
PKGREVISION= 9
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= gtk2-engines-*
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_X11BASE= yes
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= # empty
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 201179a9ebb..a3ea17c1195 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2008/11/18 18:25:50 chuck Exp $
+# $NetBSD: Makefile,v 1.125 2009/07/22 09:01:53 wiz Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 9
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
-USE_DIRS+= xdg-1.1
USE_X11BASE= yes
USE_TOOLS+= gmake msgfmt perl
USE_PKGLOCALEDIR= yes
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 20ae3d10c41..4c72cb9b86b 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/07/14 12:56:15 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:53 wiz Exp $
#
DISTNAME= GTK2-Wonderland-Engine-1.0
@@ -15,7 +15,6 @@ COMMENT= Port of the famous Bluecurve theme for GTK2+
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
diff --git a/x11/gtk2-engines-murrine/Makefile b/x11/gtk2-engines-murrine/Makefile
index 4d93e02f53b..dc91ef990a0 100644
--- a/x11/gtk2-engines-murrine/Makefile
+++ b/x11/gtk2-engines-murrine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/20 18:36:59 hasso Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:53 wiz Exp $
DISTNAME= murrine-0.90.2
PKGNAME= ${DISTNAME:S/^/gtk2-engines-/}
@@ -13,7 +13,6 @@ COMMENT= GTK2+ engine featuring a modern glassy look
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake pkg-config intltool msgfmt
USE_LIBTOOL= yes
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 4698470a120..c5a314b322a 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/05/19 23:22:10 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2009/07/22 09:01:54 wiz Exp $
DISTNAME= gtk-engines-2.18.2
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -23,7 +23,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
USE_TOOLS+= gmake intltool pkg-config msgfmt
GNU_CONFIGURE= yes
-USE_DIRS+= theme-1.1 xdg-1.1
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-animation
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 4798f57903a..c0f8061d041 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.181 2009/07/18 19:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.182 2009/07/22 09:01:54 wiz Exp $
DISTNAME= gtk+-2.16.5
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -19,7 +19,6 @@ CONFLICTS+= gail-[0-9]*
SUPERSEDES= gail-[0-9]*
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt perl pkg-config
USE_LANGUAGES= c c++
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index 67003142bc0..3c5c6b560a4 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:54 wiz Exp $
DISTNAME= gtkstep-1.10
PKGREVISION= 6
@@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= # gone AWOL in 2001 or so
COMMENT= GTK theme-engine to yield a NEXTSTEP(tm) look and feel
-USE_DIRS+= xdg-1.1
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 41ef71affc6..fbeadf84fe7 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/03/15 14:49:01 jmcneill Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/22 09:01:54 wiz Exp $
#
DISTNAME= libgnomekbd-2.26.0
@@ -20,7 +20,6 @@ CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
-USE_DIRS+= xdg-1.1
GCONF_SCHEMAS+= desktop_gnome_peripherals_keyboard_xkb.schemas
PKGCONFIG_OVERRIDE+= libgnomekbd.pc.in
diff --git a/x11/matchbox-panel-manager/Makefile b/x11/matchbox-panel-manager/Makefile
index 4297d11e707..09306098113 100644
--- a/x11/matchbox-panel-manager/Makefile
+++ b/x11/matchbox-panel-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/16 21:46:39 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:54 wiz Exp $
#
DISTNAME= matchbox-panel-manager-0.1
@@ -13,7 +13,6 @@ COMMENT= Manager panel for the Matchbox desktop
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index e240fd6ea21..5f17dd845a8 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/07/16 21:44:08 zafer Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:54 wiz Exp $
#
DISTNAME= matchbox-panel-0.9.2
@@ -13,7 +13,6 @@ COMMENT= Panel for Matchbox
BROKEN_GETTEXT_DETECTION= yes
-USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/x11/matchbox-themes-extra/Makefile b/x11/matchbox-themes-extra/Makefile
index 83626ebb317..150a1e2d3f0 100644
--- a/x11/matchbox-themes-extra/Makefile
+++ b/x11/matchbox-themes-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/16 21:48:49 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:54 wiz Exp $
#
DISTNAME= matchbox-themes-extra-0.3
@@ -13,7 +13,6 @@ COMMENT= Collection of themes for Matchbox
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5 xdg-1.4
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/x11/tile/Makefile b/x11/tile/Makefile
index ba7fc6e4c51..64880502c77 100644
--- a/x11/tile/Makefile
+++ b/x11/tile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/07/07 18:18:11 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:54 wiz Exp $
#
DISTNAME= tile_0.7.3
@@ -15,7 +15,6 @@ COMMENT= X11 Window Tiler
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_DIRS+= xdg-1.2
GNU_CONFIGURE= yes
INSTALL_MAKE_FLAGS= PREFIX=${DESTDIR}${PREFIX}
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index b59ef4b2d9a..e2a861eab76 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/06/11 08:09:28 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/07/22 09:01:54 wiz Exp $
#
DISTNAME= vte-0.20.5
@@ -13,7 +13,6 @@ LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.2
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 7d08603d7da..d4dc32e11ac 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/02/02 15:23:46 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/22 09:01:54 wiz Exp $
DISTNAME= wdm-1.28
CATEGORIES= x11 windowmaker
@@ -9,7 +9,6 @@ HOMEPAGE= http://voins.program.ru/wdm/
COMMENT= WINGs display manager
USE_TOOLS+= msgfmt
-USE_DIRS+= xdg-1.1
USE_X11BASE= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index ec5b29a6089..5fd48906f1e 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/07/09 11:17:10 obache Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/22 09:01:55 wiz Exp $
#
DISTNAME= x11vnc-0.9.8
@@ -12,7 +12,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
GNU_CONFIGURE= yes
diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile
index 8469430135b..c2cdd70506d 100644
--- a/x11/xdesktopwaves/Makefile
+++ b/x11/xdesktopwaves/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/07/07 17:56:35 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:55 wiz Exp $
#
DISTNAME= xdesktopwaves-1.1
@@ -12,7 +12,6 @@ COMMENT= Simulates water waves on the X Windows desktop
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.1
MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
MAKE_FLAGS+= LFLAGS=${LDFLAGS:M*:Q}
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index debef932399..dbe96c2e3ab 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/12/17 12:50:03 hira Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -11,7 +11,6 @@ PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION}
CATEGORIES= x11
COMMENT= Xfce GTK2 themes
-USE_DIRS+= xdg-1.1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 0952167cac7..b9872304e06 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/12/19 23:58:18 hira Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -26,7 +26,6 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/xfce4-session
OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
USE_TOOLS+= iceauth:run
-USE_DIRS+= xdg-1.4
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 1c1c7de7958..86d3fd645be 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/07/14 12:56:20 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:55 wiz Exp $
#
DISTNAME= xpad-1.12
@@ -14,7 +14,6 @@ COMMENT= Sticky notes application in GTK 2
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 5f410ac2573..d853ecb83e4 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/07/07 17:28:04 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/22 09:01:55 wiz Exp $
#
PKGNAME= ${DISTNAME:S/-/-demo-/}
@@ -8,7 +8,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]*
-USE_DIRS+= xdg-1.1
.include "../../x11/xscreensaver/Makefile.common"
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 808fbadf4fe..15c7811926e 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2009/05/22 19:52:02 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2009/07/22 09:01:55 wiz Exp $
DISTNAME= xterm-243
CATEGORIES= x11
@@ -13,7 +13,6 @@ COMMENT= Latest terminal emulator for the X Window System
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_DIRS+= xdg-1.4
USE_TOOLS+= tbl
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 2a583448b5f..7f69bae7f5b 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/03/16 23:00:17 jmcneill Exp $
+# $NetBSD: Makefile,v 1.56 2009/07/22 09:01:55 wiz Exp $
#
DISTNAME= zenity-2.26.0
@@ -12,7 +12,6 @@ COMMENT= Display GNOME dialogs from the command line
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config