diff options
| author | jmmv <jmmv> | 2004-04-14 16:15:20 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-04-14 16:15:20 +0000 |
| commit | ff816c1c20fc8b173c1acb7c120607e6bc348db9 (patch) | |
| tree | 3757535e0cffe141412b01910b7f14b0965825b2 | |
| parent | 243e350edbc352e89b5021dd3fe7d7aa24a6c7de (diff) | |
| download | pkgsrc-ff816c1c20fc8b173c1acb7c120607e6bc348db9.tar.gz | |
Make use of the new USE_DIRS variable, instead of directly depending on the
*-dirs packages.
194 files changed, 393 insertions, 470 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index dc44e3516d4..2dc5ce3507a 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/04/01 18:56:04 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:20 jmmv Exp $ # DISTNAME= file-roller-2.6.0 @@ -11,13 +11,13 @@ HOMEPAGE= http://fileroller.sourceforge.net/ COMMENT= Front-end to archiving programs like tar and zip BUILD_USES_MSGFMT= yes -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gtar-base>=1.13.25:../../archivers/gtar-base DEPENDS+= unzip>=5.50nb2:../../archivers/unzip DEPENDS+= zip>=2.3nb2:../../archivers/zip GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PERL5= build USE_PKGLOCALEDIR= yes diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common index 11392a54169..17a5652c05d 100644 --- a/audio/bmp/Makefile.common +++ b/audio/bmp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/04/14 12:46:39 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/04/14 16:15:20 jmmv Exp $ # DISTNAME= bmp-0.9.6.1 @@ -9,14 +9,13 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://beepmp.sourceforge.net/ COMMENT= Beep Media Player (fork of XMMS to work with GTK+ 2.x) -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - DISTINFO_FILE= ${.CURDIR}/../../audio/bmp/distinfo FILESDIR= ${.CURDIR}/../../audio/xmms/files PATCHDIR= ${.CURDIR}/../../audio/bmp/patches GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_X11= yes diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index 3f8994e6f34..ff487d7e799 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2004/04/11 16:08:00 xtraeme Exp $ +# $NetBSD: Makefile,v 1.40 2004/04/14 16:15:20 jmmv Exp $ # DISTNAME= easytag-0.30 @@ -11,10 +11,10 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://easytag.sourceforge.net/ COMMENT= Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILD_USES_MSGFMT= yes # xgettext, really GNU_CONFIGURE= yes +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make USE_X11= yes USE_BUILDLINK3= yes diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile index ba865249273..5a35b40a28f 100644 --- a/audio/gdcd/Makefile +++ b/audio/gdcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/04/11 16:53:36 xtraeme Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:20 jmmv Exp $ # DISTNAME= gdcd-0.2.1 @@ -10,8 +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) -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - +USE_DIRS+= xdg-x11-1.1 USE_X11= YES GNU_CONFIGURE= YES USE_BUILDLINK3= YES diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index 7d2063a51f8..17964096324 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/22 08:12:28 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:20 jmmv Exp $ # DISTNAME= gnome-audio-2.0.0 @@ -11,10 +11,10 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Set of audio files for GNOME -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs NO_CONFIGURE= YES NO_BUILD= YES +USE_DIRS+= xdg-1.1 USE_X11= YES do-install: diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index f5eeefe4319..60f7ec99221 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2004/04/11 17:13:40 xtraeme Exp $ +# $NetBSD: Makefile,v 1.79 2004/04/14 16:15:20 jmmv Exp $ DISTNAME= gqmpeg-0.20.0 PKGREVISION= 4 @@ -10,12 +10,12 @@ HOMEPAGE= http://gqmpeg.sourceforge.net/ COMMENT= GTK+ front end to mpg123 BUILD_USES_MSGFMT= yes -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123 DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools DEPENDS+= xmp>=2.0.2:../../audio/xmp USE_BUILDLINK3= YES +USE_DIRS+= gnome1-1.5 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile index ecbb66d321d..f2308c06a7f 100644 --- a/audio/liteamp/Makefile +++ b/audio/liteamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/11 03:10:25 minskim Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:20 jmmv Exp $ DISTNAME= liteamp-0.2.4.2 CATEGORIES= audio @@ -8,9 +8,8 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://kldp.net/projects/liteamp/ COMMENT= Light-weight Music Player for GNOME2 -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 39339808c2b..0ad287c6af7 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/06 09:53:55 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= rhythmbox-0.7.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.rhythmbox.org/ COMMENT= Music management application for GNOME BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gst-plugins-esound>=0.8.0:../../audio/gst-plugins-esound DEPENDS+= gst-plugins-gnomevfs>=0.8.0:../../sysutils/gst-plugins-gnomevfs DEPENDS+= gst-plugins-mad>=0.8.0:../../audio/gst-plugins-mad @@ -19,6 +18,7 @@ DEPENDS+= gst-plugins-vorbis>=0.8.0:../../audio/gst-plugins-vorbis GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index 08d95aeb581..2784f7dbe24 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/30 22:21:31 xtraeme Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= streamtuner-0.12.1 @@ -9,10 +9,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.nongnu.org/streamtuner/ COMMENT= Stream directory browser -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/audio/sweep/Makefile b/audio/sweep/Makefile index 99bf96cb70d..ef61cdc60c3 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/08 19:40:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= sweep-0.8.2 @@ -10,11 +10,10 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://sweep.sourceforge.net/ COMMENT= Full-featured digital sound editor -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - BUILD_USES_MSGFMT= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome1-1.5 USE_LIBTOOL= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index 6250fadde4d..f68311c81cc 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/04/11 19:13:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= yamt-0.5 PKGREVISION= 6 @@ -10,9 +10,9 @@ HOMEPAGE= http://yamt.sourceforge.net/ COMMENT= Yet Another MP3 Tool BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs USE_BUILDLINK3= yes +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= yes USE_X11= yes USE_GNU_TOOLS+= make diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile index 5154249fce9..b6545ede13d 100644 --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:34 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= oregano-0.20 @@ -10,9 +10,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.dtek.chalmers.se/~d4hult/oregano/ COMMENT= Application for schematic capture/simulation of electrical circuits -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11= YES GNU_CONFIGURE= YES diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common index 073ba8d501a..ba4d8ddb47f 100644 --- a/chat/everybuddy/Makefile.common +++ b/chat/everybuddy/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2004/03/08 19:40:36 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.14 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= everybuddy-0.2.0 CATEGORIES= chat @@ -8,8 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.everybuddy.com/ COMMENT= Universal Instant Messaging Client -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_BUILDLINK2= yes diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index 1bd7d448d2f..618e228ccfb 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= gabber-0.8.8 PKGREVISION= 5 @@ -9,9 +9,8 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://gabber.sourceforge.net/ COMMENT= Gnome Jabber Client -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common index e4ea1e49072..cfdadb6a536 100644 --- a/chat/gaim-gtk1/Makefile.common +++ b/chat/gaim-gtk1/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2004/03/08 19:40:36 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= gaim-0.59.8 @@ -17,8 +17,7 @@ PATCHDIR= ${.CURDIR}/../gaim-gtk1/patches PKGDIR= ${.CURDIR}/../gaim-gtk1 PLIST_SRC= ${.CURDIR}/../gaim-gtk1/PLIST.common -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make USE_X11BASE= YES USE_PKGLOCALEDIR= YES diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 7756f71a0c3..9ff8348229c 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2004/04/02 16:08:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.58 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= gaim-0.76 @@ -11,12 +11,12 @@ HOMEPAGE= http://gaim.sourceforge.net/ COMMENT= GTK2 based client for the AOL Instant Messenger chat system BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs CONFLICTS+= gaim-gnome-[0-9]* GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile index eade7bed806..5486d2b7041 100644 --- a/chat/gnomeicu/Makefile +++ b/chat/gnomeicu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/26 02:27:35 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= gnomeicu-0.96 PKGREVISION= 11 @@ -10,9 +10,8 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://gnomeicu.sourceforge.net/ COMMENT= GNOME ICQ client -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index 70dc2670da4..6885ea7c326 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/04/01 19:12:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= gossip-0.7.4 @@ -10,11 +10,11 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://gossip.imendio.org/ COMMENT= GTK2 Jabber Instant Messaging client -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser 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/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index 8d24c1c2a97..dd928cd1c56 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2004/03/26 02:27:35 wiz Exp $ +# $NetBSD: Makefile.common,v 1.26 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= xchat-1.8.11 PKGREVISION= 6 @@ -11,7 +11,6 @@ HOMEPAGE= http://xchat.org/ COMMENT= X11 (X Window System) IRC client, using the GTK+ toolkit BUILD_USES_MSGFMT= YES -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DISTINFO_FILE= ${.CURDIR}/../xchat/distinfo FILESDIR= ${.CURDIR}/../xchat/files @@ -20,6 +19,7 @@ PKGDIR= ${.CURDIR}/../xchat PLIST_SRC= ${.CURDIR}/../xchat/PLIST USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile index 6c2c44791c0..28530d04e13 100644 --- a/chat/xchat2/Makefile +++ b/chat/xchat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/03/26 02:27:35 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= xchat-2.0.8 @@ -12,12 +12,12 @@ HOMEPAGE= http://www.xchat.org/ COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs CONFLICTS= xchat-gnome-[0-9]* GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_LIBTOOL= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile index 97687cd8f1f..dbe4c68410a 100644 --- a/comms/gnome-pilot/Makefile +++ b/comms/gnome-pilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/03/26 02:27:35 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= gnome-pilot-0.1.71 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Palm Pilot synchronisation for GNOME -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= gob-[0-9]*:../../devel/gob BUILD_USES_MSGFMT= YES @@ -20,6 +19,7 @@ BUILDLINK_DEPENDS.gnome-panel= gnome-panel<2.0 GNU_CONFIGURE= YES USE_X11BASE= YES USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_LIBINTL= YES USE_LIBTOOL= YES diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 5015960aa4b..91a594c2253 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2004/02/14 18:43:43 minskim Exp $ +# $NetBSD: Makefile,v 1.41 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= jpilot-0.99.5 @@ -11,11 +11,11 @@ HOMEPAGE= http://jpilot.org/ COMMENT= Desktop organizer application for the palm pilot BUILD_USES_MSGFMT= YES -DEPENDS+= gnome-dirs>=1.0:../../misc/gnome-dirs CONFLICTS+= jpilot-libplugin-[0-9]* USE_BUILDLINK3= YES +USE_DIRS+= gnome1-1.0 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile index 916e12a464a..8140f72c14c 100644 --- a/databases/gnome-mime-data/Makefile +++ b/databases/gnome-mime-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= gnome-mime-data-2.4.1 @@ -12,11 +12,11 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= MIME and Application database for GNOME2 BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs CONFLICTS= gnome-vfs<=1.0.3 USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_PERL5= build diff --git a/databases/gq/Makefile b/databases/gq/Makefile index 5b9e1a0c941..0aa7b7d742e 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/26 02:27:36 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= gq-1.0beta1 @@ -10,9 +10,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://biot.com/gq/ COMMENT= GTK-based LDAP client -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK2= yes +USE_DIRS+= gnome2-1.5 USE_X11= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 3055f1c6ea8..453c5ca4dcf 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:36 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= libgnomedb-1.0.3 @@ -12,12 +12,12 @@ HOMEPAGE= http://www.gnome-db.org/ COMMENT= GNOME2 database library BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 6c04561e9d9..cbad81a955b 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/03/26 02:27:36 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= mergeant-0.12.1 @@ -11,10 +11,9 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome-db.org/ COMMENT= GNOME2 GNOME-DB database front-end -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_PERL5= build USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_X11= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index a43d3c115a8..a1eb1ddcbd6 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/03/26 02:27:37 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= anjuta-1.2.1 @@ -16,13 +16,13 @@ DEPENDS+= gdk-pixbuf>=0.22:../../graphics/gdk-pixbuf DEPENDS+= gettext>=0.11.5:../../devel/gettext DEPENDS+= glade2>=2.0.1:../../devel/glade2 DEPENDS+= gmake>=3.80:../../devel/gmake -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gnome2-terminal>=2.4.2:../../x11/gnome2-terminal DEPENDS+= libtool>=1.5.2:../../devel/libtool DEPENDS+= pkgconfig>=0.15.0:../../devel/pkgconfig DEPENDS+= yelp>=2.4.2:../../misc/yelp USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index a0903c78813..62ba592acd2 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:37 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= devhelp-0.7 PKGREVISION= 9 @@ -10,9 +10,8 @@ MAINTAINER= benedikt.meurer@unix-ag.uni-siegen.de HOMEPAGE= http://www.imendio.com/projects/devhelp/ COMMENT= Documentation viewer based on GNOME2 -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PERL5= build diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index 6ac95cec428..371a3975faa 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/04/01 18:36:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= eel-2.6.0 @@ -12,9 +12,9 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Eazel Extensions Library for GNOME2 BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 718b0ee8946..a802ca4fdee 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/04/11 16:29:52 snj Exp $ +# $NetBSD: Makefile,v 1.48 2004/04/14 16:15:21 jmmv Exp $ DISTNAME= glade-0.6.4 PKGREVISION= 6 @@ -9,9 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://glade.gnome.org/ COMMENT= User interface builder for GTK+ -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - GNU_CONFIGURE= yes +USE_DIRS+= xdg-x11-1.1 USE_GNU_TOOLS+= make USE_X11BASE= yes USE_BUILDLINK3= yes diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index 02146aca280..c6c5ba45032 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:37 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:21 jmmv Exp $ # DISTNAME= glade-2.0.1 @@ -13,10 +13,10 @@ HOMEPAGE= http://glade.gnome.org/ COMMENT= User interface builder for the GTK2+ toolkit and GNOME2 BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 40d59510217..98c07af2f8e 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:38 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gtranslator-1.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gtranslator.org/ COMMENT= Gettext po file editor for the GNOME2 desktop environment BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_X11= yes diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 397b3858c35..0a5b7aa58ba 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:38 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= kdesdk-${_KDE_VERSION} PKGREVISION= 1 @@ -8,11 +8,10 @@ COMMENT= Support applications and tools used by KDE developers CONFLICTS+= cervisia-[0-9]* CONFLICTS+= umbrello-[0-9]* -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 LTCONFIG_OVERRIDE+= ${WRKSRC}/kapptemplate/admin/ltconfig BUILD_DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile index b1cb8103f0a..c28624c42b0 100644 --- a/devel/libbonoboui/Makefile +++ b/devel/libbonoboui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/04/01 18:23:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= libbonoboui-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 Object activation framework library (graphical version) 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_X11= yes diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index f7134dd5007..2e2049114ac 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/04/06 17:38:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= libgnomeui-2.6.0 @@ -11,12 +11,12 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Core GNOME2 graphical libraries BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs CONFLICTS+= gnome-libs<=1.4.2nb1 GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_PERL5= yes diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile index a1c70582aaf..b4a2b39abbc 100644 --- a/devel/mrproject/Makefile +++ b/devel/mrproject/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/03/08 19:40:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= mrproject-0.5.1 @@ -10,9 +10,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://mrproject.codefactory.se/ COMMENT= Project management program -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_X11BASE= YES diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index c3a3d9b0e7d..762f9ad88d4 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2004/03/31 04:59:18 xtraeme Exp $ +# $NetBSD: Makefile,v 1.77 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= abiword-2.0.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.abisource.com/ COMMENT= Open Source cross-platform word processor BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs # GTK1 version and previous name of the GTK2 version CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* @@ -19,6 +18,7 @@ CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* MAKEFILE= GNUmakefile GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_PERL5= run USE_X11= yes diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile index 70cafdd29f2..8cdcac1374b 100644 --- a/editors/beaver/Makefile +++ b/editors/beaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/11 08:03:29 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= beaver-0.2.6 @@ -10,10 +10,9 @@ MAINTAINER= vincent.derrien@ahoup.net HOMEPAGE= http://www.nongnu.org/beaver/ COMMENT= Lightweight GTK+ text editor with syntax highlighting -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_X11= YES .include "../../x11/gtk/buildlink3.mk" diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index 2d313fa4fdf..46e0391e3a7 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= conglomerate-0.7.12 @@ -11,12 +11,12 @@ HOMEPAGE= http://www.conglomerate.org/ COMMENT= XML editor for GNOME2 BUILD_USES_MSGFMT= yes -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= docbook-xsl>=1.64.1:../../textproc/docbook-xsl DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes USE_GNU_TOOLS+= make USE_PERL5= yes diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index 7d8ad5f2d2d..97dba52c35d 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/03 07:30:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= dasher-3.2.8 @@ -10,10 +10,9 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.inference.phy.cam.ac.uk/dasher/ COMMENT= Easy typing without using keyboard -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 0d4a8fcd6b1..3c22c534107 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/04/01 18:51:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gconf-editor-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Editor for the GConf configuration system BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 25a0e907066..11336c6e669 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/04/01 18:51:56 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gedit-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://gedit.sourceforge.net/ COMMENT= Lightweight GNOME2 text editor BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_PERL5= build USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES diff --git a/editors/kile/Makefile b/editors/kile/Makefile index 9d32481bda7..0ac5b8cda90 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/04/05 11:21:05 markd Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= kile-1.6.2 CATEGORIES= editors kde @@ -8,9 +8,8 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://kile.sourceforge.net/ COMMENT= LaTeX source editor - TeX shell - Gnuplot front end -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK2= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ GNU_CONFIGURE= yes diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index 2743ceec52e..0bc3652380b 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= mlview-0.6.2 @@ -12,10 +12,10 @@ HOMEPAGE= http://www.freespiders.org/projects/gmlview/ COMMENT= XML editor for the GNOME environment 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_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile index 267c00ce2cd..8fcc32f1e03 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/31 04:31:20 snj Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= kvim-${KVIM_VERSION} PKGNAME= vim-kde-${KVIM_VERSION} @@ -17,10 +17,9 @@ KVIM_VERSION= 6.2.14 CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]* -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gui=kde diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index a12b3dae63c..b87a31ad65b 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2004/03/26 02:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= gnucash-1.8.8 PKGREVISION= 4 @@ -12,12 +12,12 @@ COMMENT= Personal double-entry accounting program DEPENDS+= p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip DEPENDS+= p5-finance-quote>=1.06:../../finance/p5-finance-quote -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILDLINK_DEPENDS.guile14+= guile14<1.5.0:../../lang/guile14 BUILD_DEPENDS+= bison>=1.28:../../devel/bison +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile index 0cc5d3ecdf9..a2681013db4 100644 --- a/fonts/gucharmap/Makefile +++ b/fonts/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/04/01 19:04:59 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gucharmap-1.4.0 @@ -10,10 +10,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://gucharmap.sourceforge.net/ COMMENT= Unicode/ISO10646 character map and font viewer -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_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile index 2a7d6975d7a..68a91ce19a4 100644 --- a/games/ccgo/Makefile +++ b/games/ccgo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/12 05:12:01 snj Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= ccgo-0.3.4 @@ -10,12 +10,12 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://ccdw.org/~cjj/prog/ccgo/ COMMENT= Go board with IGS and gnugo interface -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gnugo>=3.4:../../games/gnugo BUILD_USES_MSGFMT= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/games/crimsonfields/Makefile b/games/crimsonfields/Makefile index 523b7284d6a..30216f9897f 100644 --- a/games/crimsonfields/Makefile +++ b/games/crimsonfields/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/12 22:15:33 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= crimson-0.4.1 @@ -11,9 +11,8 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://crimson.seul.org/ COMMENT= Tactical war game in the tradition of Battle Isle -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index cf2b19a9861..6b744019f8d 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/30 16:12:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= dopewars-1.5.9 PKGREVISION= 4 @@ -9,9 +9,8 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://dopewars.sourceforge.net/ COMMENT= Make a fortune dealing drugs on the streets of New York -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make diff --git a/games/enigma/Makefile b/games/enigma/Makefile index be8f039af38..fd655b2f142 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= enigma-0.81 @@ -13,11 +13,10 @@ COMMENT= Puzzle game similar to Oxyd/Rock'n'Roll/Marble Madness PKG_INSTALLATION_TYPES= overwrite pkgviews -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - GCC_REQD+= 2.95 GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ diff --git a/games/freesci/Makefile b/games/freesci/Makefile index b986eacbf22..4abf7d7ebde 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/20 15:16:10 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= freesci-0.3.4a @@ -11,9 +11,8 @@ MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://freesci.linuxgames.com/ COMMENT= Interpreter for Sierra On-Line's SCI games -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index 9cd55a92a5f..e8acace0430 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gnocatan-0.8.1.16 @@ -10,10 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://gnocatan.sourceforge.net/ COMMENT= GNOME version of the Settlers of Catan board game -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile index 12f5441110a..18a11f011e7 100644 --- a/games/gnome-breakout/Makefile +++ b/games/gnome-breakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gnome-breakout-0.5.2 @@ -10,10 +10,9 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.senet.com.au/~alcaron/software.html COMMENT= Gnome version of the classic breakout game -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - GNU_CONFIGURE= YES USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile index ee0c5f617e0..647a53c1e4c 100644 --- a/games/gnome-chess/Makefile +++ b/games/gnome-chess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= gnome-chess-0.3.3 PKGREVISION= 13 @@ -9,9 +9,8 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/softwaremap/projects/gnome-chess/ COMMENT= GNOME\'s graphical interface for playing chess -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= yes +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= yes USE_X11BASE= yes GNU_CONFIGURE= yes diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 1434b86c8a5..8173d8144f8 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= gnome-games-1.4.0.4 PKGREVISION= 12 @@ -13,7 +13,6 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME games collection -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILD_USES_MSGFMT= YES BUILD_USES_GETTEXT_M4= YES @@ -22,6 +21,7 @@ CONFLICTS= xbill-[0-9]* AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index 14423e34df1..6d084eda9b1 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/04/06 15:49:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= gnome-games-2.6.0 PKGREVISION= 1 @@ -10,12 +10,12 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 games collection -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= librsvg2-gtk2>=2.6.3:../../graphics/librsvg2-gtk2 CONFLICTS= xbill-[0-9]* USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile index 0f53a939648..831a3ecfc17 100644 --- a/games/gtetrinet/Makefile +++ b/games/gtetrinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:23 jmmv Exp $ # DISTNAME= gtetrinet-0.7.1 @@ -11,10 +11,10 @@ HOMEPAGE= http://gtetrinet.sourceforge.net/ COMMENT= Multiplayer tetris game for GNOME2 BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 4c6f677fdcc..453e3d20461 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.26 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= kdegames-${_KDE_VERSION} PKGREVISION= 1 CATEGORIES= games COMMENT= Games for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile index b3de6ac02bd..d1b086932e8 100644 --- a/games/kdetoys3/Makefile +++ b/games/kdetoys3/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= kdetoys-${_KDE_VERSION} PKGREVISION= 1 CATEGORIES= games COMMENT= Toys for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index ae91aca5639..54c62b9feb6 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/04/14 12:11:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= scummvm-0.6.0 CATEGORIES= games @@ -9,9 +9,8 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://scummvm.sourceforge.net/ COMMENT= LucasArts Script Creation Utility for Maniac Mansion -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_X11= yes HAS_CONFIGURE= yes diff --git a/games/sirius/Makefile b/games/sirius/Makefile index f0507cbbc67..d57d107955b 100644 --- a/games/sirius/Makefile +++ b/games/sirius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:23 jmmv Exp $ # DISTNAME= sirius-0.8.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://sirius.bitvis.nu/ COMMENT= Othello game for GNOME2 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_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile index 89941c61ed9..7f62353ff3f 100644 --- a/games/xbreaky/Makefile +++ b/games/xbreaky/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/03/09 23:32:59 snj Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 16:15:23 jmmv Exp $ # DISTNAME= xbreaky-0.0.5 @@ -10,9 +10,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://xbreaky.sourceforge.net/ COMMENT= Breakout game for X11 -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index 3f463518134..d8005960b38 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/03/09 21:43:23 snj Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= xpuyopuyo-0.9.1 PKGREVISION= 4 @@ -10,10 +10,9 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://chaos2.org/xpuyopuyo/ COMMENT= Tetris-like puzzle game -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - AUTOMAKE_REQD= 1.4 USE_BUILDLINK3= YES +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 1786d52118f..94cdd0dc460 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/03/26 02:27:41 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= dia-0.92.2 PKGREVISION= 7 @@ -9,9 +9,8 @@ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://www.lysator.liu.se/~alla/dia/ COMMENT= Program for creating diagrams of all kinds -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile index 5dd86ffb0be..0e72d7614c1 100644 --- a/graphics/ee/Makefile +++ b/graphics/ee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/03/26 02:27:41 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= ee-0.3.12 PKGREVISION= 10 @@ -9,9 +9,8 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.gnome.org/ COMMENT= Image viewer based on imlib by the Rasterman. Gtk clone of xv -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= # defined +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= # defined USE_X11BASE= # defined USE_GNU_TOOLS+= make diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index e7590975b96..594d6010e99 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/04/12 00:16:43 snj Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= eog-0.6 PKGREVISION= 7 @@ -9,12 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Eye of GNOME: an image viewing and cataloging program -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - GNU_CONFIGURE= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_BUILDLINK3= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES .include "../../devel/bonobo/buildlink3.mk" diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 915764a984d..46177aa70f3 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/04/01 18:54:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:23 jmmv Exp $ # DISTNAME= eog-2.6.0 @@ -11,12 +11,12 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Eye of GNOME: an image viewing and cataloging program BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= YES USE_X11= YES USE_GNU_TOOLS+= make USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES GCONF2_SCHEMAS= eog.schemas diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile index 80b35b823c1..5b1d52aa8c6 100644 --- a/graphics/g3d/Makefile +++ b/graphics/g3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:23 jmmv Exp $ # DISTNAME= g3d-0.0.2 @@ -10,9 +10,8 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= http://condor.stcloudstate.edu/~hebl9901/g3d/ COMMENT= 3D modeller with a view of 3D modelling -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - WRKSRC= ${WRKDIR}/g3d +USE_DIRS+= xdg-x11-1.1 USE_LIBTOOL= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index ffd4ab80eed..793fda9d8c3 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:41 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:23 jmmv Exp $ DISTNAME= gimageview-0.2.24 PKGREVISION= 12 @@ -9,9 +9,8 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://gtkmmviewer.sourceforge.net/ COMMENT= GTK+ based image viewer with tabbed browsing -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile index 8dc2c6dc0af..bbe7b1293f8 100644 --- a/graphics/gnome-icon-theme/Makefile +++ b/graphics/gnome-icon-theme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/04/09 20:11:45 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:23 jmmv Exp $ # DISTNAME= gnome-icon-theme-1.2.0 @@ -13,10 +13,10 @@ COMMENT= Theme consisting of a set of icons for GNOME DEPENDS+= hicolor-icon-theme>=0.4:../../graphics/hicolor-icon-theme 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_PERL5= build USE_PKGLOCALEDIR= yes diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile index 709ba8d5f5e..c506889ccc9 100644 --- a/graphics/gnome-iconedit/Makefile +++ b/graphics/gnome-iconedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnome-iconedit-1.2.0 @@ -10,9 +10,9 @@ MAINTAINER= wiz@NetBSD.org COMMENT= Icon editor based on GNOME libraries BUILD_USES_MSGFMT= YES -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/graphics/gnome-pixmaps/Makefile b/graphics/gnome-pixmaps/Makefile index 4f18dd289e1..8850ab5ebd9 100644 --- a/graphics/gnome-pixmaps/Makefile +++ b/graphics/gnome-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/14 01:17:19 snj Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 @@ -12,8 +12,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Pixmaps for gnome-core -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - .include "../../mk/bsd.prefs.mk" CONFLICTS= gnome-core<1.4.2 @@ -22,6 +20,7 @@ CONFLICTS+= gnome2-pixmaps-[0-9]* .endif USE_BUILDLINK3= YES +USE_DIRS+= xdg-x11-1.1 USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile index 0b4ab41baf5..ea425e4109b 100644 --- a/graphics/gnome2-pixmaps/Makefile +++ b/graphics/gnome2-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/04/01 18:35:51 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnome-desktop-2.6.0 @@ -20,9 +20,8 @@ CONFLICTS+= gnome-pixmaps-[0-9]* CONFLICTS+= gnome-pixmaps-2.0.8 .endif -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_X11= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile index 3c569699a01..70b2e590cbd 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gpaint-0.2 @@ -10,9 +10,8 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://gpaint.sourceforge.net/ COMMENT= Simple, easy-to-use paint program for GNOME -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_GNU_GETTEXT= YES diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile index e35774d58b0..c4ebf7fea1f 100644 --- a/graphics/gphoto/Makefile +++ b/graphics/gphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:43 reed Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= gphoto-0.4.3 PKGREVISION= 6 @@ -9,9 +9,8 @@ MAINTAINER= jmcm@cs.cmu.edu HOMEPAGE= http://www.gphoto.org/ COMMENT= Download and view files from various digital cameras -DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs - USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.0 USE_X11BASE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index ea75adfc10c..26c9d0519e4 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/04/13 16:27:26 reed Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gtkam-0.1.11 @@ -9,9 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://gphoto.sourceforge.net/proj/gphoto2/ COMMENT= Digital camera access graphical client (GTK2) -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 6e36cc7720f..303eeb589dc 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,18 +1,17 @@ -# $NetBSD: Makefile,v 1.35 2004/03/26 02:27:42 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} PKGREVISION= 2 CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" #DEPENDS+= gPhoto2 #DEPENDS+= gpio USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 BUILDLINK_DEPENDS.lcms= lcms>=1.12 diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 80e0d05e58b..24fcbe5b092 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= scigraphica-0.8.0 @@ -10,9 +10,8 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://scigraphica.sourceforge.net/ COMMENT= Data analysis and technical graphics -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_X11= YES USE_GNU_TOOLS+= make USE_GNU_READLINE= YES diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index fa4e0b19b00..6ae905b891b 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/03/28 21:02:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= sodipodi-0.34 @@ -9,10 +9,9 @@ MAINTAINER= manu@NetBSD.org HOMEPAGE= http://www.gnome.org/gnome-office/sodipodi.shtml COMMENT= Open source vector graphics drawing program using SVG as native format -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_LIBTOOL= YES diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile index 966e2857764..d5790534d71 100644 --- a/inputmethod/imhangul_status_applet/Makefile +++ b/inputmethod/imhangul_status_applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:42 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= imhangul_status_applet-0.2 @@ -11,10 +11,10 @@ HOMEPAGE= http://imhangul.kldp.net/\#APPLET COMMENT= GNOME2 applet to show imhangul status DEPENDS= imhangul>=0.9.6:../../inputmethod/imhangul -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index b426b032a21..06871e29f50 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2004/03/26 02:27:43 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= balsa-1.4.3 @@ -12,9 +12,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.balsa.net/ COMMENT= GNOME EMail client -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - GNU_CONFIGURE= yes +USE_DIRS+= xdg-x11-1.1 USE_LIBTOOL= yes USE_X11BASE= yes USE_BUILDLINK2= yes diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index 7b1b2f7c725..a3178650583 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/03/31 12:37:00 recht Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= balsa-2.0.17 CATEGORIES= mail gnome @@ -11,8 +11,8 @@ HOMEPAGE= http://balsa.gnome.org/ COMMENT= GNOME2 EMail client BUILD_USES_MSGFMT= yes -DEPENDS+= gnome-dirs>=1.5:../../misc/gnome-dirs +USE_DIRS+= gnome2-1.5 USE_PERL5= build USE_PKGINSTALL= yes USE_BUILDLINK3= yes diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 9613c64d9f4..e971fe3d17c 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2004/03/26 02:27:43 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= evolution-1.4.5 PKGREVISION= 8 @@ -12,7 +12,6 @@ HOMEPAGE= http://ximian.com/products/evolution/ COMMENT= GNOME mailer, calendar, contact manager, and communications tool BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc BUILD_USES_MSGFMT= YES @@ -32,6 +31,7 @@ CONFIGURE_ARGS+= --enable-ipv6=no .endif GNU_CONFIGURE= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile index 63649a0c95e..e089a5c8aff 100644 --- a/mail/evolution12/Makefile +++ b/mail/evolution12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:43 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= evolution-1.2.4 PKGREVISION= 10 @@ -21,7 +21,6 @@ HOMEPAGE= http://ximian.com/products/evolution/ COMMENT= GNOME mailer, calendar, contact manager, and communications tool BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc BUILD_USES_MSGFMT= YES @@ -35,6 +34,7 @@ USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES YACC= ${PREFIX}/bin/bison -y diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index c9b73a2284f..d510f90694a 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/04/01 18:56:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gcalctool-4.3.51 @@ -11,10 +11,10 @@ HOMEPAGE= http://calctool.sourceforge.net/ COMMENT= Desktop calculator for GNOME BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_X11= YES USE_PKGLOCALEDIR= yes diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 416c040c243..78ddee10533 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2004/03/31 16:18:53 reed Exp $ +# $NetBSD: Makefile,v 1.83 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnumeric-1.0.13 @@ -10,12 +10,12 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/gnumeric/ COMMENT= Spreadsheet program from the GNOME project -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs # for Python support a shared libpython is required but not provided yet #BUILD_DEPENDS+= python>=2.0:../../lang/python BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile index f406016ecd2..ce5c66571b7 100644 --- a/math/gnumeric0/Makefile +++ b/math/gnumeric0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnumeric-0.75 @@ -10,9 +10,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/gnumeric/ COMMENT= Powerful and easy to use spreadsheet program from the GNOME project -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile index 3efb6302ec1..dd40e0aa159 100644 --- a/math/graphopt/Makefile +++ b/math/graphopt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= graphopt-0.4.1 @@ -11,9 +11,8 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://schmuhl.org/graphopt/ COMMENT= Optimize graph layouts -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_GCC_SHLIB= YES GNU_CONFIGURE= YES diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 204fa59b161..be0d2ef9b0f 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= Guppi-0.40.3 PKGNAME= ${DISTNAME:S/G/g/} @@ -11,8 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/guppi/ COMMENT= Plot program with integrated statistics capabilities -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - .if exists(/usr/include/wctype.h) # # "guppi" only accepts newer versions of the "gnumeric" package which @@ -28,6 +26,7 @@ PLIST_SUBST+= GNUMERIC="@comment " .endif USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/misc/drwright/Makefile b/misc/drwright/Makefile index 46d6bb68ef6..735d322945c 100644 --- a/misc/drwright/Makefile +++ b/misc/drwright/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:45 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= drwright-0.17 @@ -12,10 +12,10 @@ HOMEPAGE= http://www.imendio.com/projects/drwright/ COMMENT= Computer break reminder BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PERL5= yes diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile index 7b6c72f0632..cea40ea98c2 100644 --- a/misc/gnome-pim/Makefile +++ b/misc/gnome-pim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2004/03/26 02:27:46 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= gnome-pim-1.4.6 PKGREVISION= 7 @@ -9,10 +9,10 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Personal Information Manager for GNOME -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile index 9052004ee19..ac440f2326e 100644 --- a/misc/gnome-utils/Makefile +++ b/misc/gnome-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2004/04/02 12:18:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.73 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= gnome-utils-1.4.1.2 PKGREVISION= 9 @@ -10,7 +10,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Set of useful GNOME utilities and applications -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools @@ -18,6 +17,7 @@ BUILDLINK_DEPENDS.gnome-panel= gnome-panel<2.0 CONFLICTS= coreutils<=5.0 +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make USE_X11BASE= YES USE_BUILDLINK2= YES diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile index 435e9774b3a..80424334ec6 100644 --- a/misc/gnome2-user-docs/Makefile +++ b/misc/gnome2-user-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/01 18:57:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= gnome2-user-docs-2.6.0 @@ -10,9 +10,8 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= The GNOME 2 users guide -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile index 68fabd569c4..faff84a352d 100644 --- a/misc/gnome2-utils/Makefile +++ b/misc/gnome2-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/04/01 19:09:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= gnome-utils-2.6.0 @@ -11,11 +11,11 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Set of useful GNOME2 utilities and applications BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_PERL5= build USE_GNU_TOOLS+= make USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes diff --git a/misc/gok/Makefile b/misc/gok/Makefile index b737a186dc1..6fef9d0e4c3 100644 --- a/misc/gok/Makefile +++ b/misc/gok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/01 19:04:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= gok-0.10.0 @@ -10,9 +10,8 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME On-Screen Keyboard -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index a632de9b34f..915d70dcf71 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= gperiodic-2.0.7 PKGREVISION= 2 @@ -10,9 +10,9 @@ HOMEPAGE= http://www.acclab.helsinki.fi/~frantz/software/gperiodic.php COMMENT= Displays a periodic table of the elements BUILD_USES_MSGFMT= # defined -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs USE_BUILDLINK2= # defined +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= # defined USE_X11= # defined USE_GNU_TOOLS+= make diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile index f7784111ae6..0c7d9547c3f 100644 --- a/misc/gxmame/Makefile +++ b/misc/gxmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= gxmame-0.34b @@ -11,11 +11,11 @@ HOMEPAGE= http://gxmame.sourceforge.net/ COMMENT= Frontend for XMame using the GTK2 library BUILD_USES_MSGFMT= yes -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= xmame-[0-9]*:../../emulators/xmame GNU_CONFIGURE= yes USE_BUILDLINK2= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_X11= yes diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile index bfd8710e52d..55f70107d96 100644 --- a/misc/hitchhiker/Makefile +++ b/misc/hitchhiker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= hh2000-0.6 @@ -11,11 +11,10 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://hirame.hiram.edu/~worleyam COMMENT= Astronomical simulation and visualization program -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - GNU_CONFIGURE= yes USE_X11BASE= yes USE_BUILDLINK2= yes +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= yes .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index d4a75f6aae0..d5a6ee012cf 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.25 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= kdeaddons-${_KDE_VERSION} PKGREVISION= 2 CATEGORIES= misc COMMENT= Add ons for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 .include "../../mk/bsd.prefs.mk" diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index f356ca2c5f5..12a32754ccd 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:46 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= kdeadmin-${_KDE_VERSION} PKGREVISION= 1 CATEGORIES= misc COMMENT= System administration tools for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 .include "../../mk/bsd.prefs.mk" diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index f68a138bf7b..76d8ea54233 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.24 2004/03/26 02:27:46 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= kdeedu-${_KDE_VERSION} PKGREVISION= 1 CATEGORIES= misc COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" REPLACE_PERL= \ @@ -14,6 +12,7 @@ REPLACE_PERL= \ kvoctrain/kvoctrain/spotlight2kvtml USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index 69a6d720441..2fa31688152 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:46 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= kdepim-${_KDE_VERSION} PKGREVISION= 1 CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 REPLACE_PERL= kmail/kmail-3.1-update-new-mail-notification-settings.pl \ kmail/kmail-3.1-use-UOID-for-identities.pl \ diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 3c30d3135c9..5a77dfe73f1 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.36 2004/04/05 09:31:30 mrg Exp $ +# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= kdeutils-${_KDE_VERSION} PKGREVISION= 1 COMMENT= Utilities for the KDE integrated X11 desktop -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" .include "../../mk/bsd.prefs.mk" USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES # Ensure we export symbols in the linked shared object. diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile index 0a73df2a4ab..f946ef87932 100644 --- a/misc/ooqstart/Makefile +++ b/misc/ooqstart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:46 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= ooqstart-0.8.3 @@ -12,9 +12,9 @@ HOMEPAGE= http://ooqstart.sourceforge.net/ COMMENT= OpenOffice quickstart applet for GNOME DEPENDS+= gnome-applets>=1.4.0:../../x11/gnome-applets -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_GNU_TOOLS+= make USE_X11BASE= YES NO_CONFIGURE= YES diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile index 252c92e2753..c459c89d4e5 100644 --- a/misc/xchm/Makefile +++ b/misc/xchm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/09 14:29:09 minskim Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= xchm-0.9.1 @@ -9,9 +9,8 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://xchm.sourceforge.net/ COMMENT= CHM viewer for UNIX -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_LANGUAGES= c++ GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile index 6b4d14edc77..7cdc5062f3f 100644 --- a/misc/yelp/Makefile +++ b/misc/yelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/04/01 18:48:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= yelp-2.6.0 @@ -10,13 +10,13 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Help browser for GNOME 2 desktop -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= docbook>=4.2:../../textproc/docbook BUILD_USES_MSGFMT= yes BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.4 USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile index c4c10ca3072..29f7c90832b 100644 --- a/multimedia/alevt/Makefile +++ b/multimedia/alevt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/22 03:31:25 kristerw Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= alevt-1.6.0 PKGREVISION= 2 @@ -11,12 +11,12 @@ COMMENT= Teletext decoder and browser for Brooktree 848 compatible TV cards DEPENDS+= png>=1.2.1:../../graphics/png DEPENDS+= fxtv>=1.02:../../multimedia/fxtv -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs 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_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index 6ee87757b3a..cbf140474cc 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:25 jmmv Exp $ # DISTNAME= gmencoder-0.1.0 @@ -12,12 +12,12 @@ HOMEPAGE= http://gmencoder.sourceforge.net/ COMMENT= GNOME2 frontend to mencoder BUILD_USES_MSGFMT= yes -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= mencoder>=0.90:../../multimedia/mencoder DEPENDS+= mplayer>=0.90:../../multimedia/mplayer GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile index 8ae8bd61089..80b2b304431 100644 --- a/multimedia/gnome-media/Makefile +++ b/multimedia/gnome-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= gnome-media-1.2.3 PKGREVISION= 11 @@ -9,12 +9,11 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Set of audio/multimedia applications for GNOME -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_X11BASE= YES diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile index 0e4686d98c5..057f01f0d13 100644 --- a/multimedia/gnome2-media/Makefile +++ b/multimedia/gnome2-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/06 09:58:30 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= gnome-media-2.6.0 PKGREVISION= 1 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Set of audio/multimedia applications for GNOME2 BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_X11= yes diff --git a/multimedia/gst-player/Makefile b/multimedia/gst-player/Makefile index 906a2a3d98f..6706697d9bd 100644 --- a/multimedia/gst-player/Makefile +++ b/multimedia/gst-player/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/06 13:55:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= gst-player-0.8.0 CATEGORIES= audio graphics @@ -10,7 +10,6 @@ HOMEPAGE= http://www.gstreamer.net/ COMMENT= GStreamer Media Player BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gst-plugins-mad>=0.8.0:../../audio/gst-plugins-mad DEPENDS+= gst-plugins-mpeg2dec>=0.8.0:../../multimedia/gst-plugins-mpeg2dec DEPENDS+= gst-plugins-dvdnav>=0.8.0:../../multimedia/gst-plugins-dvdnav @@ -20,6 +19,7 @@ DEPENDS+= gst-plugins-theora>=0.8.0:../../multimedia/gst-plugins-theora GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 37d975cb980..f9f8120dc15 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:25 jmmv Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} PKGREVISION= 3 @@ -11,9 +11,9 @@ CONFLICTS= timidity-[0-9]* DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts DEPENDS+= trm>=0.2.1:../../audio/trm -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 REPLACE_PERL= kscd/workman2cddb.pl diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile index ed8f4dc5d36..bfe74e03acb 100644 --- a/multimedia/nautilus-media/Makefile +++ b/multimedia/nautilus-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/04/06 10:09:16 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= nautilus-media-0.8.0 @@ -12,7 +12,6 @@ HOMEPAGE= http://thomas.apestaart.org/projects/nautilus-media/ COMMENT= Multimedia add-ons for Nautilus BUILD_USES_MSGFMT= yes -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gst-plugins-esound>=0.8.0:../../audio/gst-plugins-esound DEPENDS+= gst-plugins-flac>=0.8.0:../../audio/gst-plugins-flac DEPENDS+= gst-plugins-gnomevfs>=0.8.0:../../sysutils/gst-plugins-gnomevfs @@ -22,6 +21,7 @@ DEPENDS+= gst-plugins-vorbis>=0.8.0:../../audio/gst-plugins-vorbis GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PERL5= build diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index b1bcea292eb..c2c6fa28629 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= xine-ui-0.9.23 @@ -11,12 +11,12 @@ HOMEPAGE= http://xinehq.de/ COMMENT= Skinned xlib-based xine GUI BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs BUILDLINK_DEPENDS.curl= curl>7.10.2 USE_PKGLOCALEDIR= YES USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/net/amule/Makefile b/net/amule/Makefile index 89ded583953..7d5cfaa7504 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/13 14:53:31 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= aMule-1.2.6 @@ -12,12 +12,12 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://amule.sourceforge.net/ COMMENT= Another Emule P2P client -DEPENDS= xdg-dirs>=1.1:../../misc/xdg-dirs BUILD_USES_MSGFMT= yes CONFLICTS= xmule-[0-9]* USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile index b6f70c56ec7..62b350bd3e0 100644 --- a/net/bug-buddy/Makefile +++ b/net/bug-buddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/04/01 18:54:03 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= bug-buddy-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Graphical GNOME2 bug reporting tool 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_X11= YES diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile index 4376e6982f8..bcbca10194d 100644 --- a/net/dc_gui2/Makefile +++ b/net/dc_gui2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:47 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= dc_gui2-0.75 @@ -12,10 +12,10 @@ HOMEPAGE= http://www.ac2i.tzo.com/dctc/ COMMENT= Graphical user interface for DCTC DEPENDS+= dctc>=0.85.4:../../net/dctc -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES CONFIGURE_ARGS+= --enable-manual-db-detect USE_GNU_TOOLS+= make diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile index 58ff6292251..c536383eeb1 100644 --- a/net/ed2k-gtk-gui/Makefile +++ b/net/ed2k-gtk-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/04/09 13:56:22 minskim Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:26 jmmv Exp $ DISTNAME= ed2k-gtk-gui-0.6.2 CATEGORIES= net @@ -8,9 +8,8 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://ed2k-gtk-gui.sourceforge.net/ COMMENT= GUI for the eDonkey2000 and Overnet -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_X11= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/net/etherape/Makefile b/net/etherape/Makefile index 644b2279162..1d0ca5c8bfc 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/03/26 02:27:47 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= etherape-0.9.0 @@ -10,11 +10,10 @@ MAINTAINER= damon@NetBSD.org HOMEPAGE= http://etherape.sourceforge.net/ COMMENT= Graphical network monitor -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_GNU_TOOLS+= make USE_X11= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/net/gftp-gtk1/Makefile b/net/gftp-gtk1/Makefile index 604bd664c55..7ff77de1dfe 100644 --- a/net/gftp-gtk1/Makefile +++ b/net/gftp-gtk1/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2004/04/05 02:45:45 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:26 jmmv Exp $ .include "${.CURDIR}/../gftp/Makefile.common" PKGNAME= gftp-gtk1-${VERSION} COMMENT= Multithreaded GTK+ ftp client -DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs CONFLICTS= gftp-[0-9]* +USE_DIRS+= gnome1-1.0 + CONFIGURE_ARGS+= --disable-gtk20 PLIST_SRC= ${.CURDIR}/../gftp/PLIST diff --git a/net/gftp/Makefile b/net/gftp/Makefile index e488c10c816..f80cd8d2f47 100644 --- a/net/gftp/Makefile +++ b/net/gftp/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.19 2004/04/05 02:45:45 xtraeme Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:26 jmmv Exp $ # .include "${.CURDIR}/Makefile.common" COMMENT= Multithreaded GTK2+ ftp client -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - CONFLICTS= gftp-gtk1-[0-9]* +USE_DIRS+= gnome2-1.5 + .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common index d1525ff932b..1ad0b448ae9 100644 --- a/net/gftp/Makefile.common +++ b/net/gftp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2004/04/05 02:45:45 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.6 2004/04/14 16:15:26 jmmv Exp $ DISTNAME= gftp-${VERSION} CATEGORIES= net @@ -10,9 +10,9 @@ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://gftp.seul.org/ BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile index 280e0a639ca..e3f0f034c5e 100644 --- a/net/gnapster/Makefile +++ b/net/gnapster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/03/26 02:27:48 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2004/04/14 16:15:26 jmmv Exp $ DISTNAME= gnapster-1.5.0 PKGREVISION= 9 @@ -10,9 +10,9 @@ HOMEPAGE= http://sourceforge.net/projects/gnapster/ COMMENT= Simple client for the online mp3 community BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_X11= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index 94f59df58ea..3bf51958861 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/01 19:09:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= gnome-netstatus-2.6.0 @@ -10,10 +10,9 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Network status applet for the GNOME panel -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/net/gtm/Makefile b/net/gtm/Makefile index e452ecf074e..0893ce667cd 100644 --- a/net/gtm/Makefile +++ b/net/gtm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/03/26 02:27:48 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= gtm-0.4.12 @@ -11,9 +11,9 @@ HOMEPAGE= http://gtm.sourceforge.net/ COMMENT= Gnome Transfer Manager DEPENDS+= wget-[0-9]*:../../net/wget -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index ea4a25e2af5..638a8a90b16 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/03/26 02:27:48 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:26 jmmv Exp $ DISTNAME= kdenetwork-${_KDE_VERSION} PKGREVISION= 1 @@ -7,11 +7,10 @@ COMMENT= Network modules for the KDE integrated X11 desktop CONFLICTS= kopete-[0-9]* -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= yes +USE_DIRS+= xdg-1.1 PTHREAD_OPTS+= require REPLACE_PERL= ksirc/dsirc diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 0edc3ae7edf..8b1faec964b 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:50 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= tsclient-0.132 @@ -12,10 +12,10 @@ COMMENT= GNOME2 Frontend for rdesktop DEPENDS+= rdesktop-[0-9]*:../../net/rdesktop DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer -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_PKGLOCALEDIR= yes USE_PERL5= run diff --git a/news/pan-gnome/Makefile b/news/pan-gnome/Makefile index c9c53e49ecb..e2bf4692d04 100644 --- a/news/pan-gnome/Makefile +++ b/news/pan-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:50 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= pan-0.11.4 @@ -12,9 +12,9 @@ HOMEPAGE= http://pan.rebelbase.com/ COMMENT= Newsreader for Gnome 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 GNU_CONFIGURE= YES diff --git a/news/pan/Makefile b/news/pan/Makefile index c87c0369bb4..73cbc9ea20d 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/03/21 15:57:41 bouyer Exp $ +# $NetBSD: Makefile,v 1.35 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= pan-0.14.2 @@ -11,11 +11,11 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://pan.rebelbase.com/ COMMENT= Newsreader for GTK2 -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= YES USE_PERL5= build USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 0afc6d5042d..cd653efa62a 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/04/12 00:47:25 snj Exp $ +# $NetBSD: Makefile,v 1.48 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= ggv-1.0.2 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME frontend for GhostScript BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-x11-1.1 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_X11BASE= YES diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index df12756b0af..c0305d4ad16 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/04/07 11:52:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= ggv-2.6.0.1 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 frontend for GhostScript 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_LIBTOOL= YES USE_GNU_TOOLS+= make diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile index 65653103d08..a2fd3870f04 100644 --- a/print/gpdf/Makefile +++ b/print/gpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/04/11 22:43:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:26 jmmv Exp $ # DISTNAME= gpdf-0.131 @@ -11,10 +11,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME 2 version of xpdf -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_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index a187b354692..9734f83c25b 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:54 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:27 jmmv Exp $ DISTNAME= seahorse-0.7.3 PKGREVISION= 12 @@ -11,9 +11,9 @@ COMMENT= GnuPG front end and bonobo component for GNOME BUILD_USES_MSGFMT= yes DEPENDS+= gnupg>=1.2.1:../../security/gnupg -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_X11= yes USE_BUILDLINK3= yes diff --git a/sysutils/apotheke/Makefile b/sysutils/apotheke/Makefile index 81a7f02178e..4087c178de7 100644 --- a/sysutils/apotheke/Makefile +++ b/sysutils/apotheke/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:54 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:27 jmmv Exp $ # DISTNAME= apotheke-0.2 @@ -10,9 +10,8 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://apotheke.berlios.de/ COMMENT= CVS view for Nautilus -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_X11= yes diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index a3c6114f0ce..284102d8f61 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:27 jmmv Exp $ # DISTNAME= cdrdao-1.1.7.src @@ -12,12 +12,12 @@ HOMEPAGE= http://cdrdao.sourceforge.net/gcdmaster/index.html COMMENT= GUI for cdrdao with some editing capability DEPENDS+= cdrdao-1.1.7:../../sysutils/cdrdao -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs WRKSRC= ${WRKDIR}/cdrdao-1.1.7 USE_X11BASE= YES GNU_CONFIGURE= YES USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --with-pcctsbin=${LOCALBASE}/bin CONFIGURE_ARGS+= --with-pcctsinc=${LOCALBASE}/include/pccts diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile index 71d99197374..3606a784f11 100644 --- a/sysutils/gcombust/Makefile +++ b/sysutils/gcombust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:27 jmmv Exp $ # DISTNAME= gcombust-0.1.54 @@ -12,10 +12,10 @@ COMMENT= Graphical frontend for CD mastering (mkisofs, cdrecord, ...) DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord DEPENDS+= cdlabelgen-[0-9]*:../../graphics/cdlabelgen -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= gv-[0-9]*:../../print/gv USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile index bd442bfdd95..aab59da3609 100644 --- a/sysutils/gmc/Makefile +++ b/sysutils/gmc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/03/26 02:27:54 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:27 jmmv Exp $ PKGNAME= g${DISTNAME} PKGREVISION= 9 @@ -6,11 +6,11 @@ CATEGORIES+= gnome COMMENT= GNOME version of Midnight Commander, a free Norton Commander Clone +USE_DIRS+= gnome1-1.5 USE_X11BASE= # defined CONFIGURE_ARGS+= --with-tm-x-support CONFIGURE_ARGS+= --with-gnome BUILD_USES_MSGFMT= yes -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs post-install: ${RMDIR} ${PREFIX}/share/gnome/help/gmc/C/figs diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index fd47b96a0ed..3ad8a05dc03 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:54 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:27 jmmv Exp $ # DISTNAME= gnome-pkgview-1.0.5 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.greatnorthern.demon.co.uk/gnome-pkgview.html COMMENT= Displays the version of GNOME components installed BUILD_USES_MSGFMT= yes -DEPENDS= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes GCONF2_SCHEMAS= gnome-pkgview.schemas diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile index 08a8f0d4c56..4692802795b 100644 --- a/sysutils/gnome2-system-monitor/Makefile +++ b/sysutils/gnome2-system-monitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/02 12:18:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= gnome-system-monitor-2.6.0 @@ -11,10 +11,10 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME 2 system monitor program -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 diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index e0944653d11..020a5064bea 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/04/02 12:18:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.34 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= gtop-1.0.13 PKGREVISION= 8 @@ -10,10 +10,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME system monitor - top like, memory graphs, process viewer BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs OSVERSION_SPECIFIC= YES USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11BASE= YES diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 1479a863448..800756305b4 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/01 19:07:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= nautilus-cd-burner-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= CD burner view for Nautilus DEPENDS+= cdrecord-[0-9]*:../../sysutils/cdrecord -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_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index 2c88514dd37..667912baf28 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/04/01 18:38:03 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= nautilus-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/projects/nautilus/ COMMENT= Nautilus file manager for GNOME2 DEPENDS+= hicolor-icon-theme>=0.4:../../graphics/hicolor-icon-theme -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_PKGLOCALEDIR= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_X11= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile index c55408db6d5..3015ccf82b3 100644 --- a/sysutils/xfe/Makefile +++ b/sysutils/xfe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/03/20 15:35:38 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= xfe-0.54.2 @@ -11,9 +11,9 @@ HOMEPAGE= http://xfe.sourceforge.net/ COMMENT= Fast MS-Explorer like filemanager for X BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile index d6302a6ad1d..e57b1974238 100644 --- a/sysutils/xnc/Makefile +++ b/sysutils/xnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= xnc-5.0.4.src PKGNAME= xnc-5.0.4 @@ -10,10 +10,9 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://xnc.dubna.su/ COMMENT= File manager for X Window -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_BUILDLINK2= yes +USE_DIRS+= xdg-1.1 USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile index 60ab3b581b7..bedb34d020c 100644 --- a/textproc/gnome-spell/Makefile +++ b/textproc/gnome-spell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:55 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= gnome-spell-1.0.5 PKGREVISION= 2 @@ -10,10 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Spell checking as you type like gtkspell -DEPENDS= gnome2-dirs>=1.3:../../misc/gnome2-dirs - GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.3 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile index 9d0daeddb6b..e6b40bd9820 100644 --- a/time/gtodo-applet/Makefile +++ b/time/gtodo-applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= gtodo-applet-0.1 @@ -10,11 +10,11 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://qballcow.nl/index.php?s=4 COMMENT= GNOME applet for the gtodo application -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= gtodo>=0.14:../../time/gtodo GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_LIBTOOL= YES .include "../../devel/GConf2/schemas.mk" diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile index 595753ff6b8..6b2505b8b87 100644 --- a/time/gtodo/Makefile +++ b/time/gtodo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= gtodo-0.14 @@ -10,10 +10,9 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://qballcow.nl/index.php?s=4 COMMENT= To-do list manager for the GNOME desktop -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 diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index fd3163999a3..169730ffea2 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/04/01 18:35:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= metacity-2.8.0 @@ -11,9 +11,9 @@ HOMEPAGE= http://www.gnome.org/softwaremap/projects/Metacity/ COMMENT= GNOME-compliant window manager BUILD_USES_MSGFMT= YES -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile index 899c31c76a3..e1d39e91258 100644 --- a/wm/obconf/Makefile +++ b/wm/obconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= obconf-1.5 PKGREVISION= 4 @@ -9,9 +9,8 @@ MAINTAINER= snj@NetBSD.org HOMEPAGE= http://www.openbox.org/obconf/ COMMENT= Tool for configuring the Openbox window manager -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 GNU_CONFIGURE= YES .include "../../devel/libglade2/buildlink3.mk" diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index 00a9c877b51..9c17bf68928 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/15 15:17:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= openbox-3.1 PKGREVISION= 3 @@ -10,11 +10,11 @@ HOMEPAGE= http://icculus.org/openbox/ COMMENT= Standards compliant, light-weight and extensible window manager BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGINSTALL= YES diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index d21a8b04d45..bb96c88d2d7 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:28 jmmv Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -7,8 +7,8 @@ PKGREVISION= 8 COMMENT= GNOME-aware window manager that is fully configurable in Lisp DEPENDS+= sawfish-replibs-${SF_VERS}nb4:../../wm/sawfish-replibs -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs +USE_DIRS+= xdg-x11-1.1 USE_X11BASE= # defined CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common index 601b0c44e93..da713136e94 100644 --- a/wm/sawfish/Makefile.common +++ b/wm/sawfish/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.20 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= sawfish-${SF_VERS}-gtk1 SF_VERS= 1.2 @@ -9,10 +9,10 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://sawmill.sourceforge.net/ DEPENDS+= rep-gtk>=0.15nb2:../../x11/rep-gtk -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs USE_X11= # defined USE_BUILDLINK2= # defined +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= # defined USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 24736e859d4..19c3eff0967 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/03/26 02:27:56 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= bluefish-0.12 @@ -15,11 +15,11 @@ MAINTAINER= wulf@ping.net.au HOMEPAGE= http://bluefish.openoffice.nl/ COMMENT= GTK HTML editor for the experienced web designer -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= weblint-[0-9]*:../../www/weblint BUILD_USES_MSGFMT= YES USE_BUILDLINK2= # defined +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= # defined USE_X11= # defined USE_GNU_TOOLS+= make diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 5c4275f6639..0d9be2bae5c 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/04/01 18:52:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= epiphany-1.2.2 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/projects/epiphany/ COMMENT= The web browser for the GNOME Desktop BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/www/galeon-devel/Makefile b/www/galeon-devel/Makefile index c525a6ab907..921ee73fc9c 100644 --- a/www/galeon-devel/Makefile +++ b/www/galeon-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/03 13:26:32 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:28 jmmv Exp $ # DISTNAME= galeon-1.3.14a @@ -11,12 +11,12 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://galeon.sourceforge.net/ COMMENT= GNOME2 Web browser based on gecko -DEPENDS= gnome2-dirs>=1.5:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes CONFLICTS+= galeon-devel-[0-9]* USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 9d9484fe364..e2cc3234633 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.65 2004/04/14 16:15:28 jmmv Exp $ DISTNAME= galeon-1.2.13 PKGREVISION= 3 @@ -12,7 +12,6 @@ COMMENT= GNOME web browser based on gecko (mozilla rendering engine) CONFLICTS= galeon-current-[0-9]* BUILD_DEPENDS+= xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs EVAL_PREFIX+= MOZILLA_PREFIX=mozilla EVAL_PREFIX+= ICONV_PREFIX=libiconv @@ -20,6 +19,7 @@ EVAL_PREFIX+= GCONF_PREFIX=GConf USE_X11BASE= yes USE_BUILDLINK2= yes +USE_DIRS+= xdg-x11-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 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 |