Replace qt dependencies with USE_QT.

(Also, net/licq/Makefile: No need to define both HAS_CONFIGURE and
 GNU_CONFIGURE)

5 files changed, 15 insertions, 20 deletions

diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 3f4c9da12b4d..74c7eb8dd56e 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.15 1998/07/23 20:52:01 se Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:56:40 asami Exp $
 #
 
 DISTNAME=	kdeutils-1.0
@@ -13,9 +13,7 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
-		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
+LIB_DEPENDS=	gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
@@ -24,6 +22,7 @@ LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
+USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=$(PREFIX)/include/giflib"
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 3f4c9da12b4d..74c7eb8dd56e 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.15 1998/07/23 20:52:01 se Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:56:40 asami Exp $
 #
 
 DISTNAME=	kdeutils-1.0
@@ -13,9 +13,7 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
-		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
+LIB_DEPENDS=	gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
@@ -24,6 +22,7 @@ LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
+USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=$(PREFIX)/include/giflib"
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 3f4c9da12b4d..74c7eb8dd56e 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.15 1998/07/23 20:52:01 se Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:56:40 asami Exp $
 #
 
 DISTNAME=	kdeutils-1.0
@@ -13,9 +13,7 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
-		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
+LIB_DEPENDS=	gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
@@ -24,6 +22,7 @@ LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
+USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=$(PREFIX)/include/giflib"
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 3f4c9da12b4d..74c7eb8dd56e 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.15 1998/07/23 20:52:01 se Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:56:40 asami Exp $
 #
 
 DISTNAME=	kdeutils-1.0
@@ -13,9 +13,7 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt140
-LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
-		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
+LIB_DEPENDS=	gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
@@ -24,6 +22,7 @@ LIB_DEPENDS=	qt\\.1\\.\\\(33\\\|40\\\):${PORTSDIR}/x11-toolkits/qt140 \
 		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
+USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=$(PREFIX)/include/giflib"
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 2941be373d3c..0fd44d1801e7 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: Makefile,v 1.1.1.1 1998/06/12 08:50:57 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/07 23:56:40 asami Exp $
 #
 
 DISTNAME=	kwatch-0.3
@@ -13,12 +13,11 @@ MASTER_SITE_SUBDIR= /stable/Beta4/apps/utils
 
 MAINTAINER=	hanspb@persbraten.vgs.no
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11-toolkits/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11-toolkits/qt \
-		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
 		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs
 
+USE_QT=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \