Tue Sep 27 10:48:21 2011 UTC ()
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.


(markd)
diff -r1.26 -r1.27 pkgsrc/x11/kdelibs4/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/kdelibs4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kdelibs4/patches/patch-kdeui_colors_kcolordialog.cpp
cvs diff -r1.26 -r1.27 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2011/06/04 16:31:52 1.26
+++ pkgsrc/x11/kdelibs4/Makefile 2011/09/27 10:48:20 1.27
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.26 2011/06/04 16:31:52 abs Exp $ 1# $NetBSD: Makefile,v 1.27 2011/09/27 10:48:20 markd Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= x11 5CATEGORIES= x11
6COMMENT= Support libraries for the KDE integrated X11 desktop 6COMMENT= Support libraries for the KDE integrated X11 desktop
7 7
8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
9# http://mirrors.isc.org/pub/kde/security_patches/ 9# http://mirrors.isc.org/pub/kde/security_patches/
10#PATCHFILES= post-kde-4.0.3-khtml.diff 10#PATCHFILES= post-kde-4.0.3-khtml.diff
11 11
12.include "../../meta-pkgs/kde4/Makefile.kde4" 12.include "../../meta-pkgs/kde4/Makefile.kde4"
13 13
14CONFLICTS= kdelibs-[0-9]* 14CONFLICTS= kdelibs-[0-9]*
15 15
16# BUILD_MAKE_FLAGS+= VERBOSE=1 16# BUILD_MAKE_FLAGS+= VERBOSE=1
17 17
@@ -21,67 +21,67 @@ CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qt @@ -21,67 +21,67 @@ CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qt
21 21
22CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc" 22CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc"
23CMAKE_ARGS+= -DWITH_Avahi:BOOL=off 23CMAKE_ARGS+= -DWITH_Avahi:BOOL=off
24 24
25CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include 25CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
26CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so 26CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
27 27
28MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus 28MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus
29CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \ 29CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \
30 ${PKG_SYSCONFDIR}/xdg/menus/applications.menu 30 ${PKG_SYSCONFDIR}/xdg/menus/applications.menu
31CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \ 31CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \
32 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf 32 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf
33 33
34DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml 
35DEPENDS+= docbook-xsl>=1.75:../../textproc/docbook-xsl 
36 
37INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8 34INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
38 35
39REPLACE_PERL+= \ 36REPLACE_PERL+= \
40 kio/proxytype.pl \ 37 kio/proxytype.pl \
41 kio/useragent.pl \ 38 kio/useragent.pl \
42 kio/misc/fileshareset \ 39 kio/misc/fileshareset \
43 kdeui/preparetips \ 40 kdeui/preparetips \
44 plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl 41 plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl
45 42
46CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh 43CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh
47 44
48SUBST_CLASSES+= kdelibsfix 45SUBST_CLASSES+= kdelibsfix
49SUBST_STAGE.kdelibsfix= pre-configure 46SUBST_STAGE.kdelibsfix= pre-configure
50SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths. 47SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths.
51SUBST_FILES.kdelibsfix= \ 48SUBST_FILES.kdelibsfix= \
52 kde3support/kdeui/k3sconfig.cpp \ 49 kde3support/kdeui/k3sconfig.cpp \
 50 kdeui/colors/kcolordialog.cpp \
53 kio/kssl/kopenssl.cpp 51 kio/kssl/kopenssl.cpp
54SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' 52SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' -e 's:@X11BASE@:${X11BASE}:g'
55 53
56USE_TOOLS+= flex gmake 54USE_TOOLS+= flex gmake
57 55
58.include "../../mk/bsd.prefs.mk" 56.include "../../mk/bsd.prefs.mk"
59 57
60.if ${OPSYS} == "NetBSD" 58.if ${OPSYS} == "NetBSD"
61# make sure zone.tab is installed 59# make sure zone.tab is installed
62DEPENDS+= zonetab-[0-9]*:../../time/zonetab 60DEPENDS+= zonetab-[0-9]*:../../time/zonetab
63.endif 61.endif
64 62
65BUILDLINK_DEPMETHOD.qt4-tools= full 63BUILDLINK_DEPMETHOD.qt4-tools= full
66.include "../../meta-pkgs/kde4/kde4.mk" 64.include "../../meta-pkgs/kde4/kde4.mk"
67 65
68BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 66BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
69BUILDLINK_API_DEPENDS.soprano+= soprano>=2.3.0 67BUILDLINK_API_DEPENDS.soprano+= soprano>=2.3.0
70BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4 68BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4
71 69
72.include "../../archivers/bzip2/buildlink3.mk" 70.include "../../archivers/bzip2/buildlink3.mk"
73.include "../../archivers/xz/buildlink3.mk" 71.include "../../archivers/xz/buildlink3.mk"
74.include "../../sysutils/strigi/buildlink3.mk" 72.include "../../sysutils/strigi/buildlink3.mk"
 73.include "../../textproc/docbook-xml/buildlink3.mk"
 74.include "../../textproc/docbook-xsl/buildlink3.mk"
75.include "../../textproc/soprano/buildlink3.mk" 75.include "../../textproc/soprano/buildlink3.mk"
76.include "../../databases/shared-mime-info/buildlink3.mk" 76.include "../../databases/shared-mime-info/buildlink3.mk"
77.include "../../devel/pcre/buildlink3.mk" 77.include "../../devel/pcre/buildlink3.mk"
78.include "../../devel/zlib/buildlink3.mk" 78.include "../../devel/zlib/buildlink3.mk"
79.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 79.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
80.include "../../graphics/jasper/buildlink3.mk" 80.include "../../graphics/jasper/buildlink3.mk"
81.include "../../mk/jpeg.buildlink3.mk" 81.include "../../mk/jpeg.buildlink3.mk"
82.include "../../mk/giflib.buildlink3.mk" 82.include "../../mk/giflib.buildlink3.mk"
83.include "../../graphics/openexr/buildlink3.mk" 83.include "../../graphics/openexr/buildlink3.mk"
84.include "../../misc/attica/buildlink3.mk" 84.include "../../misc/attica/buildlink3.mk"
85.include "../../multimedia/phonon/buildlink3.mk" 85.include "../../multimedia/phonon/buildlink3.mk"
86 86
87# Avahi ? rather than mDNSResponder 87# Avahi ? rather than mDNSResponder
cvs diff -r1.18 -r1.19 pkgsrc/x11/kdelibs4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/distinfo 2011/06/04 16:31:52 1.18
+++ pkgsrc/x11/kdelibs4/distinfo 2011/09/27 10:48:20 1.19
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.18 2011/06/04 16:31:52 abs Exp $ 1$NetBSD: distinfo,v 1.19 2011/09/27 10:48:20 markd Exp $
2 2
3SHA1 (kdelibs-4.5.5.tar.bz2) = 127a2b50fe31ff345e05660dd50f7c55ae78d854 3SHA1 (kdelibs-4.5.5.tar.bz2) = 127a2b50fe31ff345e05660dd50f7c55ae78d854
4RMD160 (kdelibs-4.5.5.tar.bz2) = 7c33afa12379119fbf7d70e8895c3f2ada9a2eba 4RMD160 (kdelibs-4.5.5.tar.bz2) = 7c33afa12379119fbf7d70e8895c3f2ada9a2eba
5Size (kdelibs-4.5.5.tar.bz2) = 13876521 bytes 5Size (kdelibs-4.5.5.tar.bz2) = 13876521 bytes
6SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977 6SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977
7SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d 7SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d
8SHA1 (patch-ac) = 55027a8e6502a938da7a7930e079b3ce21ad2322 8SHA1 (patch-ac) = 55027a8e6502a938da7a7930e079b3ce21ad2322
9SHA1 (patch-ad) = 2a0dfd3dda071654c89b8dda3db8885e2a55ba2b 9SHA1 (patch-ad) = 2a0dfd3dda071654c89b8dda3db8885e2a55ba2b
10SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8 10SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
11SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed 11SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
12SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618 12SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
13SHA1 (patch-ak) = 03883c05a2a600737d98a889034a2fb9984a5d58 13SHA1 (patch-ak) = 03883c05a2a600737d98a889034a2fb9984a5d58
14SHA1 (patch-al) = a3c48e8552ca39496134696f3d415a7b6a4db7d8 14SHA1 (patch-al) = a3c48e8552ca39496134696f3d415a7b6a4db7d8
15SHA1 (patch-am) = da04e0450885dc4bca38a4e9b91822746d936639 15SHA1 (patch-am) = da04e0450885dc4bca38a4e9b91822746d936639
16SHA1 (patch-an) = b5fe924970772bd8a5b420f8cc638ab8bf892c53 16SHA1 (patch-an) = b5fe924970772bd8a5b420f8cc638ab8bf892c53
17SHA1 (patch-cmake_modules_FindTaglib.cmake) = 97baf0e5c9f53a17582d89ee41cb4d99fbd15424 17SHA1 (patch-cmake_modules_FindTaglib.cmake) = 97baf0e5c9f53a17582d89ee41cb4d99fbd15424
 18SHA1 (patch-kdeui_colors_kcolordialog.cpp) = f105006a778c42a93452fc4bf5d561aa62595a5c
18SHA1 (patch-khtml_khtml_part.cpp) = f8f5977b03463b6de909881178abed3ba351364c 19SHA1 (patch-khtml_khtml_part.cpp) = f8f5977b03463b6de909881178abed3ba351364c
File Added: pkgsrc/x11/kdelibs4/patches/Attic/patch-kdeui_colors_kcolordialog.cpp
$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.