Use buildlink3.mk files for the dependencies on docbook-xml and

docbook-xsl to fix build with latest cmake infrastructure.

Also fix locating rgb.txt.

3 files changed, 23 insertions, 7 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 4fd680bfdb9..5a47c40bac7 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2011/06/04 16:31:52 abs Exp $
+# $NetBSD: Makefile,v 1.27 2011/09/27 10:48:20 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -31,9 +31,6 @@ CONF_FILES+=	${PREFIX}/share/examples/kdelibs4/applications.menu \
 CONF_FILES+=	${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \
 		${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf
 
-DEPENDS+=	docbook-xml>=4.2:../../textproc/docbook-xml
-DEPENDS+=	docbook-xsl>=1.75:../../textproc/docbook-xsl
-
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
 
 REPLACE_PERL+= \
@@ -50,8 +47,9 @@ SUBST_STAGE.kdelibsfix=		pre-configure
 SUBST_MESSAGE.kdelibsfix=	Fixing hardcoded paths.
 SUBST_FILES.kdelibsfix= \
 	kde3support/kdeui/k3sconfig.cpp \
+	kdeui/colors/kcolordialog.cpp \
 	kio/kssl/kopenssl.cpp
-SUBST_SED.kdelibsfix=		-e 's:@LOCALBASE@:${LOCALBASE}:g'
+SUBST_SED.kdelibsfix=		-e 's:@LOCALBASE@:${LOCALBASE}:g' -e 's:@X11BASE@:${X11BASE}:g'
 
 USE_TOOLS+=	flex gmake
 
@@ -72,6 +70,8 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+=	shared-desktop-ontologies>=0.4
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../sysutils/strigi/buildlink3.mk"
+.include "../../textproc/docbook-xml/buildlink3.mk"
+.include "../../textproc/docbook-xsl/buildlink3.mk"
 .include "../../textproc/soprano/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 08fedca0a1e..081742eff76 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2011/06/04 16:31:52 abs Exp $
+$NetBSD: distinfo,v 1.19 2011/09/27 10:48:20 markd Exp $
 
 SHA1 (kdelibs-4.5.5.tar.bz2) = 127a2b50fe31ff345e05660dd50f7c55ae78d854
 RMD160 (kdelibs-4.5.5.tar.bz2) = 7c33afa12379119fbf7d70e8895c3f2ada9a2eba
@@ -15,4 +15,5 @@ SHA1 (patch-al) = a3c48e8552ca39496134696f3d415a7b6a4db7d8
 SHA1 (patch-am) = da04e0450885dc4bca38a4e9b91822746d936639
 SHA1 (patch-an) = b5fe924970772bd8a5b420f8cc638ab8bf892c53
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = 97baf0e5c9f53a17582d89ee41cb4d99fbd15424
+SHA1 (patch-kdeui_colors_kcolordialog.cpp) = f105006a778c42a93452fc4bf5d561aa62595a5c
 SHA1 (patch-khtml_khtml_part.cpp) = f8f5977b03463b6de909881178abed3ba351364c
diff --git a/x11/kdelibs4/patches/patch-kdeui_colors_kcolordialog.cpp b/x11/kdelibs4/patches/patch-kdeui_colors_kcolordialog.cpp
new file mode 100644
index 00000000000..152fb685496
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kdeui_colors_kcolordialog.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kdeui_colors_kcolordialog.cpp,v 1.1 2011/09/27 10:48:20 markd Exp $
+
+Find rgb.txt in pkgsrc or native
+
+--- kdeui/colors/kcolordialog.cpp.orig	2010-05-27 17:26:18.000000000 +0000
++++ kdeui/colors/kcolordialog.cpp
+@@ -627,6 +627,8 @@ static const char * const *namedColorFil
+ #ifdef X11_RGBFILE
+         X11_RGBFILE, 0,
+ #endif
++        "@X11BASE@/share/X11/rgb.txt", 0,
++        "@X11BASE@/lib/X11/rgb.txt", 0,
+         "/usr/share/X11/rgb.txt", 0,
+         "/usr/X11R6/lib/X11/rgb.txt", 0,
+         "/usr/openwin/lib/X11/rgb.txt", 0, // for Solaris.