depends should be ../../<category>/<pkg>

45 files changed, 104 insertions, 104 deletions

diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index 66e44ce99b8..8ff8c3a5841 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/13 18:01:19 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/19 10:21:01 grant Exp $
 #
 
 DISTNAME=	Device-Gsm-1.36
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Device/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl module to interface GSM cellular / modems
 
-DEPENDS+=	p5-Device-Modem-[0-9]*:../p5-Device-Modem
+DEPENDS+=	p5-Device-Modem-[0-9]*:../../comms/p5-Device-Modem
 
 PERL5_PACKLIST=		auto/Device/Gsm/.packlist
 
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index a449a8a037f..c31b0850770 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/13 18:01:19 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/19 10:21:01 grant Exp $
 #
 
 DISTNAME=	Device-Modem-1.36
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Device/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl module to talk to modem devices connected via serial port
 
-DEPENDS+=	p5-Device-SerialPort-[0-9]*:../p5-Device-SerialPort
+DEPENDS+=	p5-Device-SerialPort-[0-9]*:../../comms/p5-Device-SerialPort
 
 PERL5_PACKLIST=		auto/Device/Modem/.packlist
 
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 178aaf69123..db53f1a35e9 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/24 06:43:43 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/19 10:21:01 grant Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 PKGNAME=	pilotmgr-1.107.2
@@ -13,7 +13,7 @@ COMMENT=	Synchronize databases on any 3Com Palm device
 
 DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
-DEPENDS+=	p5-pilot-link-[0-9]*:../p5-pilot-link
+DEPENDS+=	p5-pilot-link-[0-9]*:../../comms/p5-pilot-link
 DEPENDS+=	{p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:../../lang/perl5
 
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-.*$//}
diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile
index d401b718388..c6f0c860817 100644
--- a/databases/ruby-vapor/Makefile
+++ b/databases/ruby-vapor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/19 10:20:36 grant Exp $
 
 DISTNAME=	vapor-0.81
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Ruby transparent persistence to postgresql
 
 .include "../../lang/ruby/rubyversion.mk"
 
-DEPENDS+=	${RUBY_PKGPREFIX}-DBD-postgresql>=0.0.20:../ruby-DBD-postgresql
+DEPENDS+=	${RUBY_PKGPREFIX}-DBD-postgresql>=0.0.20:../../databases/ruby-DBD-postgresql
 .if ${RUBY_VER} == 16
 DEPENDS+=	${RUBY_PKGPREFIX}-rexml>=2.4.0:../../textproc/ruby-rexml
 DEPENDS+=	${RUBY_PKGPREFIX}-racc>=1.4.3:../../devel/ruby-racc
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 501d6ac7f8d..b5ecb3efb0b 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2004/10/14 19:04:56 tv Exp $
+# $NetBSD: Makefile,v 1.44 2005/07/19 10:20:07 grant Exp $
 
 .include "Makefile.common"
 
 SVR4_PKGNAME=	ltool
 
-DEPENDS+=	${DISTNAME:S/-/-base-/}{,nb[0-9]*}:../libtool-base
-DEPENDS+=	${DISTNAME:S/-/-info-/}{,nb[0-9]*}:../libtool-info
+DEPENDS+=	${DISTNAME:S/-/-base-/}{,nb[0-9]*}:../../devel/libtool-base
+DEPENDS+=	${DISTNAME:S/-/-info-/}{,nb[0-9]*}:../../devel/libtool-info
 
 # There is no libltdl dependency here; this is deliberate, so that libltdl
 # can be updated independently of the rest of libtool.
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index a684c3dab37..117e4d7a377 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:23 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/19 10:20:07 grant Exp $
 #
 
 DISTNAME=		Class-ReturnValue-0.52
@@ -14,8 +14,8 @@ COMMENT=		Perl5 module for return-value object
 
 PERL5_PACKLIST=		auto/Class/ReturnValue/.packlist
 
-DEPENDS+=		p5-Devel-StackTrace-[0-9]*:../p5-Devel-StackTrace
-DEPENDS+=		p5-Test-Inline-[0-9]*:../p5-Test-Inline
+DEPENDS+=		p5-Devel-StackTrace-[0-9]*:../../devel/p5-Devel-StackTrace
+DEPENDS+=		p5-Test-Inline-[0-9]*:../../devel/p5-Test-Inline
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Devel-StackTrace/Makefile b/devel/p5-Devel-StackTrace/Makefile
index e8332dacc2f..4d6badbb0f3 100644
--- a/devel/p5-Devel-StackTrace/Makefile
+++ b/devel/p5-Devel-StackTrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/13 18:01:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/19 10:20:07 grant Exp $
 #
 
 DISTNAME=		Devel-StackTrace-1.11
@@ -14,7 +14,7 @@ COMMENT=		Perl5 module for stack trace and stack trace frame objects
 
 PERL5_PACKLIST=		auto/Devel/StackTrace/.packlist
 
-DEPENDS+=	p5-Test-Simple>=0.46:../p5-Test-Simple
+DEPENDS+=	p5-Test-Simple>=0.46:../../devel/p5-Test-Simple
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 5bca1c08fe1..5a905931c75 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:56 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/19 10:18:59 grant Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGREVISION=	5
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	Libraries of Emacs Input Methods
 
-DEPENDS+=	emacs-${VERSION}nb5:../emacs20
+DEPENDS+=	emacs-${VERSION}nb5:../../editors/emacs20
 
 WRKSRC=		${WRKDIR}/emacs-20.7/leim
 GNU_CONFIGURE=	yes
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index ecb2bd95093..f934ccd13a6 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/07/19 10:18:59 grant Exp $
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -7,7 +7,7 @@ COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 
 .include		"../vim-share/Makefile.common"
 
-DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index 686faa9fb53..f24a28b2ca9 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/19 10:18:59 grant Exp $
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -7,7 +7,7 @@ COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
 .include		"../vim-share/Makefile.common"
 
-DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index a315531fe70..f1ae532b967 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/07 08:07:39 martti Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/19 10:18:59 grant Exp $
 
 PKGNAME=	vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -6,7 +6,7 @@ PKGNAME=	vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=	Language files for the vim editor (vi clone)
 
-DEPENDS+=	vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+=	vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 
 BUILD_TARGET=	languages
 INSTALL_TARGET=	install-languages
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index c6864ba8556..f1c381f532d 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/19 10:18:59 grant Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -7,7 +7,7 @@ COMMENT=		Vim editor (vi clone) with X11 Motif GUI
 
 .include		"../vim-share/Makefile.common"
 
-DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 3f0dac1d781..6403aa4cd95 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/19 10:18:59 grant Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -7,7 +7,7 @@ PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 
-DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=		vim-motif-[0-9]* vim-kde-[0-9]*
 
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 75ae283f2dd..5efaf967260 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2005/05/30 14:18:14 martti Exp $
+# $NetBSD: Makefile,v 1.62 2005/07/19 10:18:59 grant Exp $
 
 PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -7,7 +7,7 @@ COMMENT=		Vim editor (vi clone) without GUI
 
 .include		"../vim-share/Makefile.common"
 
-DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 
 CONFLICTS+=		vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index b3d15d24f3d..07f233d3db7 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/19 10:18:31 grant Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsScalable-${XF_VER}
@@ -10,7 +10,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 scalable fonts
 
-DEPENDS+=	XFree86-fontsEncodings>=${XF_VER}:../XFree86-fontsEncodings
+DEPENDS+=	XFree86-fontsEncodings>=${XF_VER}:../../fonts/XFree86-fontsEncodings
 
 NO_BUILD=		yes
 USE_LANGUAGES=		# empty
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 417a3513da3..aa62f4e0e36 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/07/19 10:17:59 grant Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -9,7 +9,7 @@ CATEGORIES+=		x11
 
 COMMENT=		The QT-Enhanced X11 version of NetHack
 
-DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
+DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../../games/nethack-lib
 
 
 BUILD_TARGET=		x11tiles nethack
diff --git a/games/nethack-tty/Makefile b/games/nethack-tty/Makefile
index 90c31dea106..01bad0c645a 100644
--- a/games/nethack-tty/Makefile
+++ b/games/nethack-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/03 15:14:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/19 10:17:59 grant Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -7,7 +7,7 @@ PKGNAME=		nethack-tty-${NETHACK_VERSION}
 
 COMMENT=		The tty/console based version of NetHack
 
-DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
+DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../../games/nethack-lib
 
 BUILD_TARGET=		nethack
 INSTALL_TARGET=		binfiles
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 7e656cd7e86..7d7cc7a0c02 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/14 17:24:12 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/19 10:17:59 grant Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -8,7 +8,7 @@ COMMENT=		The X11 version of NetHack
 
 CATEGORIES+=		x11
 
-DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
+DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../../games/nethack-lib
 
 
 BUILD_TARGET=		x11tiles nethack
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 507c5cfe002..d6db901a31d 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/19 10:17:59 grant Exp $
 
 # Needed so configure/patch rules don't get pulled in
 NO_BUILD=	yes
@@ -13,9 +13,9 @@ DISTFILES=	# empty
 
 COMMENT=	Meta-package for NetHack with x11, qt and tty versions
 
-DEPENDS+=	nethack-tty-${NETHACK_VERSION}:../nethack-tty
-DEPENDS+=	nethack-x11-${NETHACK_VERSION}:../nethack-x11
-DEPENDS+=	nethack-qt-${NETHACK_VERSION}nb2:../nethack-qt
+DEPENDS+=	nethack-tty-${NETHACK_VERSION}:../../games/nethack-tty
+DEPENDS+=	nethack-x11-${NETHACK_VERSION}:../../games/nethack-x11
+DEPENDS+=	nethack-qt-${NETHACK_VERSION}nb2:../../games/nethack-qt
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index 567e7af954e..d279eb123c1 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/01/27 00:53:11 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/19 10:17:17 grant Exp $
 #
 .include "../canna/Makefile.common"
 
 CANNA_MODULE=	dict
 
-BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../canna-server
+BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
 
 NO_MTREE=	yes
 OWN_DIRS=	${PREFIX}/canna
diff --git a/inputmethod/canna/Makefile b/inputmethod/canna/Makefile
index 65432c8b217..f809d8949a5 100644
--- a/inputmethod/canna/Makefile
+++ b/inputmethod/canna/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/19 10:17:17 grant Exp $
 #
 .include "Makefile.common"
 
 PKGNAME:=	Canna-${CANNA_VERSION}
 
-DEPENDS+=	Canna-server>=${CANNA_VERSION}:../canna-server
-DEPENDS+=	Canna-dict>=${CANNA_VERSION}:../canna-dict
+DEPENDS+=	Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
+DEPENDS+=	Canna-dict>=${CANNA_VERSION}:../../inputmethod/canna-dict
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	YES
diff --git a/inputmethod/ja-freewnn-dict/Makefile b/inputmethod/ja-freewnn-dict/Makefile
index 4c671713ac6..5f0fa93204a 100644
--- a/inputmethod/ja-freewnn-dict/Makefile
+++ b/inputmethod/ja-freewnn-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/12 04:19:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/19 10:17:17 grant Exp $
 #
 
 PKGNAME=	ja-FreeWnn-dict-1.10
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.freewnn.org/
 COMMENT=	Japanese/Chinese/Korean input method (Japanese dictionary)
 
-BUILD_DEPENDS+=	ja-FreeWnn-server-bin>=1.10nb1:../ja-freewnn-server-bin
+BUILD_DEPENDS+=	ja-FreeWnn-server-bin>=1.10nb1:../../inputmethod/ja-freewnn-server-bin
 
 WNNDIR=		Wnn
 WNN_TARGET=	DICT
diff --git a/inputmethod/ja-freewnn-server/Makefile b/inputmethod/ja-freewnn-server/Makefile
index dd3b92cb6f9..264d1e9444d 100644
--- a/inputmethod/ja-freewnn-server/Makefile
+++ b/inputmethod/ja-freewnn-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/05 19:37:23 kei Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/19 10:17:17 grant Exp $
 
 DISTNAME=	ja-FreeWnn-server-1.10
 PKGREVISION=	2
@@ -9,8 +9,8 @@ DISTFILES=	# empty
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Japanese/Chinese/Korean input method (Japanese server)
 
-DEPENDS+=	ja-FreeWnn-server-bin>=1.10nb4:../ja-freewnn-server-bin
-DEPENDS+=	ja-FreeWnn-dict>=1.10nb1:../ja-freewnn-dict
+DEPENDS+=	ja-FreeWnn-server-bin>=1.10nb4:../../inputmethod/ja-freewnn-server-bin
+DEPENDS+=	ja-FreeWnn-dict>=1.10nb1:../../inputmethod/ja-freewnn-dict
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
index 72baaccf9d0..83cd29e5c4a 100644
--- a/inputmethod/sj3-dict/Makefile
+++ b/inputmethod/sj3-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/19 10:17:17 grant Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/	\
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Japanese input method (dictionary)
 
-BUILD_DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../sj3-server-bin
+BUILD_DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin
 
 FILESDIR=	${.CURDIR}/../sj3-lib/files
 DISTINFO_FILE=	${.CURDIR}/../sj3-lib/distinfo
diff --git a/inputmethod/sj3-server/Makefile b/inputmethod/sj3-server/Makefile
index c945d7a9653..a40d4f046df 100644
--- a/inputmethod/sj3-server/Makefile
+++ b/inputmethod/sj3-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/19 10:17:18 grant Exp $
 
 DISTNAME=	sj3-server-2.0.1.20
 PKGREVISION=	1
@@ -9,8 +9,8 @@ DISTFILES=	# empty
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Japanese input method (server)
 
-DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../sj3-server-bin
-DEPENDS+=	sj3-dict>=2.0.1.20nb1:../sj3-dict
+DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin
+DEPENDS+=	sj3-dict>=2.0.1.20nb1:../../inputmethod/sj3-dict
 
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	YES
diff --git a/meta-pkgs/netbsd-doc-print/Makefile b/meta-pkgs/netbsd-doc-print/Makefile
index 144851bb231..78f1d93f43c 100644
--- a/meta-pkgs/netbsd-doc-print/Makefile
+++ b/meta-pkgs/netbsd-doc-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/12 16:57:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/19 10:16:53 grant Exp $
 #
 
 DISTNAME=	netbsd-doc-print-1.2
@@ -11,7 +11,7 @@ COMMENT=	Meta-package including all packages to convert SGML->PDF/PS
 
 DEPENDS+=	tex-jadetex>=2.20nb1:../../print/tex-jadetex
 DEPENDS+=	openjade-[0-9]*:../../textproc/openjade
-DEPENDS+=	netbsd-doc>=1.2:../netbsd-doc
+DEPENDS+=	netbsd-doc>=1.2:../../meta-pkgs/netbsd-doc
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/news/trn/Makefile b/news/trn/Makefile
index caa8f066aaa..9bcd764a1d5 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:17 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/19 10:16:09 grant Exp $
 
 DISTNAME=		trn-4.0-test76
 PKGNAME=		trn-4.76
@@ -18,9 +18,9 @@ PKG_SYSCONFSUBDIR=	nntp
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_INN) && ${USE_INN} == YES
-DEPENDS=		inn>=2.2:../inn
+DEPENDS=		inn>=2.2:../../news/inn
 .else
-DEPENDS=		nntpclnt>=1.6.1:../nntpclnt
+DEPENDS=		nntpclnt>=1.6.1:../../news/nntpclnt
 .endif
 
 # TRN_HOSTBITS determines the number of "name segments" (x.y.z.com), counting
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 19b42f90e37..9902444c880 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/04/28 23:23:41 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2005/07/19 10:15:29 grant Exp $
 
 DISTNAME=	tetex-src-${TETEX_BIN_VERS}
 PKGNAME=	teTeX-bin-${TETEX_BIN_VERS}
@@ -14,7 +14,7 @@ COMMENT=	TeX distribution for UNIX compatible systems - executables, version 2
 CONFLICTS+=	teTeX2-bin-[0-9]* omega<0.90.4nb1
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-DEPENDS+=	teTeX-share>=2.0.2:../teTeX-share
+DEPENDS+=	teTeX-share>=2.0.2:../../print/teTeX-share
 DEPENDS+=	dialog-0.6z*:../../misc/dialog
 
 INFO_FILES=	latex.info dvips.info web2c.info kpathsea.info
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index 91acc50d0c2..ab9a79d724f 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/19 10:15:29 grant Exp $
 
 DISTNAME=	tetex-texmfsrc-2.0.2
 PKGNAME=	teTeX-sharesrc-2.0.2
@@ -11,7 +11,7 @@ COMMENT=	Sources for machine-independent part of teTeX, version 2
 
 CONFLICTS+=	teTeX2-sharesrc-[0-9]*
 
-DEPENDS+=	teTeX-share>=2.0.2:../teTeX-share
+DEPENDS+=	teTeX-share>=2.0.2:../../print/teTeX-share
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index a9aea6b162e..48e187e02de 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/14 02:26:50 reed Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/19 10:15:29 grant Exp $
 #
 
 DISTNAME=	teTeX-2.0.2
@@ -11,8 +11,8 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Thomas Esser's TeX distribution for UNIX compatible systems, version 2
 
-DEPENDS+=	teTeX-bin>=2.0.2:../teTeX-bin
-DEPENDS+=	teTeX-sharesrc>=2.0.2:../teTeX-sharesrc
+DEPENDS+=	teTeX-bin>=2.0.2:../../print/teTeX-bin
+DEPENDS+=	teTeX-sharesrc>=2.0.2:../../print/teTeX-sharesrc
 DEPENDS+=	texi2html>=1.52:../../textproc/texi2html
 
 CONFLICTS+=	teTeX2-[0-9]*
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index c4eb101bdb5..0260406baef 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/19 10:15:30 grant Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	TeX distribution for UNIX compatible systems - executables
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-DEPENDS+=	teTeX-share-1.0.[2-9]*:../teTeX1-share
+DEPENDS+=	teTeX-share-1.0.[2-9]*:../../print/teTeX1-share
 DEPENDS+=	dialog-0.6z*:../../misc/dialog
 
 # games/omega previously installed an omega executable too
diff --git a/print/teTeX1-sharesrc/Makefile b/print/teTeX1-sharesrc/Makefile
index 1b8822e0075..1db217157be 100644
--- a/print/teTeX1-sharesrc/Makefile
+++ b/print/teTeX1-sharesrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/19 10:15:30 grant Exp $
 
 DISTNAME=	teTeX-texmfsrc-1.0.1
 PKGNAME=	teTeX-sharesrc-1.0.1
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Sources for machine-independent part of teTeX
 
-DEPENDS+=	teTeX-share-1.0.[2-9]*:../teTeX1-share
+DEPENDS+=	teTeX-share-1.0.[2-9]*:../../print/teTeX1-share
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
diff --git a/print/teTeX1/Makefile b/print/teTeX1/Makefile
index ad5041f640b..9c0af806f74 100644
--- a/print/teTeX1/Makefile
+++ b/print/teTeX1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/19 10:15:29 grant Exp $
 #
 
 DISTNAME=	teTeX-1.0.7
@@ -11,8 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Thomas Esser's TeX distribution for UNIX compatible systems
 
-DEPENDS+=	teTeX-bin-1.0.[7-9]*:../teTeX1-bin
-DEPENDS+=	teTeX-sharesrc-1.0.[1-9]*:../teTeX1-sharesrc
+DEPENDS+=	teTeX-bin-1.0.[7-9]*:../../print/teTeX1-bin
+DEPENDS+=	teTeX-sharesrc-1.0.[1-9]*:../../print/teTeX1-sharesrc
 DEPENDS+=	texi2html>=1.52:../../textproc/texi2html
 
 EXTRACT_ONLY=   # empty
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index a3659a694d7..3c563c943d4 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/07 13:34:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/19 10:15:30 grant Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	TeX distribution for UNIX compatible systems - binaries
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-DEPENDS+=	teTeX-texmf>=3.0:../teTeX3-texmf
+DEPENDS+=	teTeX-texmf>=3.0:../../print/teTeX3-texmf
 DEPENDS+=	dialog-0.6z*:../../misc/dialog
 
 # games/omega previously installed an omega executable too
diff --git a/print/teTeX3-texmfsrc/Makefile b/print/teTeX3-texmfsrc/Makefile
index 59f44f00bb4..3c3d7b156f1 100644
--- a/print/teTeX3-texmfsrc/Makefile
+++ b/print/teTeX3-texmfsrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/19 10:15:30 grant Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	kei@NetBSD.org,hubertf@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Sources for machine-independent part of teTeX
 
-DEPENDS+=	teTeX-texmf>=3.0:../teTeX3-texmf
+DEPENDS+=	teTeX-texmf>=3.0:../../print/teTeX3-texmf
 
 CONFLICTS+=	teTeX-sharesrc-[0-9]*
 
diff --git a/print/tex-bagpipetex/Makefile b/print/tex-bagpipetex/Makefile
index 31b01980616..6eb8e570673 100644
--- a/print/tex-bagpipetex/Makefile
+++ b/print/tex-bagpipetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/02/11 00:51:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/19 10:15:30 grant Exp $
 #
 
 DISTNAME=	bagpipetex-3.01
@@ -12,7 +12,7 @@ MAINTAINER=	dgriffi@cs.csubak.edu
 HOMEPAGE=	http://www.stanford.edu/~wrinnes/bagpipe.tex/
 COMMENT=	MusixTeX macros to typeset bagpipe music
 
-DEPENDS+=	tex-musixtex>=112:../tex-musixtex
+DEPENDS+=	tex-musixtex>=112:../../print/tex-musixtex
 
 WRKSRC=         ${WRKDIR}
 NO_CONFIGURE=   yes
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index 26f0a6b7989..e804f7031d8 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/19 10:15:30 grant Exp $
 #
 
 DISTNAME=	jadetex-3.13
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jadetex/}
 MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Process tex files produced by the TeX backend of Jade
 
-DEPENDS+=	tex-hugelatex>=1.0nb1:../tex-hugelatex
+DEPENDS+=	tex-hugelatex>=1.0nb1:../../print/tex-hugelatex
 
 NO_BUILD=	yes
 TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 8970dbda098..a493a6afdaa 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/20 15:47:57 tron Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/19 10:13:07 grant Exp $
 
 .include	"../nessus/Makefile.common"
 
@@ -8,8 +8,8 @@ DISTFILES=	# empty
 
 COMMENT=	The Nessus Network Security Scanner
 
-DEPENDS+=	nessus-core-${VERS}{,nb*}:../nessus-core
-DEPENDS+=	nessus-plugins-${VERS}{,nb*}:../nessus-plugins
+DEPENDS+=	nessus-core-${VERS}{,nb*}:../../security/nessus-core
+DEPENDS+=	nessus-plugins-${VERS}{,nb*}:../../security/nessus-plugins
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index c24e28c25cc..6eb8b7deb63 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/13 18:01:38 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/19 10:13:07 grant Exp $
 #
 
 DISTNAME=		Crypt-OpenSSL-RSA-0.21
@@ -12,8 +12,8 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://perl-openssl.sourceforge.net/
 COMMENT=		Perl5 wrapper module for the OpenSSL RSA functions
 
-DEPENDS+=		p5-Crypt-OpenSSL-Bignum-[0-9]*:../p5-Crypt-OpenSSL-Bignum
-DEPENDS+=		p5-Crypt-OpenSSL-Random-[0-9]*:../p5-Crypt-OpenSSL-Random
+DEPENDS+=		p5-Crypt-OpenSSL-Bignum-[0-9]*:../../security/p5-Crypt-OpenSSL-Bignum
+DEPENDS+=		p5-Crypt-OpenSSL-Random-[0-9]*:../../security/p5-Crypt-OpenSSL-Random
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/security/p5-Digest-CRC/Makefile b/security/p5-Digest-CRC/Makefile
index 008a28caadd..a1eec1d1097 100644
--- a/security/p5-Digest-CRC/Makefile
+++ b/security/p5-Digest-CRC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/13 18:01:39 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/19 10:13:08 grant Exp $
 #
 
 DISTNAME=	Digest-CRC-0.09
@@ -11,7 +11,7 @@ MAINTAINER=	tv@duh.org
 HOMEPAGE=	http://search.cpan.org/dist/Digest-CRC/
 COMMENT=	Perl5 extension interface for cyclic redundancy check algorithms
 
-DEPENDS+=	p5-Digest>=1.00:../p5-Digest
+DEPENDS+=	p5-Digest>=1.00:../../security/p5-Digest
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index 17062927e42..8f3b70c41f4 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/19 10:13:08 grant Exp $
 #
 
 DISTNAME=		Digest-HMAC-1.01
@@ -12,8 +12,8 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Digest-HMAC/
 COMMENT=		Perl5 module for HMAC
 
-DEPENDS+=		p5-Digest-SHA1>=1.00:../p5-Digest-SHA1
-DEPENDS+=		p5-Digest-MD5>=2.00:../p5-Digest-MD5
+DEPENDS+=		p5-Digest-SHA1>=1.00:../../security/p5-Digest-SHA1
+DEPENDS+=		p5-Digest-MD5>=2.00:../../security/p5-Digest-MD5
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index 5014eff9c39..cc4e7c85d26 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/13 18:01:39 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/19 10:13:08 grant Exp $
 #
 
 DISTNAME=		Digest-SHA1-2.10
@@ -12,7 +12,7 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Digest-SHA1/
 COMMENT=		Perl5 module for SHA1
 
-DEPENDS+=		p5-Digest>=1.00:../p5-Digest
+DEPENDS+=		p5-Digest>=1.00:../../security/p5-Digest
 
 CONFLICTS+=		p5-Digest-MD5<=2.12
 
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 69644626aa4..8a8d88cfaef 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/07/19 10:12:14 grant Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
@@ -12,7 +12,7 @@ COMMENT=	Graphical user interface for the command-line cdrecord-tools
 
 BUILD_USES_MSGFMT=	YES
 
-DEPENDS+=		cdrecord-xcdroast-0.98a15.*:../cdrecord-xcdroast
+DEPENDS+=		cdrecord-xcdroast-0.98a15.*:../../sysutils/cdrecord-xcdroast
 
 USE_TOOLS+=		gmake
 USE_PKGINSTALL=		YES
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index c03de6f2ced..d1c248d1e16 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/13 18:01:43 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/19 10:11:48 grant Exp $
 #
 
 DISTNAME=	XML-Node-0.10
@@ -13,7 +13,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://belmont-shores.ics.uci.edu/XML::Node/
 COMMENT=	Node-based XML parsing: an simplified interface to XML::Parser
 
-DEPENDS+=	p5-XML-Parser-2.*:../p5-XML-Parser
+DEPENDS+=	p5-XML-Parser-2.*:../../textproc/p5-XML-Parser
 
 PERL5_PACKLIST=		auto/XML/Node/.packlist
 
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index d1a77432571..db708f67e7b 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/13 18:01:44 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/19 10:11:48 grant Exp $
 #
 
 DISTNAME=	XML-XQL-0.68
@@ -11,8 +11,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl module to perform XQL queries on XML object trees
 
-DEPENDS+=	p5-XML-DOM>=1.29:../p5-XML-DOM
-DEPENDS+=	p5-XML-Parser>=2.30:../p5-XML-Parser
+DEPENDS+=	p5-XML-DOM>=1.29:../../textproc/p5-XML-DOM
+DEPENDS+=	p5-XML-Parser>=2.30:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-Date-Manip>=5.33:../../devel/p5-Date-Manip
 DEPENDS+=	p5-Parse-Yapp-[0-9]*:../../devel/p5-Parse-Yapp
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww