12 files changed, 28 insertions, 28 deletions

diff --git a/audio/kdemultimedia11/Makefile b/audio/kdemultimedia11/Makefile
index 3fc1702d2661..99a824d30b4a 100644
--- a/audio/kdemultimedia11/Makefile
+++ b/audio/kdemultimedia11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.12 1998/07/19 17:55:11 se Exp $
+# $Id: Makefile,v 1.13 1998/07/23 20:51:56 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.0
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
+LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 3fc1702d2661..99a824d30b4a 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.12 1998/07/19 17:55:11 se Exp $
+# $Id: Makefile,v 1.13 1998/07/23 20:51:56 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.0
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
+LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 3fc1702d2661..99a824d30b4a 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.12 1998/07/19 17:55:11 se Exp $
+# $Id: Makefile,v 1.13 1998/07/23 20:51:56 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.0
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
+LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile
index 18a7c21ac6d4..36103a7b95cf 100644
--- a/audio/kmpg/Makefile
+++ b/audio/kmpg/Makefile
@@ -3,7 +3,7 @@
 # Date created:        23 May 1998
 # Whom:                Hans Petter Bieker <hanspb@persbraten.vgs.no>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/12 08:05:59 tg Exp $
+# $Id: Makefile,v 1.2 1998/07/08 15:00:17 scrappy Exp $
 #
 
 DISTNAME=	kmpg-0.3.3
@@ -14,8 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	hanspb@persbraten.vgs.no
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11-toolkits/qt \
 		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs
 
diff --git a/audio/mxv/Makefile b/audio/mxv/Makefile
index 961829792f59..cad08637391e 100644
--- a/audio/mxv/Makefile
+++ b/audio/mxv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 March 1997
 # Whom:			davidn@blaze.net.au
 #
-# $Id: Makefile,v 1.3 1997/04/18 16:53:27 davidn Exp $
+# $Id: Makefile,v 1.4 1998/07/14 23:36:30 jseger Exp $
 #
 
 DISTNAME=	mxv-v1.10-source
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/audio/mxv/
 
 MAINTAINER=	davidn@blaze.net.au
 
-BUILD_DEPENDS=	${LOCALBASE}/interviews/bin/FREEBSD/ivmkmf:${PORTSDIR}/x11/iv
+BUILD_DEPENDS=	${LOCALBASE}/interviews/bin/FREEBSD/ivmkmf:${PORTSDIR}/x11-toolkits/iv
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index a1d04452043f..551a447f7519 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -3,7 +3,7 @@
 # Date created:		04 Aug 1996
 # Whom:			shanee
 #
-# $Id: Makefile,v 1.3 1996/08/18 13:49:33 chuckr Exp $
+# $Id: Makefile,v 1.4 1997/09/08 12:25:15 tg Exp $
 #
 
 DISTNAME=	rosegarden-2.0.1
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	-sources.tgz
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	Xaw3d\\.6\\.:$(PORTSDIR)/x11/Xaw3d
+LIB_DEPENDS=	Xaw3d\\.6\\.:$(PORTSDIR)/x11-toolkits/Xaw3d
 RUN_DEPENDS=	playmidi:${PORTSDIR}/audio/playmidi
 
 ALL_TARGET=	all ROSEGARDEN=$(WRKSRC) SYSLIBS="\"-lXaw3d -lXext -lXmu -lXt -lX11\"" SYSEXTRALIBS=""
diff --git a/audio/splaytk/Makefile b/audio/splaytk/Makefile
index 98cc35a804ec..5453700342e2 100644
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@@ -3,7 +3,7 @@
 # Date created:         19 Apr 1998
 # Whom:                 brett@peloton.physics.montana.edu
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1998/04/24 02:33:34 mph Exp $
 #
 
 DISTNAME=		splaytk-2.0
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/sound/players
 MAINTAINER=		brett@peloton.physics.montana.edu
 
 RUN_DEPENDS=	splay:${PORTSDIR}/audio/splay \
-		wish8.0:${PORTSDIR}/x11/tk80
+		wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC= ${WRKDIR}/splay-tk-2.0
 
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index e4454f5fc2fb..4a835ce85ff0 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 November 1996
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.5 1998/06/26 19:05:26 fenner Exp $
+# $Id: Makefile,v 1.6 1998/08/05 09:31:32 asami Exp $
 #
 
 DISTNAME=	vat-4.0b2
@@ -20,7 +20,7 @@ GSM_WORK=	${GSM_DIR}/work/gsm-1.0-pl10
 # we can use this first BUILD_DEPENDS and save some work.
 #BUILD_DEPENDS=	${GSM_WORK}/inc/private.h:${GSM_DIR}:patch
 BUILD_DEPENDS=	${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
-LIB_DEPENDS=	tk80:${PORTSDIR}/x11/tk80 \
+LIB_DEPENDS=	tk80:${PORTSDIR}/x11-toolkits/tk80 \
 		gsm:${GSM_DIR}
 
 USE_X_PREFIX=	yes
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 5c997814cdb1..671693769924 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Now 1995
 # Whom:                 Donald Burr <d_burr@ix.netcom.com>
 #
-# $Id: Makefile,v 1.3 1996/11/18 09:52:21 asami Exp $
+# $Id: Makefile,v 1.4 1997/11/28 19:55:18 jseger Exp $
 #
 
 DISTNAME=       WorkMan-1.3a
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications/WorkMan
 
 MAINTAINER=	d_burr@ix.netcom.com
 
-LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
 
 WRKSRC=		${WRKDIR}/workman
 USE_IMAKE=	yes
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 3549489c47f8..cfca89c7eee0 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp $
+# $Id: Makefile,v 1.20 1998/03/20 14:35:25 tg Exp $
 #
 
 DISTNAME=	xcd-1.6
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-RUN_DEPENDS=    wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=    wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/xcd
 MAN1=		cdplayer.1 xcd.1
diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile
index 14bbb4aec31a..28241a70d7e2 100644
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			doconnor@ist.flinders.edu.au
 #
-# $Id: Makefile,v 1.7 1998/05/10 16:55:03 steve Exp $
+# $Id: Makefile,v 1.8 1998/07/14 23:39:38 jseger Exp $
 #
 
 DISTNAME=	xmp3_1.0.0
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 RUN_DEPENDS=	amp:${PORTSDIR}/audio/amp \
-		wish8.0:${PORTSDIR}/x11/tk80
+		wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/xmpeg3
 NO_BUILD=	yes
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index af83eaf97f20..dfb83da7fe29 100644
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 December 96
 # Whom:			Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/30 09:46:27 tg Exp $
 #
 
 DISTNAME=	Xtuner-2.1
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
-LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
 		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	YES