Thu Sep 29 19:31:59 2011 UTC ()
Revert to previous way of specifying docbook-{xml,xsl} dependencies.
buildlink was causing a work-directory path to remain in the installed
package.


(markd)
diff -r1.27 -r1.28 pkgsrc/x11/kdelibs4/Makefile
cvs diff -r1.27 -r1.28 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2011/09/27 10:48:20 1.27
+++ pkgsrc/x11/kdelibs4/Makefile 2011/09/29 19:31:58 1.28
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.27 2011/09/27 10:48:20 markd Exp $ 1# $NetBSD: Makefile,v 1.28 2011/09/29 19:31:58 markd Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGREVISION= 5 4PKGREVISION= 6
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,26 +21,29 @@ CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qt @@ -21,26 +21,29 @@ 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
34INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8 37INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
35 38
36REPLACE_PERL+= \ 39REPLACE_PERL+= \
37 kio/proxytype.pl \ 40 kio/proxytype.pl \
38 kio/useragent.pl \ 41 kio/useragent.pl \
39 kio/misc/fileshareset \ 42 kio/misc/fileshareset \
40 kdeui/preparetips \ 43 kdeui/preparetips \
41 plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl 44 plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl
42 45
43CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh 46CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh
44 47
45SUBST_CLASSES+= kdelibsfix 48SUBST_CLASSES+= kdelibsfix
46SUBST_STAGE.kdelibsfix= pre-configure 49SUBST_STAGE.kdelibsfix= pre-configure
@@ -60,28 +63,26 @@ USE_TOOLS+= flex gmake @@ -60,28 +63,26 @@ USE_TOOLS+= flex gmake
60DEPENDS+= zonetab-[0-9]*:../../time/zonetab 63DEPENDS+= zonetab-[0-9]*:../../time/zonetab
61.endif 64.endif
62 65
63BUILDLINK_DEPMETHOD.qt4-tools= full 66BUILDLINK_DEPMETHOD.qt4-tools= full
64.include "../../meta-pkgs/kde4/kde4.mk" 67.include "../../meta-pkgs/kde4/kde4.mk"
65 68
66BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 69BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
67BUILDLINK_API_DEPENDS.soprano+= soprano>=2.3.0 70BUILDLINK_API_DEPENDS.soprano+= soprano>=2.3.0
68BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4 71BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4
69 72
70.include "../../archivers/bzip2/buildlink3.mk" 73.include "../../archivers/bzip2/buildlink3.mk"
71.include "../../archivers/xz/buildlink3.mk" 74.include "../../archivers/xz/buildlink3.mk"
72.include "../../sysutils/strigi/buildlink3.mk" 75.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" 76.include "../../textproc/soprano/buildlink3.mk"
76.include "../../databases/shared-mime-info/buildlink3.mk" 77.include "../../databases/shared-mime-info/buildlink3.mk"
77.include "../../devel/pcre/buildlink3.mk" 78.include "../../devel/pcre/buildlink3.mk"
78.include "../../devel/zlib/buildlink3.mk" 79.include "../../devel/zlib/buildlink3.mk"
79.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 80.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
80.include "../../graphics/jasper/buildlink3.mk" 81.include "../../graphics/jasper/buildlink3.mk"
81.include "../../mk/jpeg.buildlink3.mk" 82.include "../../mk/jpeg.buildlink3.mk"
82.include "../../mk/giflib.buildlink3.mk" 83.include "../../mk/giflib.buildlink3.mk"
83.include "../../graphics/openexr/buildlink3.mk" 84.include "../../graphics/openexr/buildlink3.mk"
84.include "../../misc/attica/buildlink3.mk" 85.include "../../misc/attica/buildlink3.mk"
85.include "../../multimedia/phonon/buildlink3.mk" 86.include "../../multimedia/phonon/buildlink3.mk"
86 87
87# Avahi ? rather than mDNSResponder 88# Avahi ? rather than mDNSResponder