diff options
author | jmmv <jmmv> | 2004-03-08 19:40:36 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-03-08 19:40:36 +0000 |
commit | 86c13741d5aac3e7554ae1450f434384bccf09e2 (patch) | |
tree | 31ed0dbd30601179a2bbef617a33214b104e418a /x11 | |
parent | ea5eb9df0c476c06390c6b0f9497fdd0c4d8cd1e (diff) | |
download | pkgsrc-86c13741d5aac3e7554ae1450f434384bccf09e2.tar.gz |
Handle some shared directories by depending on (or updating dependancies to
the latest versions) xdg-dirs, xdg-x11-dirs or gnome*-dirs.
Bump PKGREVISION.
Diffstat (limited to 'x11')
37 files changed, 116 insertions, 85 deletions
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index 0a229f022bb..bc5f5cf13a2 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2004/01/20 12:28:26 agc Exp $ +# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= Xaw-XPM-1.1 PKGNAME= Xaw-Xpm-1.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/X/} @@ -12,6 +13,8 @@ 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_BUILDLINK2= YES USE_IMAKE= YES diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index 629f5a87291..c018470bd28 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.54 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.55 2004/03/08 19:40:43 jmmv Exp $ DISTNAME= control-center-1.4.0.4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/1.4/} @@ -10,6 +10,7 @@ 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_X11BASE= YES diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index b77d46efc83..0136fc7c8b7 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gdkxft-1.5 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gdkxft/} @@ -10,6 +10,8 @@ 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) diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index ad6e62f91b0..d312e865be5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2004/03/07 12:09:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.53 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gdm-2.4.4.7 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.4/} \ ${MASTER_SITE_LOCAL} @@ -14,6 +14,7 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11 BUILD_USES_MSGFMT= YES +DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK3= YES USE_PKGINSTALL= YES diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile index 29ea2b28042..7758e6ce138 100644 --- a/x11/gdm1/Makefile +++ b/x11/gdm1/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/20 13:33:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:43 jmmv Exp $ DISTNAME= gdm-2.2.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.2/} \ ${MASTER_SITE_LOCAL} @@ -11,6 +11,8 @@ 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 diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index b0da711fd19..cecdf5f803f 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2004/03/07 12:09:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gnome-applets-1.4.0.4 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/} EXTRACT_SUFX= .tar.bz2 @@ -12,6 +12,7 @@ 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 diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 16c41148417..ccaf2fd8a3e 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.96 2004/03/07 12:09:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.97 2004/03/08 19:40:43 jmmv Exp $ # .include "Makefile.common" -PKGREVISION= 11 +PKGREVISION= 12 COMMENT= Core component of GNU Network Object Management Environment -DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs +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 diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common index ae0356e390b..07e2573d1ac 100644 --- a/x11/gnome-core/Makefile.common +++ b/x11/gnome-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 @@ -10,6 +10,7 @@ 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_PKGLOCALEDIR= YES diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 6d291be548e..f3113859f53 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.97 2004/02/18 11:56:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.98 2004/03/08 19:40:43 jmmv Exp $ DISTNAME= gnome-libs-1.4.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/} @@ -9,7 +9,7 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Libraries for the GNU Network Object Model Environment -DEPENDS+= gnome1-dirs>=1.2:../../misc/gnome1-dirs +DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILD_USES_MSGFMT= YES USE_X11BASE= YES diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 8244fd7b65e..d3c2bba28e8 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.34 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gnome-panel-2.4.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.4/} EXTRACT_SUFX= .tar.bz2 @@ -11,7 +11,7 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 panel application -DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme GNU_CONFIGURE= YES diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 8f1da177013..a37a89a3959 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2004/03/08 15:24:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.35 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gnome-session-2.4.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.4/} SITES_gnome-splash-2.4.2.png= ${MASTER_SITE_LOCAL:=gnome-splash/} @@ -13,7 +13,7 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 session management utilities -DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs CONFLICTS+= gnome-core<1.4.2nb4 diff --git a/x11/gnome-themes-extra/Makefile b/x11/gnome-themes-extra/Makefile index f5193ea1135..374ad05742a 100644 --- a/x11/gnome-themes-extra/Makefile +++ b/x11/gnome-themes-extra/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/02/20 13:27:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gnome-themes-extras-0.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.5/} EXTRACT_SUFX= .tar.bz2 @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Extra themes for GNOME 2 -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index 28501b912de..d2409984b56 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2004/03/08 19:40:43 jmmv Exp $ # DISTNAME= gnome-themes-2.4.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-themes/2.4/} EXTRACT_SUFX= .tar.bz2 @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Collection of themes and icons for GNOME 2 -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK3= yes diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile index 317582bf7e7..913c221c863 100644 --- a/x11/gnome1-panel/Makefile +++ b/x11/gnome1-panel/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/08 19:40:43 jmmv Exp $ # .include "../../x11/gnome-core/Makefile.common" PKGNAME= ${DISTNAME:S/-core/-panel/} -PKGREVISION= 6 +PKGREVISION= 7 COMMENT= Gnome-panel component split out from gnome-core -DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs +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 diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile index e83cdbe4fa0..8f6f6757dd8 100644 --- a/x11/gnome1-session/Makefile +++ b/x11/gnome1-session/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/03/08 19:40:44 jmmv Exp $ # .include "../../x11/gnome-core/Makefile.common" PKGNAME= ${DISTNAME:S/-core/-session/} -PKGREVISION= 6 +PKGREVISION= 7 COMMENT= Gnome-session component split out from gnome-core -DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs +DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= xscreensaver-gnome>=4.14:../xscreensaver-gnome BUILD_DEPENDS+= gtk-doc>=0.9:../../textproc/gtk-doc diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index b5b93858494..7cbfd8f760b 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:44 jmmv Exp $ # DISTNAME= gnome-applets-2.4.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/} EXTRACT_SUFX= .tar.bz2 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 panel applets -DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= YES GNU_CONFIGURE= yes diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index d729db0e335..fbdcdf2f256 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.30 2004/02/15 18:37:50 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:44 jmmv Exp $ # DISTNAME= control-center-2.4.0 PKGNAME= gnome2-${DISTNAME} -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.4/} EXTRACT_SUFX= .tar.bz2 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 configuration utility BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.3:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index f8c709df71f..d20773ab88c 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/03/08 19:40:44 jmmv Exp $ # DISTNAME= gnome-terminal-2.4.2 PKGNAME= ${DISTNAME:S/-/2-/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.4/} EXTRACT_SUFX= .tar.bz2 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Xterm like terminal program for GNOME 2 BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs CONFLICTS= gnome-core-[0-9]* diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index 3011e61fb19..9793ecb7601 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:44 jmmv Exp $ # DISTNAME= gnopernicus-0.7.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnopernicus/0.7/} EXTRACT_SUFX= .tar.bz2 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Collection of accessibility apps for GNOME 2 BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_BUILDLINK3= yes USE_GNU_TOOLS+= make diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile index 6ebc70c7461..9ec91feade5 100644 --- a/x11/gtk-engines/Makefile +++ b/x11/gtk-engines/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:44 jmmv Exp $ DISTNAME= gtk-engines-0.12 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/} @@ -9,6 +9,8 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Theme engines for GTK+ +DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs + GNU_CONFIGURE= # defined USE_BUILDLINK2= # defined USE_X11BASE= # defined diff --git a/x11/gtk-engines/PLIST b/x11/gtk-engines/PLIST index 17209ccd1d2..b042c9b8da0 100644 --- a/x11/gtk-engines/PLIST +++ b/x11/gtk-engines/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/01/10 08:46:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:44 jmmv Exp $ lib/gtk/themes/engines/libmetal.la lib/gtk/themes/engines/libmetal.so lib/gtk/themes/engines/libnotif.la @@ -103,5 +103,4 @@ share/themes/Redmond95/gtk/gtkrc @dirrm share/themes/Notif @dirrm share/themes/Metal/gtk @dirrm share/themes/Metal -@unexec ${RMDIR} -p %D/share/themes 2>/dev/null || ${TRUE} @unexec ${RMDIR} -p %D/lib/gtk/themes/engines 2>/dev/null || ${TRUE} diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile index 89d5512f6a4..d1f8687e365 100644 --- a/x11/gtk-thinice-engine/Makefile +++ b/x11/gtk-thinice-engine/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/02/27 01:53:45 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:44 jmmv Exp $ # DISTNAME= gtk-thinice-engine-2.0.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-thinice-engine/2.0/} EXTRACT_SUFX= .tar.bz2 @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://thinice.sourceforge.net/ COMMENT= Simple, clean theme engine -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index d6d91dff511..1543f19ad7b 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2004/02/14 18:26:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.101 2004/03/08 19:40:44 jmmv Exp $ DISTNAME= gtk+-1.2.10 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ @@ -12,6 +12,9 @@ HOMEPAGE= http://www.gtk.org/ 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" diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST index e4272c8540a..d42c19e9ef7 100644 --- a/x11/gtk/PLIST +++ b/x11/gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/01/18 01:11:40 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2004/03/08 19:40:44 jmmv Exp $ bin/gtk-config share/gtk/gtkrc.az share/gtk/gtkrc.be @@ -235,7 +235,6 @@ share/themes/Default/gtk/gtkrc @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE} @dirrm share/themes/Default/gtk @unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE} @dirrm include/gtk-1.2/gtk @dirrm include/gtk-1.2/gdk @dirrm include/gtk-1.2 diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index 08cf58a3128..d12abb298b7 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2004/02/14 18:26:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:45 jmmv Exp $ # DISTNAME= gtk-engines-2.2.0 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/} EXTRACT_SUFX= .tar.bz2 @@ -12,6 +12,8 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Theme engines for GTK+ version 2 +DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs + GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_X11= yes diff --git a/x11/gtk2-engines/PLIST b/x11/gtk2-engines/PLIST index ce620b39259..8f2cb4f222d 100644 --- a/x11/gtk2-engines/PLIST +++ b/x11/gtk2-engines/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/01/18 10:49:33 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:45 jmmv Exp $ lib/gtk-2.0/${PKGVERSION}/engines/libmetal.a lib/gtk-2.0/${PKGVERSION}/engines/libmetal.la lib/gtk-2.0/${PKGVERSION}/engines/libmetal.so @@ -17,6 +17,5 @@ share/themes/Redmond95/gtk-2.0/gtkrc @dirrm share/themes/Redmond95 @dirrm share/themes/Metal/gtk-2.0 @dirrm share/themes/Metal -@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE} @dirrm lib/gtk-2.0/${PKGVERSION}/engines @unexec ${RMDIR} %D/lib/gtk-2.0/${PKGREVISION} 2>/dev/null || ${TRUE} diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 8d626b11891..b791c0ed46e 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.44 2004/02/27 01:52:48 snj Exp $ +# $NetBSD: Makefile,v 1.45 2004/03/08 19:40:44 jmmv Exp $ # DISTNAME= gtk+-2.2.4 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \ @@ -15,6 +15,8 @@ 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_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index fa45b1b947a..edecc90ff07 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2004/02/27 01:52:48 snj Exp $ +@comment $NetBSD: PLIST,v 1.23 2004/03/08 19:40:44 jmmv Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo @@ -779,7 +779,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm share/themes/Default/gtk-2.0-key @dirrm share/themes/Default/gtk-2.0 @unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE} @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 @dirrm share/doc/html/gtk diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile index 3b8e668a320..10bd2721e7e 100644 --- a/x11/gtkstep/Makefile +++ b/x11/gtkstep/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:45 jmmv Exp $ DISTNAME= gtkstep-1.10 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://ulli.linuxave.net/gtkstep/ EXTRACT_SUFX= .tar.bz2 @@ -10,6 +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_BUILDLINK2= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index f12f777fbc6..a4786a8a264 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,9 +1,12 @@ -# $NetBSD: Makefile,v 1.41 2004/02/12 05:04:08 markd Exp $ +# $NetBSD: Makefile,v 1.42 2004/03/08 19:40:45 jmmv Exp $ DISTNAME= kdebase-3.2.0 +PKGREVISION= 1 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 diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index a046ad17637..117e3a1efbf 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2004/02/29 12:00:56 markd Exp $ +# $NetBSD: Makefile,v 1.53 2004/03/08 19:40:45 jmmv Exp $ DISTNAME= kdelibs-3.2.0 +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop PKGREVISION= 1 @@ -8,7 +9,7 @@ PKGREVISION= 1 .include "../../meta-pkgs/kde3/Makefile.kde3" CONFLICTS+= koffice3<=1.1.1 -DEPENDS+= xdg-dirs>=1.0:../../misc/xdg-dirs +DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK2= YES USE_PKGINSTALL= YES diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile index c7ee7cb8ea4..142594f5ee6 100644 --- a/x11/multi-gnome-terminal/Makefile +++ b/x11/multi-gnome-terminal/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2004/03/07 12:09:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:46 jmmv Exp $ DISTNAME= multi-gnome-terminal-1.6.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= gnome x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=multignometerm/} @@ -9,6 +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_X11BASE= # defined USE_GNU_TOOLS+= make diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index dba9c99d690..62d6e4a3373 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2004/02/25 23:19:21 minskim Exp $ +# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:46 jmmv Exp $ DISTNAME= wdm-1.25 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 windowmaker MASTER_SITES= http://voins.program.ru/wdm/ @@ -10,6 +10,7 @@ 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_PKGINSTALL= YES diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile index 813426f8ef5..2b21d27b495 100644 --- a/x11/xfce4-gtk2-engines/Makefile +++ b/x11/xfce4-gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/27 01:54:23 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:46 jmmv Exp $ # .include "../../meta-pkgs/xfce4/Makefile.common" @@ -7,9 +7,11 @@ XFCE4_VERSION= 2.1.8 DISTNAME= gtk-xfce-engine-${XFCE4_VERSION} PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 COMMENT= XFce4 GTK2 themes +DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs + .include "../../x11/gtk2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile index cdd1a8e9e50..f784dc685be 100644 --- a/x11/xpad/Makefile +++ b/x11/xpad/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/02/16 22:20:01 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:46 jmmv Exp $ # DISTNAME= xpad-1.12 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xpad/} EXTRACT_SUFX= .tar.bz2 @@ -12,7 +12,7 @@ HOMEPAGE= http://xpad.sourceforge.net/ COMMENT= Sticky notes application in GTK 2 BUILD_USES_MSGFMT= yes -DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile index 48427cf9198..47b3cfea81a 100644 --- a/x11/xscreensaver-demo/Makefile +++ b/x11/xscreensaver-demo/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2004/02/26 17:31:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 19:40:46 jmmv Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} COMMENT= Screen saver and locker for the X window system (demo program) -PKGREVISION= 3 +PKGREVISION= 4 CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]* +DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs + USE_BUILDLINK3= yes .include "../../x11/xscreensaver/Makefile.common" diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 8fbf55da717..21ade1f1b8a 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.29 2004/02/26 17:31:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/03/08 19:40:46 jmmv Exp $ # PKGNAME= ${DISTNAME:S/-/-gnome-/} COMMENT= Screen saver and locker for the X window system (GNOME applet) -PKGREVISION= 3 +PKGREVISION= 4 CONFLICTS+= xscreensaver<4.14 xscreensaver-demo-[0-9]* +DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs + USE_BUILDLINK3= yes .include "../../x11/xscreensaver/Makefile.common" |