diff options
32 files changed, 65 insertions, 65 deletions
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile index 5a35b40a28f..3b8bc969f7a 100644 --- a/audio/gdcd/Makefile +++ b/audio/gdcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= gdcd-0.2.1 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://gdcd.undergrid.net/ COMMENT= CD player for the X Window System using the GIMP Tool Kit (GTK) -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11= YES GNU_CONFIGURE= YES USE_BUILDLINK3= YES diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index f68311c81cc..4a50ac973f5 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= yamt-0.5 PKGREVISION= 6 @@ -12,7 +12,7 @@ COMMENT= Yet Another MP3 Tool BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_X11= yes USE_GNU_TOOLS+= make diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index 618e228ccfb..7f18befc30f 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= gabber-0.8.8 PKGREVISION= 5 @@ -10,7 +10,7 @@ HOMEPAGE= http://gabber.sourceforge.net/ COMMENT= Gnome Jabber Client USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile index 5486d2b7041..74da27813ba 100644 --- a/chat/gnomeicu/Makefile +++ b/chat/gnomeicu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= gnomeicu-0.96 PKGREVISION= 11 @@ -11,7 +11,7 @@ HOMEPAGE= http://gnomeicu.sourceforge.net/ COMMENT= GNOME ICQ client USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/devel/glade/Makefile b/devel/glade/Makefile index a802ca4fdee..d5a058ed2c4 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.49 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= glade-0.6.4 PKGREVISION= 6 @@ -10,7 +10,7 @@ HOMEPAGE= http://glade.gnome.org/ COMMENT= User interface builder for GTK+ GNU_CONFIGURE= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_X11BASE= yes USE_BUILDLINK3= yes diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile index 18a11f011e7..e5e79fffcab 100644 --- a/games/gnome-breakout/Makefile +++ b/games/gnome-breakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= gnome-breakout-0.5.2 @@ -12,7 +12,7 @@ COMMENT= Gnome version of the classic breakout game GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 594d6010e99..d7bf01e97a7 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= eog-0.6 PKGREVISION= 7 @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_BUILDLINK3= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES .include "../../devel/bonobo/buildlink3.mk" diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile index 5b1d52aa8c6..69d1029d744 100644 --- a/graphics/g3d/Makefile +++ b/graphics/g3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= g3d-0.0.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://condor.stcloudstate.edu/~hebl9901/g3d/ COMMENT= 3D modeller with a view of 3D modelling WRKSRC= ${WRKDIR}/g3d -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_LIBTOOL= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/graphics/gnome-pixmaps/Makefile b/graphics/gnome-pixmaps/Makefile index 8850ab5ebd9..e2271e75621 100644 --- a/graphics/gnome-pixmaps/Makefile +++ b/graphics/gnome-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 @@ -20,7 +20,7 @@ CONFLICTS+= gnome2-pixmaps-[0-9]* .endif USE_BUILDLINK3= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile index 70b2e590cbd..3219b4bbfa9 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= gpaint-0.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://gpaint.sourceforge.net/ COMMENT= Simple, easy-to-use paint program for GNOME USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_GNU_GETTEXT= YES diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 06871e29f50..e7c0efabfec 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/04/14 16:15:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.43 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= balsa-1.4.3 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.balsa.net/ COMMENT= GNOME EMail client GNU_CONFIGURE= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_LIBTOOL= yes USE_X11BASE= yes USE_BUILDLINK2= yes diff --git a/math/guppi/Makefile b/math/guppi/Makefile index be0d2ef9b0f..a8bd46925fa 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.39 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= Guppi-0.40.3 PKGNAME= ${DISTNAME:S/G/g/} @@ -26,7 +26,7 @@ PLIST_SUBST+= GNUMERIC="@comment " .endif USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile index f946ef87932..8f2d31bc7da 100644 --- a/misc/ooqstart/Makefile +++ b/misc/ooqstart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= ooqstart-0.8.3 @@ -14,7 +14,7 @@ COMMENT= OpenOffice quickstart applet for GNOME DEPENDS+= gnome-applets>=1.4.0:../../x11/gnome-applets USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_X11BASE= YES NO_CONFIGURE= YES diff --git a/mk/dirs.mk b/mk/dirs.mk index 2ea0beeca4f..0894d751113 100644 --- a/mk/dirs.mk +++ b/mk/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.1 2004/04/14 15:26:41 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.2 2004/04/14 19:30:22 jmmv Exp $ # .if !defined(DIRS_MK) @@ -17,9 +17,9 @@ ver:= ${dir:C/^.*-//} _USE_GNOME1_DIRS:= ${ver} . elif ${pkg} == "gnome2" && ${_USE_GNOME2_DIRS} < ${ver} _USE_GNOME2_DIRS:= ${ver} -. elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} +. elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE) _USE_XDG_DIRS:= ${ver} -. elif ${pkg} == "xdg-x11" && ${_USE_XDG_DIRS_DIRS} < ${ver} +. elif ${pkg} == "xdg" && ${_USE_XDG_X11_DIRS} < ${ver} && defined(USE_X11BASE) _USE_XDG_X11_DIRS:= ${ver} . endif diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile index 29f7c90832b..88ed4ed9f63 100644 --- a/multimedia/alevt/Makefile +++ b/multimedia/alevt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= alevt-1.6.0 PKGREVISION= 2 @@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \ NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-* \ NetBSD-[2-9]*-* -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/news/pan-gnome/Makefile b/news/pan-gnome/Makefile index e2bf4692d04..d18197f554c 100644 --- a/news/pan-gnome/Makefile +++ b/news/pan-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= pan-0.11.4 @@ -14,7 +14,7 @@ COMMENT= Newsreader for Gnome BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES GNU_CONFIGURE= YES diff --git a/print/ggv/Makefile b/print/ggv/Makefile index cd653efa62a..bc77b7f7b60 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2004/04/14 16:15:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.49 2004/04/14 19:30:22 jmmv Exp $ # DISTNAME= ggv-1.0.2 @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_BUILDLINK3= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_X11BASE= YES diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index 020a5064bea..94d5831ae39 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/04/14 16:15:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.35 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= gtop-1.0.13 PKGREVISION= 8 @@ -13,7 +13,7 @@ BUILD_USES_MSGFMT= YES OSVERSION_SPECIFIC= YES USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index bb96c88d2d7..d8b891e7b2e 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/14 19:30:22 jmmv Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -8,7 +8,7 @@ COMMENT= GNOME-aware window manager that is fully configurable in Lisp DEPENDS+= sawfish-replibs-${SF_VERS}nb4:../../wm/sawfish-replibs -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= # defined CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} diff --git a/www/galeon/Makefile b/www/galeon/Makefile index e2cc3234633..30013f0df84 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2004/04/14 16:15:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.66 2004/04/14 19:30:22 jmmv Exp $ DISTNAME= galeon-1.2.13 PKGREVISION= 3 @@ -19,7 +19,7 @@ EVAL_PREFIX+= GCONF_PREFIX=GConf USE_X11BASE= yes USE_BUILDLINK2= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index 82e304281cd..75ad7a6d6b0 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 19:30:23 jmmv Exp $ # DISTNAME= Xaw-XPM-1.1 @@ -15,7 +15,7 @@ CONFLICTS= Xaw3d-[0-9]* WRKSRC= ${WRKDIR}/XawXpm USE_BUILDLINK3= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_IMAKE= YES PLIST_SRC= ${WRKDIR}/.PLIST_SRC diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index 07191f7fab1..75e7e844f3d 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.59 2004/04/14 19:30:23 jmmv Exp $ DISTNAME= control-center-1.4.0.4 PKGREVISION= 6 @@ -12,7 +12,7 @@ COMMENT= GNOME control-center development library BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index 3f32962fd7e..904fbef0a1e 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 19:30:23 jmmv Exp $ # DISTNAME= gdkxft-1.5 @@ -17,7 +17,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires XFree86-4.0 or higher" .endif USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= YES USE_LIBTOOL= YES diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile index 4467cfb471f..63ff6b479d0 100644 --- a/x11/gdm1/Makefile +++ b/x11/gdm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 19:30:23 jmmv Exp $ DISTNAME= gdm-2.2.0 PKGREVISION= 6 @@ -19,7 +19,7 @@ USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index ef01a72e2e4..7174209b45e 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.41 2004/04/14 19:30:23 jmmv Exp $ # DISTNAME= gnome-applets-1.4.0.4 @@ -16,7 +16,7 @@ BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools BUILDLINK_DEPENDS.gnome-panel= gnome-panel<2.0 USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common index 3cbec78e9d1..20bec3e96a1 100644 --- a/x11/gnome-core/Makefile.common +++ b/x11/gnome-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/04/14 19:30:23 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 @@ -12,7 +12,7 @@ HOMEPAGE?= http://www.gnome.org/ BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile index 51861cc127d..db63585f083 100644 --- a/x11/gtk-engines/Makefile +++ b/x11/gtk-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 19:30:23 jmmv Exp $ DISTNAME= gtk-engines-0.12 PKGREVISION= 6 @@ -13,7 +13,7 @@ CONFLICTS+= gtk2-engines-* GNU_CONFIGURE= # defined USE_BUILDLINK3= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= # defined USE_LIBTOOL= # defined SHLIBTOOL_OVERRIDE= libtool diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 8c4937a41a9..669cbde6707 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2004/04/14 16:15:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.103 2004/04/14 19:30:23 jmmv Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 7 @@ -18,7 +18,7 @@ USE_BUILDLINK3= yes .include "../../mk/bsd.prefs.mk" BUILD_USES_MSGFMT= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PERL5= build USE_X11BASE= yes USE_GNU_TOOLS+= make diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile index a9db20065c5..0b000061bdb 100644 --- a/x11/multi-gnome-terminal/Makefile +++ b/x11/multi-gnome-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 19:30:23 jmmv Exp $ DISTNAME= multi-gnome-terminal-1.6.1 PKGREVISION= 6 @@ -10,7 +10,7 @@ HOMEPAGE= http://multignometerm.sourceforge.net/ COMMENT= Gnome tabbed terminal emulator USE_BUILDLINK2= # defined -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_X11BASE= # defined USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index e686fbc091c..d8f2bdae094 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/04/14 19:30:23 jmmv Exp $ DISTNAME= wdm-1.25 PKGREVISION= 2 @@ -12,7 +12,7 @@ COMMENT= WINGs display manager BUILD_USES_MSGFMT= YES USE_BUILDLINK3= YES -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES USE_X11BASE= YES USE_PKGLOCALEDIR= YES diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile index d08959a0df0..a6506127a27 100644 --- a/x11/xscreensaver-demo/Makefile +++ b/x11/xscreensaver-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 19:30:23 jmmv Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} @@ -8,7 +8,7 @@ PKGREVISION= 4 CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]* USE_BUILDLINK3= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 .include "../../x11/xscreensaver/Makefile.common" diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 81421b9603f..2a4375799ed 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/04/14 19:30:23 jmmv Exp $ # PKGNAME= ${DISTNAME:S/-/-gnome-/} @@ -8,7 +8,7 @@ PKGREVISION= 4 CONFLICTS+= xscreensaver<4.14 xscreensaver-demo-[0-9]* USE_BUILDLINK3= yes -USE_DIRS+= xdg-x11-1.1 +USE_DIRS+= xdg-1.1 .include "../../x11/xscreensaver/Makefile.common" |