Tue Jul 24 22:14:35 2012 UTC ()
Only depend on libuuid on Linux, for the time being.  Adding it causes
Plasma Desktop to break on at least NetBSD.  Fixes PR pkg/46674.


(markd)
diff -r1.33 -r1.34 pkgsrc/misc/kdepimlibs4/Makefile
diff -r1.20 -r1.21 pkgsrc/misc/kdepimlibs4/buildlink3.mk
cvs diff -r1.33 -r1.34 pkgsrc/misc/kdepimlibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/kdepimlibs4/Makefile 2012/07/02 13:37:40 1.33
+++ pkgsrc/misc/kdepimlibs4/Makefile 2012/07/24 22:14:35 1.34
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.33 2012/07/02 13:37:40 adam Exp $ 1# $NetBSD: Makefile,v 1.34 2012/07/24 22:14:35 markd Exp $
2 2
3DISTNAME= kdepimlibs-${_KDE_VERSION} 3DISTNAME= kdepimlibs-${_KDE_VERSION}
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= misc 6CATEGORIES= misc
7COMMENT= Support libraries for PIM for the KDE integrated X11 desktop 7COMMENT= Support libraries for PIM for the KDE integrated X11 desktop
8 8
9.include "../../meta-pkgs/kde4/Makefile.kde4" 9.include "../../meta-pkgs/kde4/Makefile.kde4"
10 10
11CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake 11CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake
12 12
13REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl 13REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
14 14
15BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52 15BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52
16 16
17.include "../../meta-pkgs/kde4/kde4.mk" 17.include "../../meta-pkgs/kde4/kde4.mk"
18 18
19.include "../../databases/openldap-client/buildlink3.mk" 19.include "../../databases/openldap-client/buildlink3.mk"
20.include "../../devel/boost-libs/buildlink3.mk" 20.include "../../devel/boost-libs/buildlink3.mk"
 21.if ${OPSYS} == "Linux"
21.include "../../devel/libuuid/buildlink3.mk" 22.include "../../devel/libuuid/buildlink3.mk"
 23.endif
22.include "../../mail/akonadi/buildlink3.mk" 24.include "../../mail/akonadi/buildlink3.mk"
23.include "../../security/cyrus-sasl/buildlink3.mk" 25.include "../../security/cyrus-sasl/buildlink3.mk"
24.include "../../security/gpgme/buildlink3.mk" 26.include "../../security/gpgme/buildlink3.mk"
25.include "../../time/libical/buildlink3.mk" 27.include "../../time/libical/buildlink3.mk"
26.include "../../x11/kdelibs4/buildlink3.mk" 28.include "../../x11/kdelibs4/buildlink3.mk"
27 29
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/misc/kdepimlibs4/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/misc/kdepimlibs4/buildlink3.mk 2012/07/02 13:37:40 1.20
+++ pkgsrc/misc/kdepimlibs4/buildlink3.mk 2012/07/24 22:14:35 1.21
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.20 2012/07/02 13:37:40 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.21 2012/07/24 22:14:35 markd Exp $
2 2
3BUILDLINK_TREE+= kdepimlibs 3BUILDLINK_TREE+= kdepimlibs
4 4
5.if !defined(KDEPIMLIBS_BUILDLINK3_MK) 5.if !defined(KDEPIMLIBS_BUILDLINK3_MK)
6KDEPIMLIBS_BUILDLINK3_MK:= 6KDEPIMLIBS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.kdepimlibs+= kdepimlibs4>=4.0.0 8BUILDLINK_API_DEPENDS.kdepimlibs+= kdepimlibs4>=4.0.0
9BUILDLINK_ABI_DEPENDS.kdepimlibs+= kdepimlibs4>=4.8.4nb1 9BUILDLINK_ABI_DEPENDS.kdepimlibs+= kdepimlibs4>=4.8.4nb1
10BUILDLINK_PKGSRCDIR.kdepimlibs?= ../../misc/kdepimlibs4 10BUILDLINK_PKGSRCDIR.kdepimlibs?= ../../misc/kdepimlibs4
11 11
 12.include "../../mk/bsd.fast.prefs.mk"
 13
12.include "../../databases/openldap-client/buildlink3.mk" 14.include "../../databases/openldap-client/buildlink3.mk"
13.include "../../devel/boost-libs/buildlink3.mk" 15.include "../../devel/boost-libs/buildlink3.mk"
 16.if ${OPSYS} == "Linux"
14.include "../../devel/libuuid/buildlink3.mk" 17.include "../../devel/libuuid/buildlink3.mk"
 18.endif
15.include "../../mail/akonadi/buildlink3.mk" 19.include "../../mail/akonadi/buildlink3.mk"
16.include "../../security/cyrus-sasl/buildlink3.mk" 20.include "../../security/cyrus-sasl/buildlink3.mk"
17.include "../../security/gpgme/buildlink3.mk" 21.include "../../security/gpgme/buildlink3.mk"
18.include "../../x11/kdelibs4/buildlink3.mk" 22.include "../../x11/kdelibs4/buildlink3.mk"
19.endif # KDEPIMLIBS_BUILDLINK3_MK 23.endif # KDEPIMLIBS_BUILDLINK3_MK
20 24
21BUILDLINK_TREE+= -kdepimlibs 25BUILDLINK_TREE+= -kdepimlibs