(1) Move the following ports out of x11/:

kdegames -> games/ kdenetwork -> net/ kdesupport -> converters/ kdeutils -> misc/ (Repository copy already done, dependency path and category name fixups is being done in this commit.) (2) Add a virtual category "kde" and add all six (incl. x11/kde{base,lib}) ports. (3) Make package names follow the convention. (4) Change "BUILD_DEPENDS=${X11R6}/bin/moc:..." to "...=moc:...". There is no need to specify the full pathname if the target is an executable in the standard path. (Actually, as the same port is specified in LIB_DEPENDS, I think we can completely do away with this line but since Stefan added this explicitly, I assume there is a reason for it and left it alone.) Approved by: se (all but 4)
author: Satoshi Asami <asami@FreeBSD.org> 1997-11-05 04:20:23 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 1997-11-05 04:20:23 +0000
commit: ab4c4c313531b670e303d74fa78917b501e7456a (patch)
tree: 21b07dc1ffabcf581e94b9f42c31bcbfb902461a
parent: original distribution updated to 1.56. (diff)
41 files changed, 161 insertions, 125 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/converters/Makefile b/converters/Makefile
index e56637a5efd4..dfb4bf2074d8 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,8 +1,9 @@
-# $Id: Makefile,v 1.5 1997/07/08 10:11:21 tg Exp $
+# $Id: Makefile,v 1.6 1997/08/16 05:16:51 itojun Exp $
 #
 
     SUBDIR += btoa
     SUBDIR += ish
+    SUBDIR += kdesupport
     SUBDIR += mimepp
     SUBDIR += mpack
     SUBDIR += p5-Convert-UU
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 28293f1b2437..c1107312f9e3 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1997/11/03 00:36:01 se Exp $
 #
 
 DISTNAME=	kdesupport-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdesupport-1.2b
+CATEGORIES=	converters kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt
 
 HAS_CONFIGURE=	yes
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 28293f1b2437..c1107312f9e3 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1997/11/03 00:36:01 se Exp $
 #
 
 DISTNAME=	kdesupport-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdesupport-1.2b
+CATEGORIES=	converters kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt
 
 HAS_CONFIGURE=	yes
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/games/Makefile b/games/Makefile
index 910a4d964bc7..fab3e6f119c1 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.87 1997/10/15 04:58:31 max Exp $
+# $Id: Makefile,v 1.88 1997/10/23 14:54:21 hoek Exp $
 #
 
     SUBDIR += acm
@@ -24,6 +24,7 @@
     SUBDIR += golddig
     SUBDIR += imaze
     SUBDIR += jetpack
+    SUBDIR += kdegames
     SUBDIR += klondike
     SUBDIR += lincity
     SUBDIR += nethack
diff --git a/games/kdegames11/Makefile b/games/kdegames11/Makefile
index a2151aa6dcf1..04b7ce4ba20b 100644
--- a/games/kdegames11/Makefile
+++ b/games/kdegames11/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 11:29:32 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:43 se Exp $
 #
 
 DISTNAME=	kdegames-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdegames-1.2b
+CATEGORIES=	games kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index a2151aa6dcf1..04b7ce4ba20b 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 11:29:32 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:43 se Exp $
 #
 
 DISTNAME=	kdegames-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdegames-1.2b
+CATEGORIES=	games kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index a2151aa6dcf1..04b7ce4ba20b 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 11:29:32 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:43 se Exp $
 #
 
 DISTNAME=	kdegames-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdegames-1.2b
+CATEGORIES=	games kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index a2151aa6dcf1..04b7ce4ba20b 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 11:29:32 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:43 se Exp $
 #
 
 DISTNAME=	kdegames-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdegames-1.2b
+CATEGORIES=	games kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/misc/Makefile b/misc/Makefile
index dbbc1ead3c57..e76fb10b83d1 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.116 1997/10/11 04:14:17 obrien Exp $
+# $Id: Makefile,v 1.117 1997/10/13 04:41:07 max Exp $
 #
 
     SUBDIR += amanda
@@ -20,6 +20,7 @@
     SUBDIR += gnuls
     SUBDIR += ical
     SUBDIR += jive
+    SUBDIR += kdeutils
     SUBDIR += kp
     SUBDIR += less
     SUBDIR += lile
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/misc/kdeutils11/Makefile
+++ b/misc/kdeutils11/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/net/Makefile b/net/Makefile
index 4e66065a7bb2..0108acf468a9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.121 1997/10/23 15:18:55 max Exp $
+# $Id: Makefile,v 1.122 1997/10/30 11:23:28 jseger Exp $
 #
 
     SUBDIR += archie
@@ -30,6 +30,7 @@
     SUBDIR += ircii-epic
     SUBDIR += isc-dhcp
     SUBDIR += ivs
+    SUBDIR += kdenetwork
     SUBDIR += ldap
     SUBDIR += libsocket++
     SUBDIR += mirror
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index 2a8b9dad3f7f..affecaa67029 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/03 00:39:00 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 22:21:11 se Exp $
 #
 
 DISTNAME=	kdenetwork-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdenetwork-1.2b
+CATEGORIES=	net kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,13 +16,13 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
 		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		mimelib\\.1\\.:${PORTSDIR}/x11/kdesupport \
-		uulib\\.0\\.:${PORTSDIR}/x11/kdesupport \
+		mimelib\\.1\\.:${PORTSDIR}/converters/kdesupport \
+		uulib\\.0\\.:${PORTSDIR}/converters/kdesupport \
 		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
 		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 2a8b9dad3f7f..affecaa67029 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/03 00:39:00 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 22:21:11 se Exp $
 #
 
 DISTNAME=	kdenetwork-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdenetwork-1.2b
+CATEGORIES=	net kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,13 +16,13 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
 		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		mimelib\\.1\\.:${PORTSDIR}/x11/kdesupport \
-		uulib\\.0\\.:${PORTSDIR}/x11/kdesupport \
+		mimelib\\.1\\.:${PORTSDIR}/converters/kdesupport \
+		uulib\\.0\\.:${PORTSDIR}/converters/kdesupport \
 		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
 		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 2a8b9dad3f7f..affecaa67029 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/03 00:39:00 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 22:21:11 se Exp $
 #
 
 DISTNAME=	kdenetwork-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdenetwork-1.2b
+CATEGORIES=	net kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,13 +16,13 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
 		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		mimelib\\.1\\.:${PORTSDIR}/x11/kdesupport \
-		uulib\\.0\\.:${PORTSDIR}/x11/kdesupport \
+		mimelib\\.1\\.:${PORTSDIR}/converters/kdesupport \
+		uulib\\.0\\.:${PORTSDIR}/converters/kdesupport \
 		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
 		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 2a8b9dad3f7f..affecaa67029 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/03 00:39:00 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 22:21:11 se Exp $
 #
 
 DISTNAME=	kdenetwork-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdenetwork-1.2b
+CATEGORIES=	net kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,13 +16,13 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
 		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		mimelib\\.1\\.:${PORTSDIR}/x11/kdesupport \
-		uulib\\.0\\.:${PORTSDIR}/x11/kdesupport \
+		mimelib\\.1\\.:${PORTSDIR}/converters/kdesupport \
+		uulib\\.0\\.:${PORTSDIR}/converters/kdesupport \
 		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
 		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 39cc3754ed54..0aef820e8816 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 00:05:02 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdeutils-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdeutils-1.2b-2
+CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/Makefile b/x11/Makefile
index a2c99f49b647..82e389011e21 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.168 1997/11/04 09:05:15 tg Exp $
+# $Id: Makefile,v 1.169 1997/11/04 10:35:37 tg Exp $
 #
 
     SUBDIR += FWF
@@ -34,11 +34,7 @@
     SUBDIR += gwm
     SUBDIR += iv
     SUBDIR += kdebase
-    SUBDIR += kdegames
     SUBDIR += kdelibs
-    SUBDIR += kdenetwork
-    SUBDIR += kdesupport
-    SUBDIR += kdeutils
     SUBDIR += lesstif
     SUBDIR += libdnd
     SUBDIR += libsx
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index ab1285e3c046..f575bfd10732 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/11/03 00:25:42 se Exp $
+# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
 #
 
 DISTNAME=	kdebase-Beta1-3
-CATEGORIES=	x11
+PKGNAME=	kdebase-1.3b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 5fad54615102..16a3ccc392b3 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdelibs-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdelibs-1.2b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 5fad54615102..16a3ccc392b3 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdelibs-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdelibs-1.2b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5fad54615102..16a3ccc392b3 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdelibs-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdelibs-1.2b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 5fad54615102..16a3ccc392b3 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,11 +3,12 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $
+# $Id: Makefile,v 1.2 1997/11/03 00:25:44 se Exp $
 #
 
 DISTNAME=	kdelibs-Beta1-2
-CATEGORIES=	x11
+PKGNAME=	kdelibs-1.2b
+CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
  		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg
author	Satoshi Asami <asami@FreeBSD.org>	1997-11-05 04:20:23 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	1997-11-05 04:20:23 +0000
commit	ab4c4c313531b670e303d74fa78917b501e7456a (patch)
tree	21b07dc1ffabcf581e94b9f42c31bcbfb902461a
parent	original distribution updated to 1.56. (diff)