pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Drop the disctinction of xdg and xdg-x11 from USE_DIRS...
details: https://anonhg.NetBSD.org/pkgsrc/rev/55f9e07d875e
branches: trunk
changeset: 472960:55f9e07d875e
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Wed Apr 14 19:30:22 2004 +0000
description:
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:
audio/gdcd/Makefile | 4 ++--
audio/yamt/Makefile | 4 ++--
chat/gabber/Makefile | 4 ++--
chat/gnomeicu/Makefile | 4 ++--
devel/glade/Makefile | 4 ++--
games/gnome-breakout/Makefile | 4 ++--
graphics/eog/Makefile | 4 ++--
graphics/g3d/Makefile | 4 ++--
graphics/gnome-pixmaps/Makefile | 4 ++--
graphics/gpaint/Makefile | 4 ++--
mail/balsa/Makefile | 4 ++--
math/guppi/Makefile | 4 ++--
misc/ooqstart/Makefile | 4 ++--
mk/dirs.mk | 6 +++---
multimedia/alevt/Makefile | 4 ++--
news/pan-gnome/Makefile | 4 ++--
print/ggv/Makefile | 4 ++--
sysutils/gtop/Makefile | 4 ++--
wm/sawfish/Makefile | 4 ++--
www/galeon/Makefile | 4 ++--
x11/Xaw-Xpm/Makefile | 4 ++--
x11/controlcenter/Makefile | 4 ++--
x11/gdkxft/Makefile | 4 ++--
x11/gdm1/Makefile | 4 ++--
x11/gnome-applets/Makefile | 4 ++--
x11/gnome-core/Makefile.common | 4 ++--
x11/gtk-engines/Makefile | 4 ++--
x11/gtk/Makefile | 4 ++--
x11/multi-gnome-terminal/Makefile | 4 ++--
x11/wdm/Makefile | 4 ++--
x11/xscreensaver-demo/Makefile | 4 ++--
x11/xscreensaver-gnome/Makefile | 4 ++--
32 files changed, 65 insertions(+), 65 deletions(-)
diffs (truncated from 579 to 300 lines):
diff -r 704fa7dbf9c8 -r 55f9e07d875e audio/gdcd/Makefile
--- a/audio/gdcd/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/audio/gdcd/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e audio/yamt/Makefile
--- a/audio/yamt/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/audio/yamt/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e chat/gabber/Makefile
--- a/chat/gabber/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/chat/gabber/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e chat/gnomeicu/Makefile
--- a/chat/gnomeicu/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/chat/gnomeicu/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e devel/glade/Makefile
--- a/devel/glade/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/devel/glade/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e games/gnome-breakout/Makefile
--- a/games/gnome-breakout/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/games/gnome-breakout/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-USE_DIRS+= xdg-x11-1.1
+USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
diff -r 704fa7dbf9c8 -r 55f9e07d875e graphics/eog/Makefile
--- a/graphics/eog/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/graphics/eog/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e graphics/g3d/Makefile
--- a/graphics/g3d/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/graphics/g3d/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e graphics/gnome-pixmaps/Makefile
--- a/graphics/gnome-pixmaps/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/graphics/gnome-pixmaps/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
.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 -r 704fa7dbf9c8 -r 55f9e07d875e graphics/gpaint/Makefile
--- a/graphics/gpaint/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/graphics/gpaint/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e mail/balsa/Makefile
--- a/mail/balsa/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/mail/balsa/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e math/guppi/Makefile
--- a/math/guppi/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/math/guppi/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
.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 -r 704fa7dbf9c8 -r 55f9e07d875e misc/ooqstart/Makefile
--- a/misc/ooqstart/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/misc/ooqstart/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e mk/dirs.mk
--- a/mk/dirs.mk Wed Apr 14 17:52:53 2004 +0000
+++ b/mk/dirs.mk Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
_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 -r 704fa7dbf9c8 -r 55f9e07d875e multimedia/alevt/Makefile
--- a/multimedia/alevt/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/multimedia/alevt/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e news/pan-gnome/Makefile
--- a/news/pan-gnome/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/news/pan-gnome/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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 @@
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 -r 704fa7dbf9c8 -r 55f9e07d875e print/ggv/Makefile
--- a/print/ggv/Makefile Wed Apr 14 17:52:53 2004 +0000
+++ b/print/ggv/Makefile Wed Apr 14 19:30:22 2004 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index