gnome[12]-dirs shouldn't have buildlink2.mk files as they don't have

either shared libraries or header files.  Remove references to these
buildlink2.mk files from package Makefiles.

19 files changed, 46 insertions, 80 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 6420958cc18..536558c1bc6 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/01/27 12:31:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2003/02/05 05:06:32 jlam Exp $
 #
 
 DISTNAME=	easytag-0.26
@@ -10,7 +10,9 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
 
-BUILD_USES_MSGFMT=	yes				# xgettext, really
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
+BUILD_USES_MSGFMT=	yes	# xgettext, really
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
@@ -23,6 +25,5 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 .include "../../audio/flac/buildlink2.mk"
 .include "../../audio/id3lib/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 77f6c896737..39b8240eda3 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2003/01/27 12:31:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.66 2003/02/05 05:06:32 jlam Exp $
 #
 
 DISTNAME=		gqmpeg-0.19.0
@@ -11,6 +11,7 @@ HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 DEPENDS+=		mpg123>=0.59.18:../../audio/mpg123
 DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
@@ -38,6 +39,5 @@ pre-install:
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 50097a583e0..365b03580fe 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/30 23:09:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/05 05:06:33 jlam Exp $
 #
 
 DISTNAME=	sweep-0.8.0
@@ -9,6 +9,8 @@ MAINTAINER=	jmmv@netbsd.org
 HOMEPAGE=	http://sweep.sourceforge.net/
 COMMENT=	Full-featured digital sound editor
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
@@ -34,7 +36,6 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../databases/tdb/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common
index 52fba5e8f36..eae0d8380be 100644
--- a/chat/everybuddy/Makefile.common
+++ b/chat/everybuddy/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/01/27 12:54:53 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/02/05 05:06:33 jlam Exp $
 
 DISTNAME=	everybuddy-0.2.0
 CATEGORIES=	chat
@@ -8,6 +8,8 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.everybuddy.com/
 COMMENT=	Universal Instant Messaging Client
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -26,5 +28,3 @@ post-build:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper ${PREFIX}/bin/everybuddy
-
-.include "../../misc/gnome1-dirs/buildlink2.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
index 2986e9a2318..c4bb184f748 100644
--- a/chat/gaim/Makefile.common
+++ b/chat/gaim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2003/01/27 12:54:55 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.12 2003/02/05 05:06:33 jlam Exp $
 #
 
 DISTNAME=	gaim-0.59.8
@@ -17,6 +17,8 @@ PATCHDIR=	${.CURDIR}/../gaim/patches
 PKGDIR=		${.CURDIR}/../gaim
 PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_PKGLOCALEDIR=	YES
@@ -47,4 +49,3 @@ CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libc=yes
 
 .include "../../converters/libiconv/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index fabd29faf43..1dc3540b2db 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2003/01/27 12:54:56 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.15 2003/02/05 05:06:34 jlam Exp $
 
 DISTNAME=	xchat-1.8.11
 PKGREVISION=	1
@@ -11,6 +11,7 @@ HOMEPAGE=	http://xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 
 DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
 FILESDIR=	${.CURDIR}/../xchat/files
@@ -55,4 +56,3 @@ post-install:
 .include "../../devel/glib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../lang/python/application.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 73603179d0d..8a61e2b20ec 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/27 19:43:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/05 05:06:34 jlam Exp $
 #
 
 DISTNAME=	gq-0.3.0
@@ -11,12 +11,13 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://biot.com/gq/
 COMMENT=	GTK-based LDAP client
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../databases/openldap/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 89d6fc44735..abc336c94e1 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/27 23:45:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/02/05 05:06:34 jlam Exp $
 
 DISTNAME=		dopewars-1.5.8
 PKGREVISION=		1
@@ -11,6 +11,8 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 COMMENT=		Make a fortune dealing drugs on the streets of New York
 
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
@@ -27,5 +29,4 @@ CONFIGURE_ARGS+=	--localstatedir=/var/games
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 39db96969cf..b77138591f4 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/01/27 23:45:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2003/02/05 05:06:35 jlam Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 PKGREVISION=		1
@@ -10,6 +10,8 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 COMMENT=		Tetris-like puzzle game
 
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
@@ -32,7 +34,6 @@ pre-configure:
 
 .include "../../audio/libmikmod/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 2a0cff8add7..02864bd76bd 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/28 23:00:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/05 05:06:35 jlam Exp $
 
 DISTNAME=	gimageview-0.2.13
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	jrp@hispabsd.org
 HOMEPAGE=	http://gtkmmviewer.sourceforge.net/
 COMMENT=	GTK+ based image viewer with tabbed browsing
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
@@ -25,7 +27,6 @@ CONFIGURE_ARGS+=	--disable-xinetest
 # don't need both -- gimageview prefers gdk-pixbuf, so do we
 #.include "../../graphics/imlib/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index b321cec37f7..4da552b48ba 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/28 23:00:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/02/05 05:06:35 jlam Exp $
 
 DISTNAME=	gphoto-0.4.3
 PKGREVISION=	3
@@ -9,6 +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_X11BASE=		YES
 USE_LIBTOOL=		YES
@@ -17,5 +19,4 @@ GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../graphics/imlib/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 94cb318335a..e8e5eba1259 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/28 23:00:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/02/05 05:06:36 jlam Exp $
 #
 
 DISTNAME=	scigraphica-0.8.0
@@ -10,6 +10,8 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://scigraphica.sourceforge.net/
 COMMENT=	data analysis and technical graphics
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
@@ -29,7 +31,6 @@ PY_PATCHPLIST=		YES
 .include "../../devel/readline/buildlink2.mk"
 .include "../../graphics/imlib/buildlink2.mk"
 .include "../../math/py-Numeric/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../x11/gtk+extra/buildlink2.mk"
diff --git a/misc/gnome1-dirs/buildlink2.mk b/misc/gnome1-dirs/buildlink2.mk
deleted file mode 100644
index a8fc472d339..00000000000
--- a/misc/gnome1-dirs/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/01/27 09:36:26 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome1-dirs.
-#
-# This file was created automatically using createbuildlink 2.3.
-#
-
-.if !defined(GNOME1_DIRS_BUILDLINK2_MK)
-GNOME1_DIRS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			gnome1-dirs
-BUILDLINK_DEPENDS.gnome1-dirs?=		gnome1-dirs>=1.0
-BUILDLINK_PKGSRCDIR.gnome1-dirs?=	../../misc/gnome1-dirs
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome1-dirs=gnome1-dirs
-BUILDLINK_PREFIX.gnome1-dirs_DEFAULT=	${X11PREFIX}
-
-BUILDLINK_TARGETS+=	gnome1-dirs-buildlink
-
-gnome1-dirs-buildlink: _BUILDLINK_USE
-
-.endif	# GNOME1_DIRS_BUILDLINK2_MK
diff --git a/misc/gnome2-dirs/buildlink2.mk b/misc/gnome2-dirs/buildlink2.mk
deleted file mode 100644
index 4b158ddf7d2..00000000000
--- a/misc/gnome2-dirs/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/01/27 09:37:14 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome2-dirs.
-#
-# This file was created automatically using createbuildlink 2.3.
-#
-
-.if !defined(GNOME2_DIRS_BUILDLINK2_MK)
-GNOME2_DIRS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			gnome2-dirs
-BUILDLINK_DEPENDS.gnome2-dirs?=		gnome2-dirs>=1.0
-BUILDLINK_PKGSRCDIR.gnome2-dirs?=	../../misc/gnome2-dirs
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome2-dirs=gnome2-dirs
-BUILDLINK_PREFIX.gnome2-dirs_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_TARGETS+=	gnome2-dirs-buildlink
-
-gnome2-dirs-buildlink: _BUILDLINK_USE
-
-.endif	# GNOME2_DIRS_BUILDLINK2_MK
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index f7c532af0f4..2c2c9f5cdcc 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/29 12:22:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/05 05:06:36 jlam Exp $
 
 DISTNAME=	gftp-2.0.8
 PKGREVISION=	2
@@ -11,11 +11,12 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://gftp.seul.org/
 COMMENT=	multithreaded ftp client for *NIX based machines running X11R6
 
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include -D_POSIX_THREAD_SYSCALL_SOFT=1 ${CFLAGS}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/gtk2-pan/Makefile b/news/gtk2-pan/Makefile
index de1a565204b..cd7727f14a7 100644
--- a/news/gtk2-pan/Makefile
+++ b/news/gtk2-pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/29 12:27:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/05 05:06:36 jlam Exp $
 #
 
 DISTNAME=		pan-0.13.3
@@ -11,6 +11,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://pan.rebelbase.com/
 COMMENT=		Newsreader for GTK2
 
+DEPENDS+=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	YES
 
 USE_PERL5=		build
@@ -20,7 +21,6 @@ GNU_CONFIGURE=		YES
 LIBS=			-lcompat
 
 .include "../../converters/libiconv/buildlink2.mk"
-.include "../../misc/gnome2-dirs/buildlink2.mk"
 .include "../../textproc/gtkspell/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index ee9620ca181..253f3a330bc 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/01/29 12:31:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2003/02/05 05:06:36 jlam Exp $
 #
 
 DISTNAME=		gcombust-0.1.53
@@ -12,6 +12,7 @@ COMMENT=		Graphical frontend for CD mastering (mkisofs, cdrecord, ...)
 
 DEPENDS+=		cdrecord>=1.10:../../sysutils/cdrecord
 DEPENDS+=		cdlabelgen-[0-9]*:../../graphics/cdlabelgen
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 DEPENDS+=		gv-[0-9]*:../../print/gv
 
 USE_BUILDLINK2=		YES
@@ -19,6 +20,5 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 1a1ffca1bab..55daa0da2c6 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2003/01/30 11:14:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.85 2003/02/05 05:06:37 jlam Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
@@ -11,6 +11,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Base component of GNU Network Object Management Environment
 
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
 BUILD_DEPENDS+=		gtk-doc>=0.9:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=	YES
@@ -48,7 +49,6 @@ post-install:
 .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
 .include "../../graphics/gnome-pixmaps/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../www/libghttp/buildlink2.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 84e78de0c1f..c8a0ed6f227 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2003/01/30 11:14:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.84 2003/02/05 05:06:37 jlam Exp $
 
 DISTNAME=		gnome-libs-1.4.1.4
 PKGREVISION=		3
@@ -9,6 +9,7 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Libraries for the GNU Network Object Model Environment
 
+DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=		YES
@@ -65,7 +66,6 @@ post-install:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/imlib/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../net/ORBit/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"