summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1998-08-07 23:56:56 +0000
committerSatoshi Asami <asami@FreeBSD.org>1998-08-07 23:56:56 +0000
commit5264cbceb577ae0481e496f827ae4d0e18712945 (patch)
tree03d79514a3868d93e8dc51510d0a33f4b098dd70
parentRename category from x11 to x11-toolkits. (diff)
Fix up dependencies for ports that moved into the x11-toolkits category.
Notes
Notes: svn path=/head/; revision=12335
-rw-r--r--archivers/ark/Makefile6
-rw-r--r--audio/kdemultimedia11/Makefile6
-rw-r--r--audio/kdemultimedia2/Makefile6
-rw-r--r--audio/kdemultimedia3/Makefile6
-rw-r--r--audio/kmpg/Makefile6
-rw-r--r--audio/mxv/Makefile4
-rw-r--r--audio/rosegarden/Makefile4
-rw-r--r--audio/splaytk/Makefile4
-rw-r--r--audio/vat/Makefile4
-rw-r--r--audio/workman/Makefile4
-rw-r--r--audio/xcd/Makefile4
-rw-r--r--audio/xmpeg3/Makefile4
-rw-r--r--audio/xtuner/Makefile4
-rw-r--r--biology/seaview/Makefile4
-rw-r--r--comms/kremotecontrol/Makefile6
-rw-r--r--comms/tkhylafax/Makefile4
-rw-r--r--converters/kdesupport11/Makefile6
-rw-r--r--converters/kdesupport2/Makefile6
-rw-r--r--converters/xdeview/Makefile4
-rw-r--r--databases/tkgnats/Makefile4
-rw-r--r--databases/xmysql/Makefile4
-rw-r--r--databases/xmysqladmin/Makefile4
-rw-r--r--deskutils/cbb/Makefile6
-rw-r--r--deskutils/ical/Makefile4
-rw-r--r--deskutils/kcharselect/Makefile6
-rw-r--r--deskutils/korganizer/Makefile6
-rw-r--r--deskutils/kproject/Makefile6
-rw-r--r--deskutils/zorro/Makefile4
-rw-r--r--devel/SpecTcl/Makefile4
-rw-r--r--devel/gide/Makefile4
-rw-r--r--devel/glade/Makefile4
-rw-r--r--devel/glade2/Makefile4
-rw-r--r--devel/mico/Makefile6
-rw-r--r--devel/qtez/Makefile6
-rw-r--r--devel/tkcvs/Makefile4
-rw-r--r--devel/tkref/Makefile4
-rw-r--r--devel/vtcl/Makefile4
-rw-r--r--editors/gxedit/Makefile4
-rw-r--r--editors/textedit/Makefile4
-rw-r--r--emulators/atari800/Makefile4
-rw-r--r--emulators/bsvc/Makefile4
-rw-r--r--emulators/frodo/Makefile4
-rw-r--r--emulators/hfsutils/Makefile4
-rw-r--r--emulators/tkhfs/Makefile5
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--finance/cbb/Makefile6
-rw-r--r--ftp/ftptool/Makefile4
-rw-r--r--ftp/moxftp/Makefile4
-rw-r--r--games/3dc/Makefile4
-rw-r--r--games/blackjack/Makefile6
-rw-r--r--games/bogged/Makefile4
-rw-r--r--games/dontspace/Makefile4
-rw-r--r--games/imaze/Makefile4
-rw-r--r--games/kdegames11/Makefile6
-rw-r--r--games/kdegames2/Makefile6
-rw-r--r--games/kdegames3/Makefile6
-rw-r--r--games/kdegames4/Makefile6
-rw-r--r--games/klondike/Makefile4
-rw-r--r--games/ktamaga/Makefile6
-rw-r--r--games/nethack-qt/Makefile4
-rw-r--r--games/nethack33-qt/Makefile4
-rw-r--r--games/nethack34-qt/Makefile4
-rw-r--r--games/pp/Makefile6
-rw-r--r--games/tksol/Makefile4
-rw-r--r--games/tvp/Makefile4
-rw-r--r--games/xchain/Makefile4
-rw-r--r--games/xjumpjump/Makefile4
-rw-r--r--games/xlines/Makefile6
-rw-r--r--games/xmastermind/Makefile4
-rw-r--r--games/xmine/Makefile4
-rw-r--r--games/xothello/Makefile4
-rw-r--r--games/xvmahjongg/Makefile6
-rw-r--r--games/xvmines/Makefile6
-rw-r--r--graphics/aero/Makefile4
-rw-r--r--graphics/cqcam/Makefile4
-rw-r--r--graphics/fxtv/Makefile4
-rw-r--r--graphics/geomview/Makefile6
-rw-r--r--graphics/gimp-app-devel/Makefile4
-rw-r--r--graphics/gimp-app/Makefile4
-rw-r--r--graphics/gimp-devel/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gimp1/Makefile4
-rw-r--r--graphics/gimpshop/Makefile4
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/gtkdps/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib2-tmp/Makefile4
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/kdegraphics11/Makefile6
-rw-r--r--graphics/kdegraphics2/Makefile6
-rw-r--r--graphics/kdegraphics3/Makefile6
-rw-r--r--graphics/kdegraphics4/Makefile6
-rw-r--r--graphics/sane-backends/Makefile4
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/sane/Makefile4
-rw-r--r--graphics/xfig-devel/Makefile4
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xfpovray/Makefile4
-rw-r--r--irc/tkirc/Makefile4
-rw-r--r--irc/yagirc/Makefile4
-rw-r--r--irc/zircon/Makefile6
-rw-r--r--lang/expect/Makefile4
-rw-r--r--lang/python+ipv6/Makefile4
-rw-r--r--lang/python-devel/Makefile4
-rw-r--r--lang/python/Makefile4
-rw-r--r--lang/python15/Makefile4
-rw-r--r--lang/python20/Makefile4
-rw-r--r--lang/python21/Makefile4
-rw-r--r--lang/python22/Makefile4
-rw-r--r--lang/python23/Makefile4
-rw-r--r--lang/python24/Makefile4
-rw-r--r--lang/python25/Makefile4
-rw-r--r--lang/python26/Makefile4
-rw-r--r--lang/python27/Makefile4
-rw-r--r--lang/python30/Makefile4
-rw-r--r--lang/python31/Makefile4
-rw-r--r--lang/python32/Makefile4
-rw-r--r--lang/tclX/Makefile10
-rw-r--r--lang/tclX80/Makefile10
-rw-r--r--lang/tclX82/Makefile10
-rw-r--r--mail/exmh2/Makefile4
-rw-r--r--mail/kbiff/Makefile6
-rw-r--r--mail/tkrat/Makefile4
-rw-r--r--mail/tkrat2/Makefile4
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--math/apc/Makefile4
-rw-r--r--math/kcalc/Makefile6
-rw-r--r--math/xgfe/Makefile4
-rw-r--r--math/xldlas/Makefile4
-rw-r--r--math/xmgr/Makefile4
-rw-r--r--mbone/imm/Makefile4
-rw-r--r--mbone/nte/Makefile4
-rw-r--r--mbone/rtpmon/Makefile4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--mbone/vat/Makefile4
-rw-r--r--mbone/vic/Makefile4
-rw-r--r--misc/dotfile/Makefile6
-rw-r--r--misc/ewipe/Makefile4
-rw-r--r--misc/kdeutils11/Makefile6
-rw-r--r--misc/kdeutils2/Makefile6
-rw-r--r--misc/kdeutils3/Makefile6
-rw-r--r--misc/kdeutils4/Makefile6
-rw-r--r--misc/kp/Makefile4
-rw-r--r--misc/kwatch/Makefile6
-rw-r--r--misc/tkcron/Makefile4
-rw-r--r--misc/tkinfo/Makefile4
-rw-r--r--misc/tkman/Makefile4
-rw-r--r--multimedia/fxtv/Makefile4
-rw-r--r--multimedia/kdemultimedia3/Makefile6
-rw-r--r--multimedia/kdemultimedia4/Makefile6
-rw-r--r--multimedia/vic/Makefile4
-rw-r--r--net-im/licq/Makefile4
-rw-r--r--net-mgmt/irrtoolset/Makefile4
-rw-r--r--net-mgmt/scotty3/Makefile4
-rw-r--r--net/cnet/Makefile4
-rw-r--r--net/imm/Makefile4
-rw-r--r--net/irrtoolset/Makefile4
-rw-r--r--net/kdenetwork11/Makefile6
-rw-r--r--net/kdenetwork2/Makefile6
-rw-r--r--net/kdenetwork3/Makefile6
-rw-r--r--net/kdenetwork4/Makefile6
-rw-r--r--net/ksamba/Makefile6
-rw-r--r--net/licq-devel/Makefile4
-rw-r--r--net/licq/Makefile4
-rw-r--r--net/pppload/Makefile6
-rw-r--r--net/ratoolset/Makefile4
-rw-r--r--net/scotty/Makefile4
-rw-r--r--net/scotty3/Makefile4
-rw-r--r--net/sdr/Makefile4
-rw-r--r--net/ttt/Makefile8
-rw-r--r--news/xvnews/Makefile4
-rw-r--r--palm/kpilot/Makefile6
-rw-r--r--palm/pilot-link-devel/Makefile4
-rw-r--r--palm/pilot-link/Makefile4
-rw-r--r--ports-mgmt/pib/Makefile4
-rw-r--r--print/bibcard/Makefile4
-rw-r--r--print/gp/Makefile4
-rw-r--r--print/gv/Makefile4
-rw-r--r--print/klyx/Makefile6
-rw-r--r--print/lyx-devel/Makefile4
-rw-r--r--print/lyx/Makefile4
-rw-r--r--print/lyx14/Makefile4
-rw-r--r--print/lyx15/Makefile4
-rw-r--r--print/lyx16/Makefile4
-rw-r--r--security/kgpg-kde4/Makefile6
-rw-r--r--security/kwallet/Makefile6
-rw-r--r--security/skip/Makefile8
-rw-r--r--sysutils/cd-write/Makefile4
-rw-r--r--sysutils/contool/Makefile4
-rw-r--r--sysutils/kdf/Makefile6
-rw-r--r--sysutils/kfloppy/Makefile6
-rw-r--r--sysutils/pib/Makefile4
-rw-r--r--sysutils/sweeper/Makefile6
-rw-r--r--sysutils/xlogmaster/Makefile4
-rw-r--r--sysutils/xwatch/Makefile4
-rw-r--r--www/grail/Makefile4
-rw-r--r--x11-fm/dfm/Makefile4
-rw-r--r--x11-fm/filerunner/Makefile4
-rw-r--r--x11-fm/tkdesk/Makefile4
-rw-r--r--x11-fm/workplace/Makefile4
-rw-r--r--x11-fm/x-files/Makefile4
-rw-r--r--x11-fonts/tkfont/Makefile4
-rw-r--r--x11-toolkits/blt/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk/Makefile4
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile4
-rw-r--r--x11-toolkits/p5-TclTk/Makefile4
-rw-r--r--x11-toolkits/p5-Tk/Makefile4
-rw-r--r--x11-toolkits/py-gnome/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/Makefile4
-rw-r--r--x11-toolkits/py-gtk/Makefile4
-rw-r--r--x11-toolkits/py-gtk2/Makefile4
-rw-r--r--x11-toolkits/slingshot/Makefile4
-rw-r--r--x11-toolkits/tix/Makefile4
-rw-r--r--x11-toolkits/tk82/Makefile8
-rw-r--r--x11-toolkits/tk83/Makefile8
-rw-r--r--x11-toolkits/tk84/Makefile8
-rw-r--r--x11-toolkits/tkstep80/Makefile8
-rw-r--r--x11-wm/e16/Makefile4
-rw-r--r--x11-wm/enlightenment-devel/Makefile4
-rw-r--r--x11-wm/enlightenment/Makefile4
-rw-r--r--x11-wm/olvwm/Makefile4
-rw-r--r--x11-wm/xfce/Makefile4
-rw-r--r--x11-wm/xfce4/Makefile4
-rw-r--r--x11/kde4-baseapps/Makefile6
-rw-r--r--x11/kde4-runtime/Makefile6
-rw-r--r--x11/kde4-workspace/Makefile6
-rw-r--r--x11/kdebase11/Makefile6
-rw-r--r--x11/kdebase2/Makefile6
-rw-r--r--x11/kdebase3/Makefile6
-rw-r--r--x11/kdebase4-runtime/Makefile6
-rw-r--r--x11/kdebase4-workspace/Makefile6
-rw-r--r--x11/kdebase4/Makefile6
-rw-r--r--x11/kdelibs11/Makefile6
-rw-r--r--x11/kdelibs2/Makefile6
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/kdelibs4/Makefile6
-rw-r--r--x11/kworldwatch/Makefile6
-rw-r--r--x11/libsx/Makefile4
-rw-r--r--x11/props/Makefile4
-rw-r--r--x11/tkgoodstuff/Makefile4
-rw-r--r--x11/tycoon/Makefile4
241 files changed, 572 insertions, 571 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/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
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index 9aa562db8f2a..1202f75b370b 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -3,7 +3,7 @@
# Date created: Dec 5 1997
# Whom: frankch@waru.life.nthu.edu.tw
#
-# $Id: Makefile,v 1.4 1998/07/27 23:24:01 asami Exp $
+# $Id: Makefile,v 1.5 1998/08/05 09:30:44 asami Exp $
#
DISTNAME= seaview
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tar
MAINTAINER= frankch@waru.life.nthu.edu.tw
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= YES
NO_WRKSUBDIR= YES
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index e48289770678..9ab00d6c430c 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -3,7 +3,7 @@
# Date created: Sun Jun 8 11:51:21 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.4 1997/10/09 21:04:47 andreas Exp $
+# $Id: Makefile,v 1.5 1998/02/21 22:38:07 fenner Exp $
#
DISTNAME= tkhylafax-3.0b2
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
MAINTAINER= andreas@FreeBSD.ORG
-RUN_DEPENDS= wish4.2:${PORTSDIR}/x11/tk42 \
+RUN_DEPENDS= wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
sendfax:${PORTSDIR}/comms/hylafax \
gs:${PORTSDIR}/print/ghostscript4 \
gv:${PORTSDIR}/print/gv
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 6013c4b80fba..b18eee7c8a69 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.8 1998/07/19 17:41:45 se Exp $
+# $Id: Makefile,v 1.9 1998/07/23 20:51:58 se Exp $
#
DISTNAME= kdesupport-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
HAS_CONFIGURE= yes
CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 6013c4b80fba..b18eee7c8a69 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.8 1998/07/19 17:41:45 se Exp $
+# $Id: Makefile,v 1.9 1998/07/23 20:51:58 se Exp $
#
DISTNAME= kdesupport-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
HAS_CONFIGURE= yes
CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index ef692327097a..e3cae616477c 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -3,7 +3,7 @@
# Date Created: 9 Feb 1997
# Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
#
-# $Id: Makefile,v 1.12 1998/03/20 14:35:27 tg Exp $
+# $Id: Makefile,v 1.13 1998/06/14 17:50:49 hoek Exp $
#
DISTNAME= uudeview-0.5.13
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
MAINTAINER= hoek@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 \
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80 \
uu\\.1\\.:${PORTSDIR}/converters/uulib
GNU_CONFIGURE= yes
diff --git a/databases/tkgnats/Makefile b/databases/tkgnats/Makefile
index 5dcd9f782853..b5037a979d21 100644
--- a/databases/tkgnats/Makefile
+++ b/databases/tkgnats/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 18 Apr 1998 10:12:20 CEST
# Whom: andreas
#
-# $Id: Makefile,v 1.1.1.1 1998/04/18 08:58:00 andreas Exp $
+# $Id: Makefile,v 1.2 1998/04/18 09:03:44 andreas Exp $
#
DISTNAME= tkgnats-3.0.3
@@ -13,6 +13,6 @@ MASTER_SITES= http://www.cuug.ab.ca/~macdonal/tkgnats/
MAINTAINER= andreas@FreeBSD.ORG
BUILD_DEPENDS= nedit-pr:${PORTSDIR}/databases/gnats
-LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81
+LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11-toolkits/tk81
.include <bsd.port.mk>
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index dd97e6b2ea60..f038b218dae2 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Sep 2 15:46:09 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.4 1998/03/02 19:28:17 andreas Exp $
+# $Id: Makefile,v 1.5 1998/08/05 09:30:47 asami Exp $
#
DISTNAME= xmysql-1.8
@@ -17,7 +17,7 @@ MAINTAINER= andreas@FreeBSD.ORG
BUILD_DEPENDS= mysql:${PORTSDIR}/databases/mysql
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- xforms\\.0\\.:${PORTSDIR}/x11/xforms
+ xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 59c100e392d0..b6c3558b14c6 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -3,7 +3,7 @@
# Date created: Di 2 Sep 1997 16:29:27 CEST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.5 1998/03/02 18:42:21 andreas Exp $
+# $Id: Makefile,v 1.6 1998/08/05 09:30:47 asami Exp $
#
DISTNAME= xmysqladmin-0.4.4
@@ -17,7 +17,7 @@ MAINTAINER= andreas@FreeBSD.ORG
BUILD_DEPENDS= mysql:${PORTSDIR}/databases/mysql
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- xforms\\.0\\.:${PORTSDIR}/x11/xforms
+ xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/xmysqladmin
USE_X_PREFIX= yes
diff --git a/deskutils/cbb/Makefile b/deskutils/cbb/Makefile
index 0f221a5df90a..2eaa144e6a61 100644
--- a/deskutils/cbb/Makefile
+++ b/deskutils/cbb/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 September, 1997
# Whom: kline
#
-# $Id: Makefile,v 1.3 1998/02/21 22:37:53 fenner Exp $
+# $Id: Makefile,v 1.4 1998/08/07 22:17:52 asami Exp $
#
DISTNAME= cbb-0.73
@@ -14,9 +14,9 @@ MASTER_SITES= ftp://ftp.me.umn.edu/pub/finance/ \
MAINTAINER= kline@thought.org
# extern.conf could easily be patched to use `plan' over `ical'
-RUN_DEPENDS= wish4.2:${PORTSDIR}/x11/tk42 \
+RUN_DEPENDS= wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
ical:${PORTSDIR}/misc/ical
-LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11/tk42
+LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11-toolkits/tk42
NO_BUILD= yes
USE_PERL5= yes
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 24cda2bc05b9..54cffad21118 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Aug 28 13:35:31 CDT 1995
# Whom: erich@rrnet.com
#
-# $Id: Makefile,v 1.18 1998/03/20 09:59:49 tg Exp $
+# $Id: Makefile,v 1.19 1998/08/07 22:17:52 asami Exp $
#
DISTNAME= ical-2.2
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/
MAINTAINER= erich@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile
index 46cceec0db21..f8c723648512 100644
--- a/deskutils/korganizer/Makefile
+++ b/deskutils/korganizer/Makefile
@@ -3,7 +3,7 @@
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
-# $Id: Makefile,v 1.2 1998/05/25 21:03:02 fenner Exp $
+# $Id: Makefile,v 1.3 1998/08/07 22:17:52 asami Exp $
#
DISTNAME= korganizer-0.9
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= unstable/apps/office
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 \
gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/deskutils/kproject/Makefile b/deskutils/kproject/Makefile
index e17ea22152d4..c7ec96cdf15b 100644
--- a/deskutils/kproject/Makefile
+++ b/deskutils/kproject/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/05/26 08:07:53 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/07 22:17:52 asami Exp $
#
DISTNAME= kproject-0.1
@@ -14,9 +14,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= hanspb@persbraten.vgs.no
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt \
libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS= qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+LIB_DEPENDS= qt\\.1\\.3[1-9]:${PORTSDIR}/x11-toolkits/qt \
kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index fb792dadd503..3693da8bf432 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -3,7 +3,7 @@
# Date created: 03 Aug 1996
# Whom: shanee@rabbit.augusta.de
#
-# $Id: Makefile,v 1.11 1998/03/20 14:35:30 tg Exp $
+# $Id: Makefile,v 1.12 1998/08/07 22:17:55 asami Exp $
#
DISTNAME= zorro-1.1p8
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
NO_BUILD= yes
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 455b5af77258..48053a3ad053 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -3,7 +3,7 @@
# Date created: Fri Oct 3 18:50:53 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.5 1998/03/20 14:35:10 tg Exp $
+# $Id: Makefile,v 1.6 1998/07/03 23:06:27 steve Exp $
#
DISTNAME= SpecTcl1.1
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/guitools/
MAINTAINER= andreas@FreeBSD.ORG
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
NO_BUILD= yes
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 3c43d00a8d80..51948a99e4ff 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -3,7 +3,7 @@
# Date created: 29 Jul 1998
# Whom: rom
#
-# $Id: Makefile,v 1.1.1.1 1998/07/31 21:02:41 jkh Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:30:47 asami Exp $
#
DISTNAME= gIDE-0.0.4
@@ -12,7 +12,7 @@ MASTER_SITES= http://gide.pn.org/
MAINTAINER= rom_glsa@ein-hashofet.co.il
-LIB_DEPENDS= gtk\\.1\\.4:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.4:${PORTSDIR}/x11-toolkits/gtk
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index cbe4fd66a186..081990cb32ee 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -3,7 +3,7 @@
# Date created: 29 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
-# $Id: Makefile,v 1.4 1998/07/30 05:33:15 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/08/05 09:30:48 asami Exp $
#
DISTNAME= glade-0.3
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.comp.lancs.ac.uk/~damon/builder/
MAINTAINER= dom@myrddin.demon.co.uk
-LIB_DEPENDS= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index cbe4fd66a186..081990cb32ee 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -3,7 +3,7 @@
# Date created: 29 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
-# $Id: Makefile,v 1.4 1998/07/30 05:33:15 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/08/05 09:30:48 asami Exp $
#
DISTNAME= glade-0.3
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.comp.lancs.ac.uk/~damon/builder/
MAINTAINER= dom@myrddin.demon.co.uk
-LIB_DEPENDS= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 1fbc076bb838..6b8e073a1a4c 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -3,7 +3,7 @@
# Date created: 31 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/04 20:41:51 steve Exp $
#
DISTNAME= mico-2.0.6
@@ -12,8 +12,8 @@ MASTER_SITES= http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
MAINTAINER= Nakai@technologist.com
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS= gtk\\.1\\.0:${PORTSDIR}/x11/gtk
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS= gtk\\.1\\.0:${PORTSDIR}/x11-toolkits/gtk
WRKSRC= ${WRKDIR}/mico
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index 47837eaa658c..0241d4719d9e 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 May 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.6 1998/07/02 05:56:47 tg Exp $
+# $Id: Makefile,v 1.7 1998/08/05 09:30:48 asami Exp $
#
DISTNAME= QTEZ-v0.62a
@@ -15,8 +15,8 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= andy@icc.surw.chel.su
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS= qt\\.1\\.:${PORTSDIR}/x11/qt
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS= qt\\.1\\.:${PORTSDIR}/x11-toolkits/qt
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 09db66aa7883..063527e52fb4 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -3,7 +3,7 @@
# Date created: 02 Aug 1996
# Whom: shanee@augusta.de
#
-# $Id: Makefile,v 1.11 1997/10/31 08:30:45 tg Exp $
+# $Id: Makefile,v 1.13 1998/03/20 14:35:16 tg Exp $
#
DISTNAME= tkcvs-6.0
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
NO_BUILD= yes
MAN1= tkcvs.1 tkdiff.1
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index 9235f4584e82..14292c81747a 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -3,7 +3,7 @@
# Date created: 3 August 1997
# Whom: Bruce Gingery <bgingery@gtcs.com>
#
-# $Id: Makefile,v 1.6 1998/06/27 05:18:53 asami Exp $
+# $Id: Makefile,v 1.7 1998/07/27 23:24:09 asami Exp $
#
DISTNAME= tkref-1.01
@@ -13,7 +13,7 @@ MASTER_SITES= http://gtcs.com/softdist/ \
MAINTAINER= bgingery@gtcs.com
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
NO_BUILD= yes
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index ddf5a7398e83..4d835dc12969 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -3,7 +3,7 @@
# Date Created: 29 May 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.8 1998/03/20 14:35:24 tg Exp $
+# $Id: Makefile,v 1.9 1998/07/27 23:24:12 asami Exp $
#
DISTNAME= vt-1.11
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.neuron.com/stewart/vtcl/dload/ \
MAINTAINER= vanilla@FreeBSD.ORG
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/vtcl
NO_BUILD= yes
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index 37bebe2ccd6a..48028e5f83d0 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -3,7 +3,7 @@
# Date created: 01 Jul 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
-# $Id: Makefile,v 1.8 1998/07/31 15:39:37 jseger Exp $
+# $Id: Makefile,v 1.9 1998/08/05 09:30:49 asami Exp $
#
DISTNAME= GXedit1.07
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tar
MAINTAINER= dom@myrddin.demon.co.uk
-LIB_DEPENDS= gtk\\.1\\.4:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.4:${PORTSDIR}/x11-toolkits/gtk
EXTRACT_BEFORE_ARGS= -xf
USE_X_PREFIX= yes
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index 0e088ca8dae7..93f43d5a3ca6 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -3,7 +3,7 @@
# Date created: 3 January 1998
# Whom: jraynard
#
-# $Id: Makefile,v 1.2 1998/01/06 06:22:37 asami Exp $
+# $Id: Makefile,v 1.3 1998/02/18 04:18:45 asami Exp $
#
DISTNAME= textedit-1.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.freebsd.org/~jraynard/ports/distfiles/
MAINTAINER= jraynard@@freebsd.org
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
WRKSRC= ${WRKDIR}/textedit
USE_IMAKE= yes
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 05897cd10518..fe2f8c16cc32 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -3,7 +3,7 @@
# Date created: 29th April, 1997
# Whom: Joel Sutton <sutton@aardvark.apana.org.au>
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/10/29 09:07:08 tg Exp $
#
DISTNAME= Atari800-0.8.1
@@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
MAINTAINER= sutton@aardvark.apana.org.au
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= xview:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview:${PORTSDIR}/x11-toolkits/xview-lib
RESTRICTED= "xf25 contains copyright ROMs and cannot be distributed"
NO_PACKAGE= ${RESTRICTED}
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index d9d42d935443..9055a71b9472 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -3,7 +3,7 @@
# Date created: 03-Mar-1997
# Whom: tenser
#
-# $Id: Makefile,v 1.5 1998/04/04 13:14:19 jseger Exp $
+# $Id: Makefile,v 1.6 1998/04/05 07:30:56 asami Exp $
#
DISTNAME= bsvc-2.0
@@ -14,7 +14,7 @@ EXTRACT_SUFX= -src.tar.z
MAINTAINER= tenser@spitfire.ecsel.psu.edu
-RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41
+RUN_DEPENDS= wish4.1:${PORTSDIR}/x11-toolkits/tk41
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 894e459d3c57..1e26a13e21ce 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 Dez 1997
# Whom: dirk.meyer@dinoex.sub.org
#
-# $Id: Makefile,v 1.2 1998/02/22 08:34:59 fenner Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:30:49 asami Exp $
DISTNAME= FrodoV4_1a.Src
PKGNAME= frodo-4.1
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://sunsite.unc.edu/pub/micro/commodore/crossplatform/emulators/
MAINTAINER= dirk.meyer@dinoex.sub.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
USE_X_PREFIX= YES
ALL_TARGET= Frodo
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 74a3bedd2e7a..9fc8412553f6 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -3,7 +3,7 @@
# Date Created: 7 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.8 1998/03/21 06:47:32 vanilla Exp $
+# $Id: Makefile,v 1.9 1998/03/21 19:19:42 vanilla Exp $
#
DISTNAME= hfsutils-3.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.mars.org/pub/hfs/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81
+LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11-toolkits/tk81
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl --with-tcl-libs=${PREFIX}/lib --with-tk --with-tk-libs=${PREFIX}/lib
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 02d9cf601b97..ebb66c731d8d 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -3,7 +3,7 @@
# Date created: 17 November 1994
# Whom: jmz
#
-# $Id: Makefile,v 1.15 1997/04/20 13:19:02 wosch Exp $
+# $Id: Makefile,v 1.16 1998/07/27 23:24:18 asami Exp $
#
DISTNAME= tkhfs
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.obs-besancon.fr/pub/outgoing/
MAINTAINER= jmz@FreeBSD.org
-RUN_DEPENDS= hfs:${PORTSDIR}/emulators/hfs wish4.1:${PORTSDIR}/x11/tk41
+RUN_DEPENDS= hfs:${PORTSDIR}/emulators/hfs \
+ wish4.1:${PORTSDIR}/x11-toolkits/tk41
.include <bsd.port.mk>
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index ea55cb5d3a53..36ac1a1444a7 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -3,7 +3,7 @@
# Date created: Mar 28, 1998
# Whom: dchapes@ddm.on.ca
#
-# $Id: Makefile,v 1.4 1998/07/13 20:02:39 dburr Exp $
+# $Id: Makefile,v 1.5 1998/07/19 19:32:02 dburr Exp $
DISTNAME= vice-0.14.1
CATEGORIES= emulators
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
MAINTAINER= dchapes@ddm.on.ca
-LIB_DEPENDS= Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
+LIB_DEPENDS= Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
WRKSRC= ${WRKDIR}/vice-0.14.1/src
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index 0f221a5df90a..2eaa144e6a61 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 September, 1997
# Whom: kline
#
-# $Id: Makefile,v 1.3 1998/02/21 22:37:53 fenner Exp $
+# $Id: Makefile,v 1.4 1998/08/07 22:17:52 asami Exp $
#
DISTNAME= cbb-0.73
@@ -14,9 +14,9 @@ MASTER_SITES= ftp://ftp.me.umn.edu/pub/finance/ \
MAINTAINER= kline@thought.org
# extern.conf could easily be patched to use `plan' over `ical'
-RUN_DEPENDS= wish4.2:${PORTSDIR}/x11/tk42 \
+RUN_DEPENDS= wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
ical:${PORTSDIR}/misc/ical
-LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11/tk42
+LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11-toolkits/tk42
NO_BUILD= yes
USE_PERL5= yes
diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile
index 5b8352502bc7..2767b42c18d5 100644
--- a/ftp/ftptool/Makefile
+++ b/ftp/ftptool/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 March 1996
# Whom: janek@gaja.ipan.lublin.pl
#
-# $Id: Makefile,v 1.2 1996/11/18 09:54:30 asami Exp $
+# $Id: Makefile,v 1.3 1996/12/01 01:22:47 obrien Exp $
#
DISTNAME= ftptool-4.6
@@ -14,7 +14,7 @@ DISTFILES= Ftptool4.6.tar.gz
MAINTAINER= janek@gaja.ipan.lublin.pl
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/Ftptool4.6
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 243a58dc9175..e6d26d69d033 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 December 1994
# Whom: janek
#
-# $Id: Makefile,v 1.14 1997/10/30 00:59:20 asami Exp $
+# $Id: Makefile,v 1.15 1998/08/05 09:31:35 asami Exp $
#
DISTNAME= moxftp-2.2
@@ -32,7 +32,7 @@ PROGRAM_NAME=xftp
RESOURCE_NAME=Xftp
.endif
-#LIB_DEPENDS= Xaw3d\\.6:${PORTSDIR}/x11/Xaw3d
+#LIB_DEPENDS= Xaw3d\\.6:${PORTSDIR}/x11-toolkits/Xaw3d
.if !defined (NOMANCOMPRESS)
GZIP_EXT=.gz
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index a2ae1a55b859..488c623c8ff9 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 May 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/07/27 23:24:25 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:30:51 asami Exp $
#
DISTNAME= 3Dc-0.8.1
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= andy@icc.surw.chel.su
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
+ Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/3Dc
diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index 1301b78656e6..c6a5b700d013 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -3,7 +3,7 @@
# Date created: 23 February 1998
# Whom: Peter Mutsaers
#
-# $Id: Makefile,v 1.2 1998/04/22 22:55:26 mph Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:24:37 asami Exp $
#
DISTNAME= blackjack-1.1
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= plm@xs4all.nl
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11-toolkits/qt
WRKSRC= ${WRKDIR}/blackjack
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index cd6e648807cc..9087e0f8b6b3 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 May 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.1.1.1 1998/07/12 23:53:06 steve Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:30:52 asami Exp $
#
DISTNAME= bogged-1.0.0
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .gz
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile
index 753fc947bc57..bbf52a3221da 100644
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@@ -3,7 +3,7 @@
# Date created: 26-Apr-97
# Whom: johnh@isi.edu
#
-# $Id: Makefile,v 1.3 1997/05/09 23:38:42 asami Exp $
+# $Id: Makefile,v 1.4 1998/02/21 22:37:55 fenner Exp $
#
DISTNAME= dontspace-1.2
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
MAINTAINER= johnh@isi.edu
-RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41
+RUN_DEPENDS= wish4.1:${PORTSDIR}/x11-toolkits/tk41
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index d8342aa4177f..20d33ac0e889 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -3,7 +3,7 @@
# Date created: 27. April 1996
# Whom: Ronald Kuehn <kuehn@rz.tu-clausthal.de>
#
-# $Id: Makefile,v 1.8 1996/12/19 05:10:13 asami Exp $
+# $Id: Makefile,v 1.9 1998/08/05 09:30:56 asami Exp $
#
DISTNAME= imaze
@@ -18,7 +18,7 @@ MAINTAINER= kuehn@rz.tu-clausthal.de
.if defined(HAVE_MOTIF) && !defined(PACKAGE_BUILDING)
MAKE_ENV+= FORCE_MOTIF=yes
.else
-LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11-toolkits/xview-lib
.endif
EXTRACT_ONLY= imaze1.3.tar.Z
diff --git a/games/kdegames11/Makefile b/games/kdegames11/Makefile
index 75e13e1cf5bb..9da38c9d2ad0 100644
--- a/games/kdegames11/Makefile
+++ b/games/kdegames11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/19 17:44:07 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:51:58 se Exp $
#
DISTNAME= kdegames-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/games/kdegames2/Makefile b/games/kdegames2/Makefile
index 75e13e1cf5bb..9da38c9d2ad0 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/19 17:44:07 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:51:58 se Exp $
#
DISTNAME= kdegames-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/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 75e13e1cf5bb..9da38c9d2ad0 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/19 17:44:07 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:51:58 se Exp $
#
DISTNAME= kdegames-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/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 75e13e1cf5bb..9da38c9d2ad0 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/19 17:44:07 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:51:58 se Exp $
#
DISTNAME= kdegames-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/games/klondike/Makefile b/games/klondike/Makefile
index 461f4e23b9f2..69f963fb4720 100644
--- a/games/klondike/Makefile
+++ b/games/klondike/Makefile
@@ -3,7 +3,7 @@
# Date created: 26-Apr-97
# Whom: johnh@isi.edu
#
-# $Id: Makefile,v 1.4 1997/05/09 23:42:43 asami Exp $
+# $Id: Makefile,v 1.5 1998/02/21 22:38:01 fenner Exp $
#
DISTNAME= klondike-1.8
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
MAINTAINER= johnh@isi.edu
-RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41
+RUN_DEPENDS= wish4.1:${PORTSDIR}/x11-toolkits/tk41
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
diff --git a/games/ktamaga/Makefile b/games/ktamaga/Makefile
index 9c162520e442..077cf285037f 100644
--- a/games/ktamaga/Makefile
+++ b/games/ktamaga/Makefile
@@ -3,7 +3,7 @@
# Date created: 13 November 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.3 1997/12/27 09:38:12 vanilla Exp $
+# $Id: Makefile,v 1.4 1998/04/29 17:51:20 asami Exp $
#
DISTNAME= ktamaga-0.2
@@ -13,8 +13,8 @@ MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/unstable/apps/games/ \
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11-toolkits/qt \
kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs
BROKEN= upgrade
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index b39ba1a6a7af..aa7dbd535018 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -3,7 +3,7 @@
# Date created: So 6 Apr 1997 04:25:57 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.13 1998/07/20 17:37:13 andreas Exp $
+# $Id: Makefile,v 1.14 1998/07/27 23:24:44 asami Exp $
#
DISTNAME= nethack-3.2.2
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.ORG
BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \
xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= qt\\.1\\.40:${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.40:${PORTSDIR}/x11-toolkits/qt140 \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index b39ba1a6a7af..aa7dbd535018 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -3,7 +3,7 @@
# Date created: So 6 Apr 1997 04:25:57 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.13 1998/07/20 17:37:13 andreas Exp $
+# $Id: Makefile,v 1.14 1998/07/27 23:24:44 asami Exp $
#
DISTNAME= nethack-3.2.2
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.ORG
BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \
xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= qt\\.1\\.40:${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.40:${PORTSDIR}/x11-toolkits/qt140 \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index b39ba1a6a7af..aa7dbd535018 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -3,7 +3,7 @@
# Date created: So 6 Apr 1997 04:25:57 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.13 1998/07/20 17:37:13 andreas Exp $
+# $Id: Makefile,v 1.14 1998/07/27 23:24:44 asami Exp $
#
DISTNAME= nethack-3.2.2
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.ORG
BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \
xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= qt\\.1\\.40:${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.40:${PORTSDIR}/x11-toolkits/qt140 \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas
diff --git a/games/pp/Makefile b/games/pp/Makefile
index f6e4a0adedd6..cc0f3c5666ce 100644
--- a/games/pp/Makefile
+++ b/games/pp/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 May 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.1.1.1 1998/08/01 05:00:13 nectar Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:30:57 asami Exp $
#
DISTNAME= pp-0.01
@@ -14,8 +14,8 @@ DISTFILES= ppinst-0.01.tar.gz ppsrc-0.01.tar.gz
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= qt\\.1\\.:${PORTSDIR}/x11/qt
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS= qt\\.1\\.:${PORTSDIR}/x11-toolkits/qt
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/ppsrc
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index a25e0c102944..9ca9d8d8ac89 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -3,7 +3,7 @@
# Date created: 26 June 1995
# Whom: thomas@ghpc8.ihf.rwth-aachen.de
#
-# $Id: Makefile,v 1.9 1997/11/22 20:48:34 jseger Exp $
+# $Id: Makefile,v 1.11 1998/03/20 14:35:22 tg Exp $
#
DISTNAME= tksol-1.0
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= tg@freebsd.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
PATCH_STRIP= -p1
WRKSRC= ${WRKDIR}/release
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index 057b1277fb53..5becb762883f 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -3,7 +3,7 @@
# Date Created: 3 Jul 1996
# Whom: Tim Vanderhoek <ac199@hwcn.org>
#
-# $Id: Makefile,v 1.3 1997/12/24 01:21:44 alex Exp $
+# $Id: Makefile,v 1.4 1998/07/15 16:00:52 hoek Exp $
#
DISTNAME= tvp-0.9.7.1
@@ -15,7 +15,7 @@ MAINTAINER= hoek@FreeBSD.ORG
# If you comment this out, the port should automatically use whichever
# version of tk you have installed, or, lacking all versions, it will
# build only the ANSI and terminal interfaces (not the nice X interface).
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-tcl-dir=${PREFIX}/lib \
diff --git a/games/xchain/Makefile b/games/xchain/Makefile
index 33ed41bf2015..a9c1435c47d1 100644
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@@ -3,7 +3,7 @@
# Date created: 13 March 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/07/27 23:24:51 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:30:58 asami Exp $
#
DISTNAME= xchain_1.0-2
@@ -13,7 +13,7 @@ MASTER_SITES= http://thor.cam.ac.uk/~ac212/xchain/
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/xchain-1.0
diff --git a/games/xjumpjump/Makefile b/games/xjumpjump/Makefile
index 66f475a7cfe0..e9df71f1560f 100644
--- a/games/xjumpjump/Makefile
+++ b/games/xjumpjump/Makefile
@@ -3,7 +3,7 @@
# Date created: 9 April 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/07/27 23:24:57 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:30:59 asami Exp $
#
DISTNAME= xjumpjump
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 1f83e4ff4f5c..8b696875936e 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 February 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.3 1998/07/27 23:25:03 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:30:59 asami Exp $
#
DISTNAME= xlines
@@ -13,8 +13,8 @@ MASTER_SITES= ftp://risq.belcaf.minsk.by/pub/genie/
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= qt\\.1\\.:${PORTSDIR}/x11/qt
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS= qt\\.1\\.:${PORTSDIR}/x11-toolkits/qt
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index c5fa408f404b..70ccc6c9dd8d 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -3,7 +3,7 @@
# Date created: 23 March 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/07/27 23:25:04 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:30:59 asami Exp $
#
DISTNAME= xmastermind-0.1
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 4ca81fd7253c..537811ec50a3 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -3,7 +3,7 @@
# Date created: 25 December 1994
# Whom: joerg
#
-# $Id: Makefile,v 1.12 1997/01/03 11:33:16 obrien Exp $
+# $Id: Makefile,v 1.13 1997/04/30 03:18:00 asami Exp $
#
DISTNAME= xmine-1.0.3-Xaw
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= joerg@FreeBSD.org
-LIB_DEPENDS= Xaw3d\\.:${PORTSDIR}/x11/Xaw3d
+LIB_DEPENDS= Xaw3d\\.:${PORTSDIR}/x11-toolkits/Xaw3d
USE_IMAKE= yes
MAN6= xmine.6
diff --git a/games/xothello/Makefile b/games/xothello/Makefile
index 50e945d324ab..c98c0e5749e6 100644
--- a/games/xothello/Makefile
+++ b/games/xothello/Makefile
@@ -3,7 +3,7 @@
# Date created: 31 March 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/07/27 23:25:15 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:00 asami Exp $
#
DISTNAME= xothello
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
NO_CDROM= Possible trademark infringement
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index f847712c054b..fd5d1c13b3b5 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 March 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/07/27 23:25:33 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:03 asami Exp $
#
DISTNAME= xvmahjongg2.1
@@ -15,8 +15,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11/xview-lib \
- olgx\\.3\\.2:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11-toolkits/xview-lib \
+ olgx\\.3\\.2:${PORTSDIR}/x11-toolkits/xview-lib
ALL_TARGET= mahjongg.swap
USE_X_PREFIX= yes
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index d97c01ada5a9..fa51d56e0182 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 March 1998
# Whom: Andrey Zakhvatov
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/27 10:09:54 tg Exp $
#
DISTNAME= xvmines-1.0
@@ -15,8 +15,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11/xview-lib \
- olgx\\.3\\.2:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11-toolkits/xview-lib \
+ olgx\\.3\\.2:${PORTSDIR}/x11-toolkits/xview-lib
USE_IMAKE= yes
MAN6= xvmines.6
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index ab21ecb1c365..cee1a7742bc9 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Aug 28 13:35:31 CDT 1995
# Whom: erich@rrnet.com
#
-# $Id: Makefile,v 1.8 1998/05/11 03:16:04 steve Exp $
+# $Id: Makefile,v 1.9 1998/08/05 09:31:07 asami Exp $
#
DISTNAME= aero_1.7.0_src
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ee.uwa.edu.au/users/braunl/aero/
MAINTAINER= erich@FreeBSD.org
-BUILD_DEPENDS= ${X11BASE}/lib/libfwf.a:${PORTSDIR}/x11/FWF
+BUILD_DEPENDS= ${X11BASE}/lib/libfwf.a:${PORTSDIR}/x11-toolkits/FWF
RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 9d8a2c07220f..a0829d72c4c1 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -3,7 +3,7 @@
# Date created: 29 Oct 1997
# Whom: Kensaku Masuda <greg@greg.rim.or.jp>
#
-# $Id: Makefile,v 1.2 1998/02/21 22:37:54 fenner Exp $
+# $Id: Makefile,v 1.4 1998/03/20 14:35:11 tg Exp $
#
DISTNAME= cqcam-0.45a
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
MAN1= cqcam.1
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 7a5285ddc7a0..b3b7df72e80a 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -3,7 +3,7 @@
# Date created: Sun Sep 7 17:55:07 EDT 1997
# Whom: Randall Hopper <rhh@ct.picker.com>
#
-# $Id: Makefile,v 1.6 1998/07/06 13:26:32 dburr Exp $
+# $Id: Makefile,v 1.7 1998/08/05 09:31:08 asami Exp $
#
DISTNAME= fxtv-0.47
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rhh@ct.picker.com
LIB_DEPENDS= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
- Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d \
+ Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
# This program does not actually depend on the below, but they are pretty
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 40569f3ba7f0..b305e006a05a 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 November 1996
# Whom: fenner
#
-# $Id: Makefile,v 1.5 1998/07/20 10:13:46 asami Exp $
+# $Id: Makefile,v 1.6 1998/08/05 09:31:08 asami Exp $
DISTNAME= geomview-1.6.1
CATEGORIES= graphics tk42
@@ -13,9 +13,9 @@ DISTFILES= geomview-1.6.1-src.tar.gz
MAINTAINER= fenner@freebsd.org
-LIB_DEPENDS= xforms\\.0:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS= xforms\\.0:${PORTSDIR}/x11-toolkits/xforms \
MesaGL\\.13:${PORTSDIR}/graphics/Mesa2 \
- tk42:${PORTSDIR}/x11/tk42
+ tk42:${PORTSDIR}/x11-toolkits/tk42
WRKSRC= ${WRKDIR}/Geomview
REQUIRES_MOTIF= yes
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 18fcf86614d3..87f4b1cec17e 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
+# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 18fcf86614d3..87f4b1cec17e 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
+# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 18fcf86614d3..87f4b1cec17e 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
+# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 18fcf86614d3..87f4b1cec17e 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
+# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 18fcf86614d3..87f4b1cec17e 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
+# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 18fcf86614d3..87f4b1cec17e 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,7 +3,7 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
+# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+= gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 38d1966a272e..ea45e3296563 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -3,7 +3,7 @@
# Date created: 03 Feb 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.2 1998/02/05 09:02:54 tg Exp $
+# $Id: Makefile,v 1.3 1998/02/21 22:37:58 fenner Exp $
#
DISTNAME= graphviz_1_21
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .src.unix.tgz
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= tk42\\.1:${PORTSDIR}/x11/tk42
+LIB_DEPENDS= tk42\\.1:${PORTSDIR}/x11-toolkits/tk42
RESTRICTED= "Can't be fetched without license"
NO_PACKAGE= ${RESTRICTED}
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index c988b86fd530..89586eca4ae8 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 April 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.2 1998/07/20 18:57:55 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:09 asami Exp $
#
DISTNAME= gtkDPS-0.2.11
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/personal/masata-y/gyve/fullkit/gyve
MAINTAINER= Nakai@technologist.com
-LIB_DEPENDS= gtk\\.1:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1:${PORTSDIR}/x11-toolkits/gtk
BUILD_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 9b8b48fc0b8a..24946462aeea 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.24 1998/07/30 05:30:42 vanilla Exp $
+# $Id: Makefile,v 1.25 1998/08/05 09:31:12 asami Exp $
#
DISTNAME= imlib-1.7
@@ -18,7 +18,7 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
- gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+ gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 9b8b48fc0b8a..24946462aeea 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.24 1998/07/30 05:30:42 vanilla Exp $
+# $Id: Makefile,v 1.25 1998/08/05 09:31:12 asami Exp $
#
DISTNAME= imlib-1.7
@@ -18,7 +18,7 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
- gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+ gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 9b8b48fc0b8a..24946462aeea 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.24 1998/07/30 05:30:42 vanilla Exp $
+# $Id: Makefile,v 1.25 1998/08/05 09:31:12 asami Exp $
#
DISTNAME= imlib-1.7
@@ -18,7 +18,7 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
- gtk\\.1\\.5:${PORTSDIR}/x11/gtk
+ gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile
index 3f4699b4f390..bdbc074af922 100644
--- a/graphics/kdegraphics11/Makefile
+++ b/graphics/kdegraphics11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.8 1998/07/19 17:57:16 se Exp $
+# $Id: Makefile,v 1.9 1998/07/23 20:51:59 se Exp $
#
DISTNAME= kdegraphics-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/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 3f4699b4f390..bdbc074af922 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.8 1998/07/19 17:57:16 se Exp $
+# $Id: Makefile,v 1.9 1998/07/23 20:51:59 se Exp $
#
DISTNAME= kdegraphics-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/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 3f4699b4f390..bdbc074af922 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.8 1998/07/19 17:57:16 se Exp $
+# $Id: Makefile,v 1.9 1998/07/23 20:51:59 se Exp $
#
DISTNAME= kdegraphics-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/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 3f4699b4f390..bdbc074af922 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.8 1998/07/19 17:57:16 se Exp $
+# $Id: Makefile,v 1.9 1998/07/23 20:51:59 se Exp $
#
DISTNAME= kdegraphics-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/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 4a88461ada34..0ab33bfde01d 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -4,7 +4,7 @@
# Whom: gary@hotlava.com
# obrien@FreeBSD.org
#
-# $Id: Makefile,v 1.4 1998/05/26 08:17:56 dburr Exp $
+# $Id: Makefile,v 1.5 1998/07/12 22:31:09 steve Exp $
#
DISTNAME= sane-0.73
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \
MAINTAINER= gary@hotlava.com
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 4a88461ada34..0ab33bfde01d 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -4,7 +4,7 @@
# Whom: gary@hotlava.com
# obrien@FreeBSD.org
#
-# $Id: Makefile,v 1.4 1998/05/26 08:17:56 dburr Exp $
+# $Id: Makefile,v 1.5 1998/07/12 22:31:09 steve Exp $
#
DISTNAME= sane-0.73
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \
MAINTAINER= gary@hotlava.com
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 4a88461ada34..0ab33bfde01d 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -4,7 +4,7 @@
# Whom: gary@hotlava.com
# obrien@FreeBSD.org
#
-# $Id: Makefile,v 1.4 1998/05/26 08:17:56 dburr Exp $
+# $Id: Makefile,v 1.5 1998/07/12 22:31:09 steve Exp $
#
DISTNAME= sane-0.73
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \
MAINTAINER= gary@hotlava.com
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index bf05b078fa95..8eb96921db5c 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: 4 January 1995
# Whom: roberto
#
-# $Id: Makefile,v 1.19 1998/05/04 20:23:27 jseger Exp $
+# $Id: Makefile,v 1.20 1998/07/06 08:45:11 thepish Exp $
#
DISTNAME= xfig.3.2.2
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.ORG
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
- Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
+ Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
USE_IMAKE= yes
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index bf05b078fa95..8eb96921db5c 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -3,7 +3,7 @@
# Date created: 4 January 1995
# Whom: roberto
#
-# $Id: Makefile,v 1.19 1998/05/04 20:23:27 jseger Exp $
+# $Id: Makefile,v 1.20 1998/07/06 08:45:11 thepish Exp $
#
DISTNAME= xfig.3.2.2
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.ORG
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
- Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
+ Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
USE_IMAKE= yes
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 7c4ff403fe00..a34d353148ba 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Sep 1997
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.3 1998/02/17 07:57:24 tg Exp $
+# $Id: Makefile,v 1.4 1998/06/03 07:45:52 tg Exp $
#
DISTNAME= xfpovray-1.3.1
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= xforms\\.0\\.88:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.88:${PORTSDIR}/x11-toolkits/xforms
RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray
USE_IMAKE= yes
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index b0535f853777..8f6aaeb87ae7 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -3,7 +3,7 @@
# Date created: Jan 15 1998
# Whom: brianfeldman@hotmail.com
#
-# $Id: Makefile,v 1.4 1998/03/07 15:38:45 hoek Exp $
+# $Id: Makefile,v 1.5 1998/04/14 09:27:21 jkh Exp $
#
DISTNAME= tkirc1.202
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
MAINTAINER= brianfeldman@hotmail.com
RUN_DEPENDS= irc:${PORTSDIR}/net/ircII \
- wish8.0:${PORTSDIR}/x11/tk80
+ wish8.0:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/tkirc
NO_BUILD= yes
diff --git a/irc/yagirc/Makefile b/irc/yagirc/Makefile
index 2daeab7ca0c5..75b8f20c6495 100644
--- a/irc/yagirc/Makefile
+++ b/irc/yagirc/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 July 1998
# Whom: mph
#
-# $Id: Makefile,v 1.2 1998/07/30 05:42:09 vanilla Exp $
+# $Id: Makefile,v 1.3 1998/08/04 00:52:20 mph Exp $
#
DISTNAME= yagirc-0.65
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.elpaso.net/~spoon/yagirc/
MAINTAINER= mph@freebsd.org
-LIB_DEPENDS= gtk\\.1\\.\[345\]:${PORTSDIR}/x11/gtk \
+LIB_DEPENDS= gtk\\.1\\.\[345\]:${PORTSDIR}/x11-toolkits/gtk \
Imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
USE_GMAKE= yes
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index 743947f19d08..fd2eba7d4c3d 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 Aug 1995
# Whom: jkh / pst
#
-# $Id: Makefile,v 1.30 1998/07/04 17:11:56 jseger Exp $
+# $Id: Makefile,v 1.31 1998/07/26 17:25:31 jseger Exp $
#
DISTNAME= zircon-1.18.171
@@ -12,8 +12,8 @@ MASTER_SITES= ftp://catless.ncl.ac.uk/pub/
MAINTAINER= jseger@FreeBSD.org
-BUILD_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81
-RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81
+BUILD_DEPENDS= wish8.1:${PORTSDIR}/x11-toolkits/tk81
+RUN_DEPENDS= wish8.1:${PORTSDIR}/x11-toolkits/tk81
IS_INTERACTIVE= yes
NO_BUILD= yes
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 2a795ba0922b..05865c9d7b21 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -3,7 +3,7 @@
# Whom: pst
# Version required: 5.26
#
-# $Id: Makefile,v 1.31 1998/05/25 20:00:59 steve Exp $
+# $Id: Makefile,v 1.32 1998/06/28 23:25:51 steve Exp $
#
# Note this file is included from japanese/extract/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://peloton.physics.montana.edu/pub/distfiles/
MAINTAINER= ports@freebsd.org
-LIB_DEPENDS?= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS?= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --enable-shared \
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
#
DISTNAME= pyth151
@@ -46,7 +46,7 @@ SETUP_FILE= Setup
#
WITH_TK?= yes
.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
SETUP_LOCAL= Setup.tk
.endif
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 133985f4b92d..9f6d067ca124 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 February 1996
# Whom: jkh
#
-# $Id: Makefile,v 1.21 1998/05/21 01:36:22 jseger Exp $
+# $Id: Makefile,v 1.22 1998/07/27 21:36:04 hoek Exp $
#
DISTNAME= tclX8.0.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
MAINTAINER= jseger@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
@@ -29,10 +29,10 @@ post-install:
$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 133985f4b92d..9f6d067ca124 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 February 1996
# Whom: jkh
#
-# $Id: Makefile,v 1.21 1998/05/21 01:36:22 jseger Exp $
+# $Id: Makefile,v 1.22 1998/07/27 21:36:04 hoek Exp $
#
DISTNAME= tclX8.0.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
MAINTAINER= jseger@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
@@ -29,10 +29,10 @@ post-install:
$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 133985f4b92d..9f6d067ca124 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 February 1996
# Whom: jkh
#
-# $Id: Makefile,v 1.21 1998/05/21 01:36:22 jseger Exp $
+# $Id: Makefile,v 1.22 1998/07/27 21:36:04 hoek Exp $
#
DISTNAME= tclX8.0.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
MAINTAINER= jseger@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
@@ -29,10 +29,10 @@ post-install:
$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 843d47dd404a..724e0a6136d3 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -3,7 +3,7 @@
# Date released: 1 Jan 97
# Whom: Peter Wemm <peter@freebsd.org>
#
-# $Id: Makefile,v 1.28 1998/07/03 23:07:01 steve Exp $
+# $Id: Makefile,v 1.29 1998/07/08 10:49:19 peter Exp $
#
DISTNAME= exmh-2.0.2
@@ -37,7 +37,7 @@ MAINTAINER= peter@FreeBSD.org
DIST_SUBDIR= ${PKGNAME}
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
WISH= wish8.0
TCLSH= tclsh8.0
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index b98696981ade..a967473088d4 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -3,7 +3,7 @@
# Date created: So 14 Jun 1998 13:09:18 CEST
# Whom: andreas
#
-# $Id: Makefile,v 1.6 1998/04/29 17:53:11 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1998/06/14 17:32:11 andreas Exp $
#
DISTNAME= kbiff-0.7.3
@@ -12,8 +12,8 @@ MASTER_SITES= http://www.geocities.com/SiliconValley/Hills/2651/
MAINTAINER= andreas@FreeBSD.ORG
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11-toolkits/qt \
kdeui\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs
diff --git a/mail/tkrat/Makefile b/mail/tkrat/Makefile
index 8c7b26e532d9..4593b18612ea 100644
--- a/mail/tkrat/Makefile
+++ b/mail/tkrat/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 October 1997
# Whom: Bruce Gingery <bgingery@gtcs.com>
#
-# $Id: Makefile,v 1.4 1998/07/20 03:09:31 steve Exp $
+# $Id: Makefile,v 1.5 1998/07/24 06:15:46 hoek Exp $
#
DISTNAME= tkrat-1.1
@@ -15,7 +15,7 @@ MAINTAINER= appleseed@his.com
BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
LIB_DEPENDS= tcl80\\.1\\.2:${PORTSDIR}/lang/tcl80 \
- tk80\\.1\\.2:${PORTSDIR}/x11/tk80 \
+ tk80\\.1\\.2:${PORTSDIR}/x11-toolkits/tk80 \
c-client\\.2\\.1:${PORTSDIR}/mail/imap-uw
GNU_CONFIGURE= yes
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 8c7b26e532d9..4593b18612ea 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 October 1997
# Whom: Bruce Gingery <bgingery@gtcs.com>
#
-# $Id: Makefile,v 1.4 1998/07/20 03:09:31 steve Exp $
+# $Id: Makefile,v 1.5 1998/07/24 06:15:46 hoek Exp $
#
DISTNAME= tkrat-1.1
@@ -15,7 +15,7 @@ MAINTAINER= appleseed@his.com
BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
LIB_DEPENDS= tcl80\\.1\\.2:${PORTSDIR}/lang/tcl80 \
- tk80\\.1\\.2:${PORTSDIR}/x11/tk80 \
+ tk80\\.1\\.2:${PORTSDIR}/x11-toolkits/tk80 \
c-client\\.2\\.1:${PORTSDIR}/mail/imap-uw
GNU_CONFIGURE= yes
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 7856cc8815f5..dde7417d0246 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -4,7 +4,7 @@
# Date created: 30 June 1996
# Whom: gena
#
-# $Id: Makefile,v 1.11 1998/07/05 23:44:39 steve Exp $
+# $Id: Makefile,v 1.12 1998/08/05 09:31:22 asami Exp $
#
DISTNAME= xfmail-1.3
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://burka.netvision.net.il/pub/xfmail/
MAINTAINER= gena@NetVision.net.il
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- xforms\\.0\\.88\\.1:${PORTSDIR}/x11/xforms
+ xforms\\.0\\.88\\.1:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/math/apc/Makefile b/math/apc/Makefile
index f907b644b8f1..db52f125b60f 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -3,7 +3,7 @@
# Date created: May 1 1997
# Whom: Eric A. Griff <eagriff@global2000.net>
#
-# $Id: Makefile,v 1.2 1997/10/15 22:46:03 max Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:23 asami Exp $
#
DISTNAME= apc-1.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://members.global2000.net/~eagriff/
MAINTAINER= eagriff@global2000.net
-LIB_DEPENDS= xforms\\.0\\.86:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.86:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= YES
MAN1= apc.1
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/math/xgfe/Makefile b/math/xgfe/Makefile
index e814e8d633d2..6b39a1be8d3f 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 March 1998
# Whom: Matthew Hunt <mph@pobox.com>
#
-# $Id: Makefile,v 1.4 1998/06/10 19:12:47 mph Exp $
+# $Id: Makefile,v 1.5 1998/08/05 09:31:30 asami Exp $
#
DISTNAME= xgfe-2.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://www2.msstate.edu/~dmi1/xgfe/download/
MAINTAINER= mph@freebsd.org
-LIB_DEPENDS= qt\\.1\\.3:${PORTSDIR}/x11/qt
+LIB_DEPENDS= qt\\.1\\.3:${PORTSDIR}/x11-toolkits/qt
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
USE_X_PREFIX= yes
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index fbd0d5f009ca..df9343eb70e1 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Dec 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
-# $Id: Makefile,v 1.2 1998/05/25 21:03:04 fenner Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:30 asami Exp $
#
DISTNAME= xldlas-0.85
@@ -16,7 +16,7 @@ EXTRACT_SUFX= -source.tgz
MAINTAINER= giffunip@asme.org
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/xldlas
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 3ce170d5e44a..1cd8d9bd1c18 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -3,7 +3,7 @@
# Date created: So 2 Mär 1997 12:11:43 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.7 1998/06/29 18:46:39 andreas Exp $
+# $Id: Makefile,v 1.8 1998/08/05 09:31:30 asami Exp $
#
DISTNAME= xmgr-4.1.1
@@ -17,7 +17,7 @@ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
BUILD_DEPENDS= ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp \
${LOCALBASE}/lib/libmfhdf.a:${PORTSDIR}/graphics/hdf
-LIB_DEPENDS= Xbae\\.6\\.:${PORTSDIR}/x11/xbae
+LIB_DEPENDS= Xbae\\.6\\.:${PORTSDIR}/x11-toolkits/xbae
USE_X_PREFIX= YES
REQUIRE_MOTIF= YES
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index db29746247fd..303fead70bc8 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -3,7 +3,7 @@
# Date created: 13 October 1994
# Whom: wollman
#
-# $Id: Makefile,v 1.17 1998/03/20 14:35:13 tg Exp $
+# $Id: Makefile,v 1.18 1998/08/05 09:31:31 asami Exp $
#
DISTNAME= imm-3.5a1
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/mnm
MAINTAINER= fenner@freebsd.org
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
USE_X_PREFIX= yes
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index bb7d2cb6e6b2..d15280b5a89a 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 September 1996
# Whom: Bill Fenner <fenner@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1997/09/25 04:12:57 fenner Exp $
+# $Id: Makefile,v 1.8 1998/08/05 09:31:31 asami Exp $
#
DISTNAME= nt.1.5a23
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://cs.ucl.ac.uk/mice/nte/
MAINTAINER= fenner@FreeBSD.org
-TK_DIR= ${PORTSDIR}/x11/tk42
+TK_DIR= ${PORTSDIR}/x11-toolkits/tk42
TK_SRC= ${TK_DIR}/work/tk4.2p2
DEPENDS= ${TK_DIR}
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index dd0e7a705283..d0dc20734942 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -3,7 +3,7 @@
# Date created: 1 November 1996
# Whom: Bill Fenner <fenner@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.6 1998/02/21 22:38:06 fenner Exp $
+# $Id: Makefile,v 1.7 1998/08/05 09:31:32 asami Exp $
#
DISTNAME= rtpmon-1.0a7
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/rtpmon/
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk42\\.1:${PORTSDIR}/x11/tk42
+LIB_DEPENDS= tk42\\.1:${PORTSDIR}/x11-toolkits/tk42
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
GNU_CONFIGURE= yes
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index c24964712d58..29db3c2b57eb 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 September 1996
# Whom: Bill Fenner <fenner@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1997/12/19 00:52:04 fenner Exp $
+# $Id: Makefile,v 1.8 1998/08/05 09:31:32 asami Exp $
#
DISTNAME= sdr.V2.4a7n
@@ -13,7 +13,7 @@ MASTER_SITES= http://north.east.isi.edu/sdr/
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
NO_WRKSUBDIR= yes
HAS_CONFIGURE= yes
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index e4454f5fc2fb..4a835ce85ff0 100644
--- a/mbone/vat/Makefile
+++ b/mbone/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/mbone/vic/Makefile b/mbone/vic/Makefile
index 07da14b75db3..366b721f7573 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 December 1994
# Whom: wollman
#
-# $Id: Makefile,v 1.15 1998/06/26 18:39:14 fenner Exp $
+# $Id: Makefile,v 1.16 1998/08/05 09:31:33 asami Exp $
#
DISTNAME= vic-2.8
@@ -13,7 +13,7 @@ DISTFILES= vicsrc-2.8.tar.gz
MAINTAINER= fenner@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
USE_AUTOCONF= yes
USE_X_PREFIX= yes
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 06af6e411c8f..88734dacb9d3 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -3,7 +3,7 @@
# Date created: 11/12/96
# Whom: oly@world.std.com
#
-# $Id: Makefile,v 1.9 1998/02/25 16:14:31 steve Exp $
+# $Id: Makefile,v 1.10 1998/02/26 03:29:53 steve Exp $
#
DISTNAME= dotfile-2.2
@@ -12,8 +12,8 @@ MASTER_SITES= ftp://ftp.imada.ou.dk/pub/dotfile/
MAINTAINER= oly@world.std.com
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
MAN1= dotfile.1
diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index 83663fd704e5..4fe493b42090 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -3,7 +3,7 @@
# Date created: 17 October 1997
# Whom: itojun@itojun.org
#
-# $Id: Makefile,v 1.12 1998/04/12 02:21:16 itojun Exp $
+# $Id: Makefile,v 1.13 1998/06/27 05:19:18 asami Exp $
#
DISTNAME= ewipe-1.0.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.jnet-jp.to/~sekisita/ewipe/
MAINTAINER= itojun@itojun.org
-#RUN_DEPENDS= wish4.2:${PORTSDIR}/x11/tk42
+#RUN_DEPENDS= wish4.2:${PORTSDIR}/x11-toolkits/tk42
TCLLIBS= definefont.tcl edittable.tcl setpointer.tcl viewer.tcl tclIndex
DOCS= README Changes dot.ewipe
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/misc/kdeutils11/Makefile
+++ b/misc/kdeutils11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/misc/kp/Makefile b/misc/kp/Makefile
index 3f669b7950b1..c909f12fb5d2 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -3,7 +3,7 @@
# Date created: 8 May 1995
# Whom: asami
#
-# $Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp $
+# $Id: Makefile,v 1.9 1998/08/05 09:31:33 asami Exp $
#
DISTNAME= kp-0.96
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/
MAINTAINER= asami@FreeBSD.org
-RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41
+RUN_DEPENDS= wish4.1:${PORTSDIR}/x11-toolkits/tk41
USE_X_PREFIX= yes
MAN1= kp.1
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 4d8dfe83674e..2941be373d3c 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -3,7 +3,7 @@
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/12 08:50:57 tg Exp $
#
DISTNAME= kwatch-0.3
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= /stable/Beta4/apps/utils
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 \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs
diff --git a/misc/tkcron/Makefile b/misc/tkcron/Makefile
index be3f030c7339..d79dd36aeda4 100644
--- a/misc/tkcron/Makefile
+++ b/misc/tkcron/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 July 1996
# Whom: Sander Vesik <sander@haldjas.folklore.ee>
#
-# $Id: Makefile,v 1.5 1997/11/22 20:10:39 jseger Exp $
+# $Id: Makefile,v 1.7 1998/03/20 14:35:15 tg Exp $
#
DISTNAME= tkcron-2.12
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tcl.gz
MAINTAINER= sander@haldjas.folklore.ee
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -cd
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index 8b762ae89374..ee359aa3c69e 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -3,7 +3,7 @@
# Date created: 16 Jan 1995
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.16 1998/01/29 07:49:36 tg Exp $
+# $Id: Makefile,v 1.18 1998/03/20 14:35:17 tg Exp $
#
DISTNAME= tkinfo-2.4
@@ -12,7 +12,7 @@ MASTER_SITES= http://math-www.uni-paderborn.de/~axel/tkinfo/
MAINTAINER= tg@FreeBSD.ORG
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
NO_BUILD= yes
MAN1= tkinfo.1
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 1a6c220e91c7..362aae5e917c 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -3,7 +3,7 @@
# Date created: 27 Dec 1994
# Whom: Thomas Gellekum <tg@freebsd.org>
#
-# $Id: Makefile,v 1.30 1998/02/24 08:50:00 tg Exp $
+# $Id: Makefile,v 1.31 1998/07/30 11:48:55 tg Exp $
#
DISTNAME= tkman-2.1b1
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= tg@freebsd.org
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \
glimpse:${PORTSDIR}/textproc/glimpse
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 7a5285ddc7a0..b3b7df72e80a 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -3,7 +3,7 @@
# Date created: Sun Sep 7 17:55:07 EDT 1997
# Whom: Randall Hopper <rhh@ct.picker.com>
#
-# $Id: Makefile,v 1.6 1998/07/06 13:26:32 dburr Exp $
+# $Id: Makefile,v 1.7 1998/08/05 09:31:08 asami Exp $
#
DISTNAME= fxtv-0.47
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rhh@ct.picker.com
LIB_DEPENDS= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
- Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d \
+ Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
# This program does not actually depend on the below, but they are pretty
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 3fc1702d2661..99a824d30b4a 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/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/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 3fc1702d2661..99a824d30b4a 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/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/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 07da14b75db3..366b721f7573 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 December 1994
# Whom: wollman
#
-# $Id: Makefile,v 1.15 1998/06/26 18:39:14 fenner Exp $
+# $Id: Makefile,v 1.16 1998/08/05 09:31:33 asami Exp $
#
DISTNAME= vic-2.8
@@ -13,7 +13,7 @@ DISTFILES= vicsrc-2.8.tar.gz
MAINTAINER= fenner@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
USE_AUTOCONF= yes
USE_X_PREFIX= yes
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 1b9304bdf508..835d7f0c014c 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 July 1998
# Whom: Brian Feldman
#
-# $Id: Makefile,v 1.1.1.1 1998/07/02 03:22:36 eivind Exp $
+# $Id: Makefile,v 1.1.1.1 1998/07/09 16:01:50 eivind Exp $
#
DISTNAME= licq-0.32-a
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= brianfeldman@hotmail.com
-LIB_DEPENDS= qt\\.1\\.33:${PORTSDIR}/x11/qt133
+LIB_DEPENDS= qt\\.1\\.33:${PORTSDIR}/x11-toolkits/qt133
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index 59fd1779a8ec..dd71faec9019 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -3,7 +3,7 @@
# Date created: May 4th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.4 1998/02/08 03:01:22 hoek Exp $
+# $Id: Makefile,v 1.5 1998/02/12 15:47:38 hoek Exp $
#
DISTNAME= RAToolSet-3.5.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
MAINTAINER= jfitz@FreeBSD.ORG
-LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
GNU_CONFIGURE= Yes
CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl7.5: \
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index da1ddd708844..90efa3faa706 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 Februar 1995
# Whom: Gennady Sorokopud <gena@netvision.net.il>
#
-# $Id: Makefile,v 1.26 1998/03/21 12:44:08 asami Exp $
+# $Id: Makefile,v 1.27 1998/04/14 02:10:05 asami Exp $
#
DISTNAME= scotty-2.1.8
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= phk@freebsd.org
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index 77af859adf82..f1a43cc6a9a2 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -3,7 +3,7 @@
# Date created: Feb 8th, 1988
# Whom: jkh
#
-# $Id: Makefile,v 1.2 1998/02/16 10:54:05 asami Exp $
+# $Id: Makefile,v 1.3 1998/02/16 12:06:41 jkh Exp $
#
DISTNAME= cnet-1.4-3
@@ -11,7 +11,7 @@ PKGNAME= cnet-1.4p3
CATEGORIES= net
MASTER_SITES= http://www.cs.uwa.edu.au/pls/cnet/
-LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.2:${PORTSDIR}/x11-toolkits/xview-lib
WRKSRC= ${WRKDIR}/cnet-1.4
ALL_TARGET=
diff --git a/net/imm/Makefile b/net/imm/Makefile
index db29746247fd..303fead70bc8 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -3,7 +3,7 @@
# Date created: 13 October 1994
# Whom: wollman
#
-# $Id: Makefile,v 1.17 1998/03/20 14:35:13 tg Exp $
+# $Id: Makefile,v 1.18 1998/08/05 09:31:31 asami Exp $
#
DISTNAME= imm-3.5a1
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/mnm
MAINTAINER= fenner@freebsd.org
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
USE_X_PREFIX= yes
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index 59fd1779a8ec..dd71faec9019 100644
--- a/net/irrtoolset/Makefile
+++ b/net/irrtoolset/Makefile
@@ -3,7 +3,7 @@
# Date created: May 4th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.4 1998/02/08 03:01:22 hoek Exp $
+# $Id: Makefile,v 1.5 1998/02/12 15:47:38 hoek Exp $
#
DISTNAME= RAToolSet-3.5.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
MAINTAINER= jfitz@FreeBSD.ORG
-LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
GNU_CONFIGURE= Yes
CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl7.5: \
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index b7e6e2576122..19e90fcd92a6 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.15 1998/07/19 17:47:33 se Exp $
+# $Id: Makefile,v 1.16 1998/07/23 20:52:02 se Exp $
#
DISTNAME= kdenetwork-1.0
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt140 \
${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
uu\\.1\\.:${PORTSDIR}/converters/uulib \
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index b7e6e2576122..19e90fcd92a6 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.15 1998/07/19 17:47:33 se Exp $
+# $Id: Makefile,v 1.16 1998/07/23 20:52:02 se Exp $
#
DISTNAME= kdenetwork-1.0
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt140 \
${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
uu\\.1\\.:${PORTSDIR}/converters/uulib \
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index b7e6e2576122..19e90fcd92a6 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.15 1998/07/19 17:47:33 se Exp $
+# $Id: Makefile,v 1.16 1998/07/23 20:52:02 se Exp $
#
DISTNAME= kdenetwork-1.0
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt140 \
${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
uu\\.1\\.:${PORTSDIR}/converters/uulib \
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index b7e6e2576122..19e90fcd92a6 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.15 1998/07/19 17:47:33 se Exp $
+# $Id: Makefile,v 1.16 1998/07/23 20:52:02 se Exp $
#
DISTNAME= kdenetwork-1.0
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt140 \
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt140 \
${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11/qt140 \
+LIB_DEPENDS= qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
uu\\.1\\.:${PORTSDIR}/converters/uulib \
diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index c55b846af1b2..e88f9771fd86 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
-# $Id: Makefile,v 1.1.1.1 1998/06/12 08:36:21 tg Exp $
+# $Id: Makefile,v 1.2 1998/06/12 09:05:27 tg Exp $
#
DISTNAME= ksamba-0.3.3
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= /unstable/apps/network
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[1-9]:${PORTSDIR}/x11/kdelibs \
kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile
index 1b9304bdf508..835d7f0c014c 100644
--- a/net/licq-devel/Makefile
+++ b/net/licq-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 July 1998
# Whom: Brian Feldman
#
-# $Id: Makefile,v 1.1.1.1 1998/07/02 03:22:36 eivind Exp $
+# $Id: Makefile,v 1.1.1.1 1998/07/09 16:01:50 eivind Exp $
#
DISTNAME= licq-0.32-a
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= brianfeldman@hotmail.com
-LIB_DEPENDS= qt\\.1\\.33:${PORTSDIR}/x11/qt133
+LIB_DEPENDS= qt\\.1\\.33:${PORTSDIR}/x11-toolkits/qt133
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/net/licq/Makefile b/net/licq/Makefile
index 1b9304bdf508..835d7f0c014c 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 July 1998
# Whom: Brian Feldman
#
-# $Id: Makefile,v 1.1.1.1 1998/07/02 03:22:36 eivind Exp $
+# $Id: Makefile,v 1.1.1.1 1998/07/09 16:01:50 eivind Exp $
#
DISTNAME= licq-0.32-a
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= brianfeldman@hotmail.com
-LIB_DEPENDS= qt\\.1\\.33:${PORTSDIR}/x11/qt133
+LIB_DEPENDS= qt\\.1\\.33:${PORTSDIR}/x11-toolkits/qt133
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/net/pppload/Makefile b/net/pppload/Makefile
index 9e71340234f1..f9e86b2b6ac1 100644
--- a/net/pppload/Makefile
+++ b/net/pppload/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 January 1998
# Whom: Sean Cole <scole@aracnet.com>
#
-# $Id: Makefile,v 1.3 1998/02/19 09:51:47 obrien Exp $
+# $Id: Makefile,v 1.4 1998/02/19 12:42:50 asami Exp $
#
DISTNAME= pppload-1.0
@@ -12,8 +12,8 @@ MASTER_SITES= http://sunsite.unc.edu/pub/Linux/system/network/serial/ppp/
MAINTAINER= ports@FreeBSD.ORG
-BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS= qt:${PORTSDIR}/x11/qt
+BUILD_DEPENDS= moc:${PORTSDIR}/x11-toolkits/qt
+LIB_DEPENDS= qt:${PORTSDIR}/x11-toolkits/qt
MAN1= pppload.1
diff --git a/net/ratoolset/Makefile b/net/ratoolset/Makefile
index 59fd1779a8ec..dd71faec9019 100644
--- a/net/ratoolset/Makefile
+++ b/net/ratoolset/Makefile
@@ -3,7 +3,7 @@
# Date created: May 4th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.4 1998/02/08 03:01:22 hoek Exp $
+# $Id: Makefile,v 1.5 1998/02/12 15:47:38 hoek Exp $
#
DISTNAME= RAToolSet-3.5.2
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
MAINTAINER= jfitz@FreeBSD.ORG
-LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
GNU_CONFIGURE= Yes
CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl7.5: \
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index da1ddd708844..90efa3faa706 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 Februar 1995
# Whom: Gennady Sorokopud <gena@netvision.net.il>
#
-# $Id: Makefile,v 1.26 1998/03/21 12:44:08 asami Exp $
+# $Id: Makefile,v 1.27 1998/04/14 02:10:05 asami Exp $
#
DISTNAME= scotty-2.1.8
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= phk@freebsd.org
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index da1ddd708844..90efa3faa706 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 Februar 1995
# Whom: Gennady Sorokopud <gena@netvision.net.il>
#
-# $Id: Makefile,v 1.26 1998/03/21 12:44:08 asami Exp $
+# $Id: Makefile,v 1.27 1998/04/14 02:10:05 asami Exp $
#
DISTNAME= scotty-2.1.8
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= phk@freebsd.org
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index c24964712d58..29db3c2b57eb 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 September 1996
# Whom: Bill Fenner <fenner@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1997/12/19 00:52:04 fenner Exp $
+# $Id: Makefile,v 1.8 1998/08/05 09:31:32 asami Exp $
#
DISTNAME= sdr.V2.4a7n
@@ -13,7 +13,7 @@ MASTER_SITES= http://north.east.isi.edu/sdr/
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
NO_WRKSUBDIR= yes
HAS_CONFIGURE= yes
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 00657d2ee06c..28dbd8a06543 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -3,7 +3,7 @@
# Date created: 15 July 1998
# Whom: Kenjiro Cho <kjc@csl.sony.co.jp>
#
-# $Id: Makefile,v 1.4 1998/02/21 22:38:10 fenner Exp $
+# $Id: Makefile,v 1.6 1998/07/15 05:51:57 kjc Exp $
#
DISTNAME= ttt-1.2
@@ -12,10 +12,10 @@ MASTER_SITES= ftp://ftp.csl.sony.co.jp/pub/kjc/
MAINTAINER= kjc@csl.sony.co.jp
-# the tcl/tk LIB_DEPENDS has to match that of ports/x11/blt.
-LIB_DEPENDS= BLT\\.2\\.4:${PORTSDIR}/x11/blt \
+# the tcl/tk LIB_DEPENDS has to match that of ports/x11-toolkits/blt.
+LIB_DEPENDS= BLT\\.2\\.4:${PORTSDIR}/x11-toolkits/blt \
tcl80\\.1:${PORTSDIR}/lang/tcl80 \
- tk80\\.1:${PORTSDIR}/x11/tk80
+ tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
INSTALL_TARGET= install install-man
diff --git a/news/xvnews/Makefile b/news/xvnews/Makefile
index f89a61b2d0fb..141a6b445cdf 100644
--- a/news/xvnews/Makefile
+++ b/news/xvnews/Makefile
@@ -3,7 +3,7 @@
# Date created: 31 Jul 1996
# Whom: shanee@augusta.de
#
-# $Id: Makefile,v 1.2 1996/11/26 07:57:46 asami Exp $
+# $Id: Makefile,v 1.3 1997/10/26 23:57:21 fenner Exp $
#
DISTNAME= xvnews-2.3.2
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index 504650acb4ec..d37707724846 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -3,7 +3,7 @@
# Date created: 09 April 1998
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.5 1998/05/12 00:31:37 dima Exp $
+# $Id: Makefile,v 1.6 1998/05/20 19:34:21 dima Exp $
#
DISTNAME= kpilot-3.0.2
@@ -12,8 +12,8 @@ MASTER_SITES= http://www.slac.com/pilone/kpilot_home/download/
MAINTAINER= dima@freebsd.org
-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 \
gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index db88b4651f8e..3f7a176f251d 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: November, 1997
# Whom: Paul Traina <pst@freebsd.org>
#
-# $Id: Makefile,v 1.16 1998/05/10 16:47:22 dima Exp $
+# $Id: Makefile,v 1.17 1998/05/12 00:23:26 dima Exp $
DISTNAME= pilot-link.0.8.13
PKGNAME= pilot-link-0.8.13
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
MAINTAINER= dima@freebsd.org
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
USE_PERL5= yes
PREFIX= ${LOCALBASE}/pilot
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index db88b4651f8e..3f7a176f251d 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -3,7 +3,7 @@
# Date created: November, 1997
# Whom: Paul Traina <pst@freebsd.org>
#
-# $Id: Makefile,v 1.16 1998/05/10 16:47:22 dima Exp $
+# $Id: Makefile,v 1.17 1998/05/12 00:23:26 dima Exp $
DISTNAME= pilot-link.0.8.13
PKGNAME= pilot-link-0.8.13
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
MAINTAINER= dima@freebsd.org
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
USE_PERL5= yes
PREFIX= ${LOCALBASE}/pilot
diff --git a/ports-mgmt/pib/Makefile b/ports-mgmt/pib/Makefile
index 76a1570a0452..2ce79bf6ed33 100644
--- a/ports-mgmt/pib/Makefile
+++ b/ports-mgmt/pib/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 December 1996
# Whom: Mike Smith <msmith@freebsd.org>
#
-# $Id: Makefile,v 1.6 1998/02/02 14:37:16 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/02/21 22:38:05 fenner Exp $
#
DISTNAME= pib-1.1
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://gsoft.com.au/pub/pib/
MAINTAINER= msmith@freebsd.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
do-install:
${MKDIR} ${PREFIX}/lib/pib
diff --git a/print/bibcard/Makefile b/print/bibcard/Makefile
index 4955c2dad2be..c0e7b8cc71b5 100644
--- a/print/bibcard/Makefile
+++ b/print/bibcard/Makefile
@@ -4,7 +4,7 @@
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
-# $Id: Makefile,v 1.3 1997/04/15 04:58:06 obrien Exp $
+# $Id: Makefile,v 1.4 1997/04/16 03:13:15 asami Exp $
#
DISTNAME= bibcard.6.4
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@NUXI.com
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
NO_WRKSUBDIR= yes
USE_IMAKE= yes
diff --git a/print/gp/Makefile b/print/gp/Makefile
index 13c0ca7ea8ef..89c36dc49ab3 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -3,7 +3,7 @@
# Date created: 15 April 1997
# Whom: Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
#
-# $Id: Makefile,v 1.5 1998/04/18 12:54:18 itojun Exp $
+# $Id: Makefile,v 1.6 1998/06/04 18:28:10 itojun Exp $
#
DISTNAME= GP-2.5
@@ -47,7 +47,7 @@ WITH_RUN= ${PREFIX}/bin/wish4.2jp:${PORTSDIR}/japanese/tk42 \
DOCDIRNAME= Doc
DOCEXT=
WITH_LIB= tcl76\\.1\\.:${PORTSDIR}/lang/tcl76
-WITH_RUN= ${PREFIX}/bin/wish4.2:${PORTSDIR}/x11/tk42 \
+WITH_RUN= ${PREFIX}/bin/wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
${PREFIX}/bin/a2ps:${PORTSDIR}/print/a2ps \
${X11BASE}/bin/xdvi:${PORTSDIR}/print/xdvi \
${PREFIX}/bin/dvips:${PORTSDIR}/print/dvips
diff --git a/print/gv/Makefile b/print/gv/Makefile
index cf90a77a74f3..a8fda2084073 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -3,7 +3,7 @@
# Date created: 16 Apr 1996
# Whom: tg@freebsd.org
#
-# $Id: Makefile,v 1.15 1997/06/23 07:35:15 tg Exp $
+# $Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp $
#
DISTNAME= gv-3.5.8
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://thep.physik.uni-mainz.de/pub/gv/unix/
MAINTAINER= ports@freebsd.org
-LIB_DEPENDS= Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
+LIB_DEPENDS= Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
USE_IMAKE= yes
diff --git a/print/klyx/Makefile b/print/klyx/Makefile
index 04fcfa12724b..fd8ee07c8d56 100644
--- a/print/klyx/Makefile
+++ b/print/klyx/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/05/25 14:26:20 tg Exp $
+# $Id: Makefile,v 1.2 1998/05/25 14:30:41 tg Exp $
#
DISTNAME= klyx-0.9.3
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= /unstable/apps/office
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[1-9]:${PORTSDIR}/x11/kdelibs \
kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 9cad87d615f7..17290b0d1ddc 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.17 1998/07/04 07:56:21 andreas Exp $
+# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
#
DISTNAME= lyx-0.12.1pre6
@@ -18,7 +18,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
.if defined(WITH_ISPELL)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 9cad87d615f7..17290b0d1ddc 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.17 1998/07/04 07:56:21 andreas Exp $
+# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
#
DISTNAME= lyx-0.12.1pre6
@@ -18,7 +18,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
.if defined(WITH_ISPELL)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 9cad87d615f7..17290b0d1ddc 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.17 1998/07/04 07:56:21 andreas Exp $
+# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
#
DISTNAME= lyx-0.12.1pre6
@@ -18,7 +18,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
.if defined(WITH_ISPELL)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 9cad87d615f7..17290b0d1ddc 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.17 1998/07/04 07:56:21 andreas Exp $
+# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
#
DISTNAME= lyx-0.12.1pre6
@@ -18,7 +18,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
.if defined(WITH_ISPELL)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 9cad87d615f7..17290b0d1ddc 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.17 1998/07/04 07:56:21 andreas Exp $
+# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
#
DISTNAME= lyx-0.12.1pre6
@@ -18,7 +18,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
.if defined(WITH_ISPELL)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
-LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms \
+LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/security/kwallet/Makefile b/security/kwallet/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/security/skip/Makefile b/security/skip/Makefile
index 789c58205a29..af197a600b17 100644
--- a/security/skip/Makefile
+++ b/security/skip/Makefile
@@ -3,7 +3,7 @@
# Date created: 26 November 1997
# Whom: Archie L. Cobbs <archie@whistle.com>
#
-# $Id: Makefile,v 1.25 1997/06/26 15:50:06 max Exp $
+# $Id: Makefile,v 1.1.1.1 1998/01/09 23:23:40 julian Exp $
DISTNAME= skip-1.0
CATEGORIES= security
@@ -13,9 +13,9 @@ EXTRACT_SUFX= tar.Z
MAINTAINER= archie@whistle.com
-BUILD_DEPENDS= ${X11BASE}/lib/libxview.a:${PORTSDIR}/x11/xview-lib \
- ${X11BASE}/lib/X11/config/XView.cf:${PORTSDIR}/x11/xview-config
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+BUILD_DEPENDS= ${X11BASE}/lib/libxview.a:${PORTSDIR}/x11-toolkits/xview-lib \
+ ${X11BASE}/lib/X11/config/XView.cf:${PORTSDIR}/x11-toolkits/xview-config
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
# The SKIP code is restricted from export from the United States and Canada.
# See the file doc/00README for legal details.
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index f7153e24c782..7726c49d65b2 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -3,7 +3,7 @@
# Date created: 1 May 1997
# Whom: jmz
#
-# $Id: Makefile,v 1.7 1997/10/08 07:45:44 asami Exp $
+# $Id: Makefile,v 1.8 1997/12/02 22:36:31 jmz Exp $
#
DISTNAME= cd-write-1.4
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.obs-besancon.fr/pub/outgoing/
MAINTAINER= jmz@FreeBSD.org
-LIB_DEPENDS= tixsam4180\\.1\\.:${PORTSDIR}/x11/tix
+LIB_DEPENDS= tixsam4180\\.1\\.:${PORTSDIR}/x11-toolkits/tix
WRKSRC= ${WRKDIR}/cd-write
diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index 386f00250786..d1237f1da24a 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 Dec 1996
# Whom: nsayer@quack.kfu.com
#
-# $Id: Makefile,v 1.3 1997/08/24 19:47:19 max Exp $
+# $Id: Makefile,v 1.4 1997/12/15 17:09:23 vanilla Exp $
#
DISTNAME= contool-3.3a
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.kfu.com/pub/
MAINTAINER= nsayer@quack.kfu.com
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
NO_CDROM= "source code cannot be sold, nor can you incorporate the source code into a product which is subsequently sold"
NO_WRKSUBDIR= yes
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/sysutils/pib/Makefile b/sysutils/pib/Makefile
index 76a1570a0452..2ce79bf6ed33 100644
--- a/sysutils/pib/Makefile
+++ b/sysutils/pib/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 December 1996
# Whom: Mike Smith <msmith@freebsd.org>
#
-# $Id: Makefile,v 1.6 1998/02/02 14:37:16 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/02/21 22:38:05 fenner Exp $
#
DISTNAME= pib-1.1
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://gsoft.com.au/pub/pib/
MAINTAINER= msmith@freebsd.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
do-install:
${MKDIR} ${PREFIX}/lib/pib
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 60af357152d1..3f4c9da12b4d 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/14 22:33:37 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:01 se Exp $
#
DISTNAME= kdeutils-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/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index aa0368464e9f..5949eb85ea88 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 July 1998
# Whom: Adrian Wontroba <aw1@stade.co.uk>
#
-# $Id: Makefile,v 1.1.1.1 1998/07/12 22:49:03 steve Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:38 asami Exp $
#
DISTNAME= xlogmaster-1.2.2
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .src.tar.gz
MAINTAINER= aw1@stade.co.uk
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index 342f4db86e22..280a7966c892 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -3,7 +3,7 @@
# Date created: 17 July 1998
# Whom: mph
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/17 17:41:17 mph Exp $
#
DISTNAME= xwatch-0.1.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://hem.passagen.se/osk/
MAINTAINER= mph@freebsd.org
-LIB_DEPENDS= gtk\\.1:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
diff --git a/www/grail/Makefile b/www/grail/Makefile
index db49232210aa..dc2a0b4d7ef1 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -3,7 +3,7 @@
# Date created: 6/11/1998
# Whom: n@nectar.com
#
-# $Id: Makefile,v 1.5 1998/06/27 16:19:09 nectar Exp $
+# $Id: Makefile,v 1.3 1998/07/04 22:07:19 nectar Exp $
#
DISTNAME= grail-0.4
@@ -15,7 +15,7 @@ MAINTAINER= nectar@freebsd.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
CHOWN?=chown
CHMOD?=chmod
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index 3ee4725fcfd0..7de720dc73e6 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -3,7 +3,7 @@
# Date created: 25 May 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.2 1998/08/05 09:31:40 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/07 22:33:11 asami Exp $
#
DISTNAME= dfm-0.9.8
@@ -13,7 +13,7 @@ MASTER_SITES= http://www-c.informatik.uni-hannover.de/~kaiser/dfm/
MAINTAINER= andy@icc.surw.chel.su
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- xforms\\.0\\.:${PORTSDIR}/x11/xforms
+ xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 59d6082b000c..bb5971164768 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -3,7 +3,7 @@
# Date created: 3 August 1996
# Whom: lukin
#
-# $Id: Makefile,v 1.14 1998/06/23 09:54:01 vanilla Exp $
+# $Id: Makefile,v 1.15 1998/08/07 22:33:11 asami Exp $
#
DISTNAME= FileRunner-2.5
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= X11/desktop
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81
+LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11-toolkits/tk81
MAKEFILE= Makefile.freebsd_gcc
MAKE_ENV+= X11BASE=${X11BASE}
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 2560cce800a1..a18b3d3cf96d 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 Jul 1996
# Whom: shanee@rabbit.augusta.de
#
-# $Id: Makefile,v 1.7 1998/05/03 15:12:36 jseger Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:33:12 asami Exp $
#
DISTNAME= tkdesk-1.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://people.mainz.netsurf.de/~bolik/tkdesk/
MAINTAINER= dmlb@ragnet.demon.co.uk
-LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11/tk42
+LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11-toolkits/tk42
USE_GMAKE= YES
GNU_CONFIGURE= YES
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index edb576dd38af..fb231e24365f 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 March 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.4 1998/08/05 09:31:49 asami Exp $
+# $Id: Makefile,v 1.5 1998/08/07 22:33:12 asami Exp $
#
DISTNAME= workplace-1.0.a3
@@ -13,7 +13,7 @@ MASTER_SITES= http://www2.osk.3web.ne.jp/~hideki70/src/
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 8a9f2d565c0b..0a4f340e0b79 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 April 1998
# Whom: Donald J. Maddox <dmaddox@scsn.net>
#
-# $Id: Makefile,v 1.1.1.1 1998/04/29 23:46:01 mph Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:34 asami Exp $
#
DISTNAME= X-Files-1.43
@@ -13,7 +13,7 @@ MASTER_SITES= http://java.inf.tu-dresden.de/X-Files/data/
MAINTAINER= dmaddox@scsn.net
-BUILD_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+BUILD_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/X-Files
NO_BUILD= yes
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index 15a49584d943..0c0b8614500f 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 May 1998
# Whom: Brett Taylor
#
-# $Id: Makefile,v 1.1.1.1 1998/05/17 04:44:51 mph Exp $
+# $Id: Makefile,v 1.2 1998/08/07 22:43:09 asami Exp $
#
DISTNAME= tkfont-1.1
@@ -12,7 +12,7 @@ MASTER_SITES= http://cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/
MAINTAINER= brett@peloton.physics.montana.edu
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
NO_BUILD= yes
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 75ff72f089f8..784826a278b1 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,7 +3,7 @@
# Date created: 9 July 1998
# Whom: Kenjiro Cho <kjc@csl.sony.co.jp>
#
-# $Id: Makefile,v 1.17 1998/07/12 17:40:31 kjc Exp $
+# $Id: Makefile,v 1.18 1998/08/07 22:56:37 asami Exp $
#
DISTNAME= BLT2.4c
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.tcltk.com/pub/blt/
MAINTAINER= kjc@csl.sony.co.jp
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/blt2.4c
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 1ba9ac7b746a..9c2d93e367a8 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 Oct 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.10 1998/08/06 15:06:24 vanilla Exp $
+# $Id: Makefile,v 1.11 1998/08/07 23:08:38 asami Exp $
#
DISTNAME= Gtk-0.2.2
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= Gtk
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
USE_PERL5= YES
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 57cfe679a40b..7e92c9edef9d 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -3,7 +3,7 @@
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.5 1998/02/21 22:38:03 fenner Exp $
+# $Id: Makefile,v 1.6 1998/08/07 23:08:39 asami Exp $
DISTNAME= TclTk-b1
PKGNAME= p5-Tcl-Tk-b1
@@ -15,7 +15,7 @@ MAINTAINER= jfitz@FreeBSD.ORG
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
RUN_DEPENDS= perl5.00401:${PORTSDIR}/lang/perl5
-LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
BROKEN= tcl
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 57cfe679a40b..7e92c9edef9d 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -3,7 +3,7 @@
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.5 1998/02/21 22:38:03 fenner Exp $
+# $Id: Makefile,v 1.6 1998/08/07 23:08:39 asami Exp $
DISTNAME= TclTk-b1
PKGNAME= p5-Tcl-Tk-b1
@@ -15,7 +15,7 @@ MAINTAINER= jfitz@FreeBSD.ORG
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
RUN_DEPENDS= perl5.00401:${PORTSDIR}/lang/perl5
-LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
BROKEN= tcl
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 4d7115136d98..3f3fb450d28b 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -3,7 +3,7 @@
# Date created: October 21st 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.15 1998/08/07 12:01:21 markm Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:08:39 asami Exp $
#
DISTNAME= Tk800.008
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= Tk
MAINTAINER= jfitz@FreeBSD.ORG
#BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:${PORTSDIR}/www/p5-libwww
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
USE_PERL5= YES
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 May 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
#
DISTNAME= pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.ORG
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
BROKEN= glib.h
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 May 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
#
DISTNAME= pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.ORG
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
BROKEN= glib.h
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 May 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
#
DISTNAME= pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.ORG
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
BROKEN= glib.h
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 May 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
#
DISTNAME= pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.ORG
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
BROKEN= glib.h
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index c383fc0101b8..8572dcab14dc 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 March 1997
# Whom: Pedro Giffuni
#
-# $Id: Makefile,v 1.3 1998/08/05 09:31:48 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/07 22:56:39 asami Exp $
#
DISTNAME= SlingShot2.1
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= giffunip@asme.org
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
WRKSRC= $(WRKDIR)/sspkg2.1
USE_X_PREFIX= yes
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 8546beee4b17..8ec0c91e6ed7 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,7 +3,7 @@
# Date created: 22 December 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
-# $Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp $
+# $Id: Makefile,v 1.16 1998/08/07 22:56:40 asami Exp $
#
DISTNAME= Tix4.1.0.006
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.xpi.com/pub/
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
WRKSRC= ${WRKDIR}/Tix4.1.0/unix/tk8.0
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 0d9aae32eaa9..49a22f39db4e 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
+# $Id: Makefile,v 1.14 1998/08/07 22:56:47 asami Exp $
#
DISTNAME= tk8.1a2
@@ -23,8 +23,8 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
post-install:
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
test:
@@ -32,4 +32,4 @@ test:
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 0d9aae32eaa9..49a22f39db4e 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
+# $Id: Makefile,v 1.14 1998/08/07 22:56:47 asami Exp $
#
DISTNAME= tk8.1a2
@@ -23,8 +23,8 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
post-install:
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
test:
@@ -32,4 +32,4 @@ test:
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 0d9aae32eaa9..49a22f39db4e 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
+# $Id: Makefile,v 1.14 1998/08/07 22:56:47 asami Exp $
#
DISTNAME= tk8.1a2
@@ -23,8 +23,8 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
post-install:
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
test:
@@ -32,4 +32,4 @@ test:
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index d0d6a09ba309..b3751b1a495a 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -3,7 +3,7 @@
# Date created: 06 November 1997
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.10 1998/07/27 21:36:08 hoek Exp $
+# $Id: Makefile,v 1.11 1998/08/07 22:56:47 asami Exp $
#
DISTNAME= tk8.0p2
@@ -39,8 +39,8 @@ post-install:
${PREFIX}/share/doc/tkstep
.endif
${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
- ${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+ ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
.endif
test:
@@ -48,4 +48,4 @@ test:
.include <bsd.port.mk>
-PKG_ARGS+= -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 10a6867b1ba5..b4a4d777d738 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.20 1998/08/06 15:32:15 vanilla Exp $
+# $Id: Makefile,v 1.21 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= enlightenment-0.14
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
MAINTAINER= vanilla@FreeBSD.ORG
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/Gtk.pm:${PORTSDIR}/x11/p5-Gtk
+BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
LIB_DEPENDS= esd\\.0\\.0:${PORTSDIR}/audio/esound \
Fnlib\\.0\\.3:${PORTSDIR}/graphics/fnlib \
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 10a6867b1ba5..b4a4d777d738 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.20 1998/08/06 15:32:15 vanilla Exp $
+# $Id: Makefile,v 1.21 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= enlightenment-0.14
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
MAINTAINER= vanilla@FreeBSD.ORG
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/Gtk.pm:${PORTSDIR}/x11/p5-Gtk
+BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
LIB_DEPENDS= esd\\.0\\.0:${PORTSDIR}/audio/esound \
Fnlib\\.0\\.3:${PORTSDIR}/graphics/fnlib \
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 10a6867b1ba5..b4a4d777d738 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.20 1998/08/06 15:32:15 vanilla Exp $
+# $Id: Makefile,v 1.21 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= enlightenment-0.14
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
MAINTAINER= vanilla@FreeBSD.ORG
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/Gtk.pm:${PORTSDIR}/x11/p5-Gtk
+BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/5.005/i386-freebsd/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
LIB_DEPENDS= esd\\.0\\.0:${PORTSDIR}/audio/esound \
Fnlib\\.0\\.3:${PORTSDIR}/graphics/fnlib \
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index afe1ad321990..9ec9bac5c106 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 October 1994
# Whom: smace
#
-# $Id: Makefile,v 1.10 1996/11/18 13:06:09 asami Exp $
+# $Id: Makefile,v 1.11 1998/08/07 23:01:40 asami Exp $
#
DISTNAME= olvwm4
@@ -16,7 +16,7 @@ PATCH_SITES= ${MASTER_SITES}
PATCHFILES= olvwm4.Patch01.Z
PATCH_DIST_STRIP= -p1
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
NO_WRKSUBDIR= yes
USE_IMAKE= yes
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index fce9ce5dc2e9..3c69067720c5 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.1.1.1 1997/08/31 17:10:45 max Exp $
+# $Id: Makefile,v 1.2 1997/12/10 22:48:22 vanilla Exp $
#
DISTNAME= xfce-1.2.4
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= X11/toolbars
MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- xforms\\.0\\.:${PORTSDIR}/x11/xforms
+ xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/XFCE-1.2.4
USE_GMAKE= yes
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index fce9ce5dc2e9..3c69067720c5 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.1.1.1 1997/08/31 17:10:45 max Exp $
+# $Id: Makefile,v 1.2 1997/12/10 22:48:22 vanilla Exp $
#
DISTNAME= xfce-1.2.4
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= X11/toolbars
MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
- xforms\\.0\\.:${PORTSDIR}/x11/xforms
+ xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/XFCE-1.2.4
USE_GMAKE= yes
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 7c2af2eb0594..ec50c2dd565d 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.14 1998/07/13 23:42:48 se Exp $
+# $Id: Makefile,v 1.15 1998/07/23 20:52:03 se Exp $
#
DISTNAME= kdebase-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/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 8abaf1e86efe..a15c2a99e8b6 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/13 23:35:52 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:52:04 se Exp $
#
DISTNAME= kdelibs-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
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 8abaf1e86efe..a15c2a99e8b6 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/13 23:35:52 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:52:04 se Exp $
#
DISTNAME= kdelibs-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
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 8abaf1e86efe..a15c2a99e8b6 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/13 23:35:52 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:52:04 se Exp $
#
DISTNAME= kdelibs-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
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 8abaf1e86efe..a15c2a99e8b6 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.13 1998/07/13 23:35:52 se Exp $
+# $Id: Makefile,v 1.14 1998/07/23 20:52:04 se Exp $
#
DISTNAME= kdelibs-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
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile
index 60406524a0c3..ba7650618bed 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -3,7 +3,7 @@
# Date created: 12 July 1998
# Whom: Marc G. Fournier <scrappy@freebsd.org>
#
-# $Id: Makefile,v 1.1.1.1 1998/07/12 08:39:37 scrappy Exp $
+# $Id: Makefile,v 1.2 1998/07/25 12:42:49 asami Exp $
#
DISTNAME= kworldwatch-0.6
@@ -14,8 +14,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= scrappy@freebsd.org
-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 \
kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index 4eb0af9293e1..6d1912c7280d 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 December 1996
# Whom: Pedro Giffuni
#
-# $Id: Makefile,v 1.5 1997/09/15 07:28:02 tg Exp $
+# $Id: Makefile,v 1.6 1998/08/05 09:31:44 asami Exp $
#
DISTNAME= libsx
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= giffunip@asme.org
-LIB_DEPENDS= Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
+LIB_DEPENDS= Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
USE_X_PREFIX= yes
ALL_TARGET= src freq
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 98173a1d5776..92bb148ae9dd 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -3,7 +3,7 @@
# Date created: 3 January 1998
# Whom: jraynard
#
-# $Id: Makefile,v 1.1.1.1 1998/01/04 22:31:25 jraynard Exp $
+# $Id: Makefile,v 1.2 1998/01/06 06:19:17 asami Exp $
#
DISTNAME= props-1.0
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.freebsd.org/~jraynard/ports/distfiles/
MAINTAINER= jraynard@@freebsd.org
-LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS= xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
WRKSRC= ${WRKDIR}/props
USE_IMAKE= yes
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index e6c80f746214..e36fa584bebe 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Oct 1996
# Whom: pst
#
-# $Id: Makefile,v 1.9 1997/11/14 17:51:01 pst Exp $
+# $Id: Makefile,v 1.10 1998/02/21 22:38:06 fenner Exp $
#
DISTNAME= tkgoodstuff8.0-final
@@ -14,7 +14,7 @@ MASTER_SITES= http://www-personal.umich.edu/~markcrim/tkgoodstuff/dists/
MAINTAINER= pst@FreeBSD.org
RUN_DEPENDS= fvwm2:${PORTSDIR}/x11/fvwm2
-LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
GNU_CONFIGURE= yes
CONFIGURE_ENV= TCLCONFIGSH=${PREFIX}/lib/tcl8.0/tclConfig.sh \
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 1e05948b8597..ed9a13063ed5 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 September 1997
# Whom: steve@farrell.org
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/11/24 05:02:43 fenner Exp $
#
DISTNAME= tycoon-1.07o
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= X11/desktop
MAINTAINER= steve@farrell.org
-LIB_DEPENDS= xforms:${PORTSDIR}/x11/xforms
+LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes