diff options
author | jmmv <jmmv> | 2004-04-14 19:30:22 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-04-14 19:30:22 +0000 |
commit | 61b4e3a181e9b52253d64997f3237165cdf29c27 (patch) | |
tree | e30c50a407b6596227e9baab1c0a17bc5650861c /x11 | |
parent | 16af26c1669995ad15df9a271afa4685750d854e (diff) | |
download | pkgsrc-61b4e3a181e9b52253d64997f3237165cdf29c27.tar.gz |
Drop the disctinction of xdg and xdg-x11 from USE_DIRS POV. We can choose
which one is required in an automatic way by checking USE_X11BASE. This
simplifies things and avoids possible problems in the future due to confusion.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/Xaw-Xpm/Makefile | 4 | ||||
-rw-r--r-- | x11/controlcenter/Makefile | 4 | ||||
-rw-r--r-- | x11/gdkxft/Makefile | 4 | ||||
-rw-r--r-- | x11/gdm1/Makefile | 4 | ||||
-rw-r--r-- | x11/gnome-applets/Makefile | 4 | ||||
-rw-r--r-- | x11/gnome-core/Makefile.common | 4 | ||||
-rw-r--r-- | x11/gtk-engines/Makefile | 4 | ||||
-rw-r--r-- | x11/gtk/Makefile | 4 | ||||
-rw-r--r-- | x11/multi-gnome-terminal/Makefile | 4 | ||||
-rw-r--r-- | x11/wdm/Makefile | 4 | ||||
-rw-r--r-- | x11/xscreensaver-demo/Makefile | 4 | ||||
-rw-r--r-- | x11/xscreensaver-gnome/Makefile | 4 |
12 files changed, 24 insertions, 24 deletions
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" |