diff options
Diffstat (limited to 'x11')
37 files changed, 77 insertions, 88 deletions
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index 35783fc3936..82e304281cd 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/03/11 16:19:03 xtraeme Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= Xaw-XPM-1.1 @@ -13,10 +13,9 @@ COMMENT= Enhanced 3-D widgets based on the Athena Widget set and Xaw3d CONFLICTS= Xaw3d-[0-9]* -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - WRKSRC= ${WRKDIR}/XawXpm USE_BUILDLINK3= YES +USE_DIRS+= xdg-x11-1.1 USE_IMAKE= YES PLIST_SRC= ${WRKDIR}/.PLIST_SRC diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index 5c361cbc129..07191f7fab1 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2004/03/16 14:04:44 tron Exp $ +# $NetBSD: Makefile,v 1.58 2004/04/14 16:15:29 jmmv Exp $ DISTNAME= control-center-1.4.0.4 PKGREVISION= 6 @@ -10,9 +10,9 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME control-center development library BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_X11BASE= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index 0136fc7c8b7..3f32962fd7e 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gdkxft-1.5 @@ -10,8 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://gdkxft.sourceforge.net/ COMMENT= Transparently add anti-aliased font support to gtk+ applications -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/lib/libXft.a) @@ -19,6 +17,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires XFree86-4.0 or higher" .endif USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_X11BASE= YES USE_LIBTOOL= YES diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 2aa54feb334..cc82a5188a9 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/04/02 15:17:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.60 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gdm-2.6.0.0 @@ -13,7 +13,6 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Gnome Display Manager - a re-implementation of the xdm program BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11 @@ -22,6 +21,7 @@ SITES_Daemon.png= ${MASTER_SITE_LOCAL} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile index 7758e6ce138..4467cfb471f 100644 --- a/x11/gdm1/Makefile +++ b/x11/gdm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/14 16:15:29 jmmv Exp $ DISTNAME= gdm-2.2.0 PKGREVISION= 6 @@ -11,8 +11,6 @@ MAINTAINER= mjl@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Gnome Display Manager - a re-implementation of the xdm program -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_BUILDLINK2= YES @@ -21,6 +19,7 @@ USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 09aa48bada9..ef01a72e2e4 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2004/04/02 12:18:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.40 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-applets-1.4.0.4 @@ -12,11 +12,11 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Applets for GNOME BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs BUILDLINK_DEPENDS.gnome-panel= gnome-panel<2.0 USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 1bfcda7c18d..87c2871bca9 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2004/03/26 02:27:59 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2004/04/14 16:15:29 jmmv Exp $ # .include "Makefile.common" @@ -7,7 +7,6 @@ PKGREVISION= 13 COMMENT= Core component of GNU Network Object Management Environment -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= xscreensaver-gnome>=4.14:../xscreensaver-gnome DEPENDS+= gnome-session>=1.4.2:../../x11/gnome1-session DEPENDS+= gnome-panel>=1.4.2:../../x11/gnome1-panel @@ -16,6 +15,8 @@ BUILD_USES_MSGFMT= YES CONFLICTS+= gnome2-terminal-[0-9]* +USE_DIRS+= gnome1-1.5 + .include "../../mk/bsd.prefs.mk" .if (${LOCALBASE} == ${X11PREFIX}) BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2 diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common index 07e2573d1ac..3cbec78e9d1 100644 --- a/x11/gnome-core/Makefile.common +++ b/x11/gnome-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.8 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 @@ -10,9 +10,9 @@ MAINTAINER?= rh@NetBSD.org HOMEPAGE?= http://www.gnome.org/ BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 1d8da1529e5..5116b7a3b40 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/04/01 18:36:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-desktop-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Common GNOME2 desktop files and libgnome-desktop library BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_PERL5= yes diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index fd465b417ee..b7a4bc9a6fa 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2004/03/26 18:48:52 jlam Exp $ +# $NetBSD: Makefile,v 1.102 2004/04/14 16:15:29 jmmv Exp $ DISTNAME= gnome-libs-1.4.2 PKGREVISION= 3 @@ -9,9 +9,9 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Libraries for the GNU Network Object Model Environment -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILD_USES_MSGFMT= YES +USE_DIRS+= gnome1-1.5 USE_X11BASE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index bfcf1ac9fdd..42cef903342 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/01 18:58:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-mag-0.10.10 @@ -10,9 +10,8 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME screen magnifier -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs - USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.2 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index e047f8d1697..93e589ba087 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/04/01 18:46:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-panel-2.6.0 @@ -10,10 +10,9 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 panel application -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs - GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PERL5= YES USE_PKGLOCALEDIR= YES diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index e1d2206528d..ab65d1aac25 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/04/01 18:48:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-session-2.6.0 @@ -12,13 +12,12 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 session management utilities -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs - CONFLICTS+= gnome-core<1.4.2nb4 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile index e851ac10197..9754fb23a78 100644 --- a/x11/gnome-themes-extras/Makefile +++ b/x11/gnome-themes-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/02 11:52:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-themes-extras-0.6 @@ -10,11 +10,11 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Collection of metathemes for the GNOME desktop environment -DEPENDS= xdg-dirs>=1.1:../../misc/gnome2-dirs DEPENDS+= librsvg2-gtk2>=2.6.1:../../graphics/librsvg2-gtk2 BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes +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 1475d1b42f6..dc187e639a3 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/04/03 05:25:17 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-themes-2.6.0 @@ -11,10 +11,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Collection of themes and icons for GNOME 2 -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile index 71e58ae5813..6da1e9e1baa 100644 --- a/x11/gnome1-panel/Makefile +++ b/x11/gnome1-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:59 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:29 jmmv Exp $ # .include "../../x11/gnome-core/Makefile.common" @@ -8,13 +8,14 @@ PKGREVISION= 8 COMMENT= Gnome-panel component split out from gnome-core -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= gnome-session>=1.4.2:../../x11/gnome1-session DEPENDS+= xscreensaver-gnome>=4.14:../xscreensaver-gnome BUILD_DEPENDS+= gtk-doc>=0.9:../../textproc/gtk-doc CONFLICTS+= gnome-core<1.4.2nb4 +USE_DIRS+= gnome1-1.5 + .include "../../mk/bsd.prefs.mk" .if (${LOCALBASE} == ${X11PREFIX}) BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2 diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile index 29019ded07f..19d8859490c 100644 --- a/x11/gnome1-session/Makefile +++ b/x11/gnome1-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:59 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/14 16:15:29 jmmv Exp $ # .include "../../x11/gnome-core/Makefile.common" @@ -8,12 +8,13 @@ PKGREVISION= 8 COMMENT= Gnome-session component split out from gnome-core -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= xscreensaver-gnome>=4.14:../xscreensaver-gnome BUILD_DEPENDS+= gtk-doc>=0.9:../../textproc/gtk-doc CONFLICTS+= gnome-core<1.4.2nb4 +USE_DIRS+= gnome1-1.5 + .include "../../mk/bsd.prefs.mk" .if (${LOCALBASE} == ${X11PREFIX}) BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2 diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index 5b55a3404f4..adcc74e9a51 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/04/13 12:42:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-applets-2.6.0 @@ -10,11 +10,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 panel applets -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= YES GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_X11= yes USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 5de7baf5c49..7aaf87f2cc5 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/04/01 18:40:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.34 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= control-center-2.6.0 @@ -12,12 +12,12 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 configuration utility BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gnome-icon-theme>=1.1.7:../../graphics/gnome-icon-theme USE_MSGFMT_PLURALS= yes GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index 86c9357a1c8..b4e37bfd869 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/04/01 18:50:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-terminal-2.6.0 @@ -12,13 +12,13 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Xterm like terminal program for GNOME 2 BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs CONFLICTS= gnome-core-[0-9]* USE_PERL5= build GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index eded6d0fab1..245fea06d82 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/01 19:04:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 16:15:30 jmmv Exp $ # DISTNAME= gnopernicus-0.8.1 @@ -11,9 +11,9 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Collection of accessibility apps for GNOME 2 BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile index 70784c808fd..51861cc127d 100644 --- a/x11/gtk-engines/Makefile +++ b/x11/gtk-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/04/13 21:35:56 snj Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= gtk-engines-0.12 PKGREVISION= 6 @@ -9,12 +9,11 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Theme engines for GTK+ -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - CONFLICTS+= gtk2-engines-* GNU_CONFIGURE= # defined USE_BUILDLINK3= yes +USE_DIRS+= xdg-x11-1.1 USE_X11BASE= # defined USE_LIBTOOL= # defined SHLIBTOOL_OVERRIDE= libtool diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile index d1f8687e365..5a582ba73c6 100644 --- a/x11/gtk-thinice-engine/Makefile +++ b/x11/gtk-thinice-engine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:30 jmmv Exp $ # DISTNAME= gtk-thinice-engine-2.0.2 @@ -11,10 +11,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://thinice.sourceforge.net/ COMMENT= Simple, clean theme engine -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 1543f19ad7b..8c4937a41a9 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2004/03/08 19:40:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.102 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 7 @@ -13,13 +13,12 @@ COMMENT= The GIMP Toolkit - libraries for building X11 user interfaces PKG_INSTALLATION_TYPES= overwrite pkgviews -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK3= yes .include "../../mk/bsd.prefs.mk" BUILD_USES_MSGFMT= yes +USE_DIRS+= xdg-x11-1.1 USE_PERL5= build USE_X11BASE= yes USE_GNU_TOOLS+= make diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index 897f3630bd8..0b78b92d9be 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/04/05 13:27:00 tron Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= gtk-engines-2.2.0 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -11,12 +11,11 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Theme engines for GTK+ version 2 -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - CONFLICTS+= gtk-engines-* GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_X11= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index b78fb267a29..57ba5a119d8 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/04/01 18:15:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.48 2004/04/14 16:15:30 jmmv Exp $ # DISTNAME= gtk+-2.4.0 @@ -14,9 +14,9 @@ HOMEPAGE= http://www.gtk.org/ COMMENT= The GIMP Toolkit - libraries for building X11 user interfaces BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_X11= yes diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile index 7dee05e9f0b..d90be63a913 100644 --- a/x11/gtkstep/Makefile +++ b/x11/gtkstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/04/13 21:38:25 snj Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= gtkstep-1.10 PKGREVISION= 4 @@ -10,9 +10,8 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://ulli.linuxave.net/gtkstep/index.html COMMENT= GTK theme-engine to yield a NEXTSTEP(tm) look and feel -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 GNU_CONFIGURE= # defined USE_LIBTOOL= # defined diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 05c2b603375..a373ff9d5f2 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.46 2004/03/26 02:28:01 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 2 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README @@ -14,6 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index cd5a6e5477e..9a1052ecb67 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2004/03/26 02:28:01 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGREVISION= 1 @@ -8,9 +8,9 @@ COMMENT= Support libraries for the KDE integrated X11 desktop .include "../../meta-pkgs/kde3/Makefile.kde3" CONFLICTS+= koffice3<=1.1.1 -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile index 142594f5ee6..a9db20065c5 100644 --- a/x11/multi-gnome-terminal/Makefile +++ b/x11/multi-gnome-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= multi-gnome-terminal-1.6.1 PKGREVISION= 6 @@ -9,9 +9,8 @@ MAINTAINER= damon@NetBSD.org HOMEPAGE= http://multignometerm.sourceforge.net/ COMMENT= Gnome tabbed terminal emulator -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK2= # defined +USE_DIRS+= xdg-x11-1.1 USE_X11BASE= # defined USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined diff --git a/x11/vte/Makefile b/x11/vte/Makefile index e48e496f0f5..dc25143f125 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/01 18:49:52 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:30 jmmv Exp $ # DISTNAME= vte-0.11.10 @@ -11,10 +11,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Terminal widget with improved accessibility and I18N support -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes +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 62d6e4a3373..e686fbc091c 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:30 jmmv Exp $ DISTNAME= wdm-1.25 PKGREVISION= 2 @@ -10,9 +10,9 @@ HOMEPAGE= http://voins.program.ru/wdm/ COMMENT= WINGs display manager BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs USE_BUILDLINK3= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGINSTALL= YES USE_X11BASE= YES USE_PKGLOCALEDIR= YES diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile index 4098a66c4b4..9058456a19d 100644 --- a/x11/xfce4-gtk2-engines/Makefile +++ b/x11/xfce4-gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/14 16:15:30 jmmv Exp $ # .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,7 +10,7 @@ PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= XFce4 GTK2 themes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs +USE_DIRS+= xdg-1.1 .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile index f784dc685be..39aca795f3e 100644 --- a/x11/xpad/Makefile +++ b/x11/xpad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:30 jmmv Exp $ # DISTNAME= xpad-1.12 @@ -12,10 +12,10 @@ HOMEPAGE= http://xpad.sourceforge.net/ COMMENT= Sticky notes application in GTK 2 BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_X11= yes diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile index 702d784f5ee..d08959a0df0 100644 --- a/x11/xscreensaver-demo/Makefile +++ b/x11/xscreensaver-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/17 21:04:12 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:30 jmmv Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} @@ -7,9 +7,8 @@ PKGREVISION= 4 CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]* -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-x11-1.1 .include "../../x11/xscreensaver/Makefile.common" diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 21ade1f1b8a..81421b9603f 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/03/08 19:40:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:30 jmmv Exp $ # PKGNAME= ${DISTNAME:S/-/-gnome-/} @@ -7,9 +7,8 @@ PKGREVISION= 4 CONFLICTS+= xscreensaver<4.14 xscreensaver-demo-[0-9]* -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-x11-1.1 .include "../../x11/xscreensaver/Makefile.common" diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 5b74e6f244f..9517d6f8a71 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/04/01 19:05:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 16:15:30 jmmv Exp $ # DISTNAME= zenity-2.6.0 @@ -10,10 +10,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Display GNOME dialogs from the command line -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make |