* Strongly buildlinkify.

* Use qt2-designer-kde for a uic that understands KDE2 widgets.

5 files changed, 48 insertions, 22 deletions

diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index 64052f0ae33..6d207c6791f 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2001/10/15 22:46:13 skrll Exp $
-#
+# $NetBSD: Makefile,v 1.4 2001/11/13 21:17:16 jlam Exp $
 
 DISTNAME=	kdegames-2.2.1
-CATEGORIES=	games kde
-.include "../../x11/kde2/Makefile.part1"
+CATEGORIES=	games
 COMMENT=	Games for the KDE integrated X11 desktop
 
-DEPENDS+=	kdebase>=2.2.1:../../x11/kdebase2
+.include "../../x11/kde2/Makefile.kde2"
 
-.include "../../x11/kde2/Makefile.part2"
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 
+USE_BUILDLINK_ONLY=	YES
+
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kdetoys2/Makefile b/games/kdetoys2/Makefile
index 2693ccf28e0..d09b91a18b9 100644
--- a/games/kdetoys2/Makefile
+++ b/games/kdetoys2/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2001/10/15 22:46:18 skrll Exp $
-#
+# $NetBSD: Makefile,v 1.4 2001/11/13 21:17:49 jlam Exp $
 
 DISTNAME=	kdetoys-2.2.1
-CATEGORIES=	games kde
-.include "../../x11/kde2/Makefile.part1"
-COMMENT= Toys for the KDE integrated X11 desktop
+CATEGORIES=	games
+COMMENT=	Toys for the KDE integrated X11 desktop
 
-DEPENDS+=	kdebase>=2.2.1:../../x11/kdebase2
+.include "../../x11/kde2/Makefile.kde2"
 
-.include "../../x11/kde2/Makefile.part2"
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 
+USE_BUILDLINK_ONLY=	YES
+
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 33136fcc237..3822c6f99ab 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.4 2001/10/15 22:45:57 skrll Exp $
-#
+# $NetBSD: Makefile,v 1.5 2001/11/13 21:19:04 jlam Exp $
 
 DISTNAME=	kdegraphics-2.2.1
-CATEGORIES=	graphics kde
-.include "../../x11/kde2/Makefile.part1"
+CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
-DEPENDS+=	kdebase>=2.2.1:../../x11/kdebase2
+.include "../../x11/kde2/Makefile.kde2"
+
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 DEPENDS+=	ghostscript>=6.01:../../print/ghostscript
 #DEPENDS+=	gPhoto2
 #DEPENDS+=	gpio
 
-LTCONFIG_OVERRIDE+=	${WRKSRC}/kdvi/kpathsea/ltconfig
+USE_BUILDLINK_ONLY=	YES
+
+CONFIGURE_ARGS+=	--without-kamera	# requires gPhoto2, gpio
 
-.include "../../x11/kde2/Makefile.part2"
+.include "../../mk/bsd.prefs.mk"
 
-LIBS=		-Wl,--export-dynamic
+.if ${OPSYS} == "NetBSD"
+LIBS=			-Wl,--export-dynamic
+.endif
 
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo
index 312d5f7b9d8..9ba2871c19d 100644
--- a/graphics/kdegraphics2/distinfo
+++ b/graphics/kdegraphics2/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/10/15 22:45:57 skrll Exp $
+$NetBSD: distinfo,v 1.5 2001/11/13 21:19:04 jlam Exp $
 
 SHA1 (kdegraphics-2.2.1.tar.bz2) = d52ec093915707b127f819cef0cad94d77e3119a
 Size (kdegraphics-2.2.1.tar.bz2) = 1633641 bytes
+SHA1 (patch-aa) = c75f965bb3b6141e216f36ed8be1a1c3b9c6a287
diff --git a/graphics/kdegraphics2/patches/patch-aa b/graphics/kdegraphics2/patches/patch-aa
new file mode 100644
index 00000000000..77e7b7b0fb7
--- /dev/null
+++ b/graphics/kdegraphics2/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2001/11/13 21:19:05 jlam Exp $
+
+--- configure.orig	Fri Sep  7 20:41:01 2001
++++ configure
+@@ -8368,6 +8368,7 @@
+ sane_includes="-I$ac_sane_includes"
+ sane_libdir=""
+ 
++ac_sane_includes=NO
+ if test -n "$ac_sane_includes" && test -r "$ac_sane_includes/sane.h"; then
+   
+   sane_libdirs="/usr/lib /usr/local/lib /usr/lib/sane /usr/local/lib/sane"