diff options
| author | spz <spz@pkgsrc.org> | 2012-08-16 20:30:18 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2012-08-16 20:30:18 +0000 |
| commit | 285801b9cca250f6cbce7ca4d31521c2cdd82b79 (patch) | |
| tree | ca2de06bd6f1aafff8e2eb9e39cb50a62b75ec7d | |
| parent | e3d2f859db51572521819f77eee2fca09d1123dd (diff) | |
| download | pkgsrc-285801b9cca250f6cbce7ca4d31521c2cdd82b79.tar.gz | |
Pullup ticket #3900 - requested by markd
misc/kdepimlibs4: functionality fix
Revisions pulled up:
- misc/kdepimlibs4/Makefile 1.34
- misc/kdepimlibs4/buildlink3.mk 1.21
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: markd
Date: Tue Jul 24 22:14:35 UTC 2012
Modified Files:
pkgsrc/misc/kdepimlibs4: Makefile buildlink3.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/misc/kdepimlibs4/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/misc/kdepimlibs4/buildlink3.mk
| -rw-r--r-- | misc/kdepimlibs4/Makefile | 5 | ||||
| -rw-r--r-- | misc/kdepimlibs4/buildlink3.mk | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile index 6d62cc652c6..9dc9bfec9e7 100644 --- a/misc/kdepimlibs4/Makefile +++ b/misc/kdepimlibs4/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2012/06/16 04:45:32 markd Exp $ +# $NetBSD: Makefile,v 1.32.2.1 2012/08/16 20:30:18 spz Exp $ DISTNAME= kdepimlibs-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} +PKGREVISION= 2 CATEGORIES= misc COMMENT= Support libraries for PIM for the KDE integrated X11 desktop @@ -17,7 +18,9 @@ BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52 .include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" +.if ${OPSYS} == "Linux" .include "../../devel/libuuid/buildlink3.mk" +.endif .include "../../mail/akonadi/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" diff --git a/misc/kdepimlibs4/buildlink3.mk b/misc/kdepimlibs4/buildlink3.mk index b5362e8db63..41397a19bf4 100644 --- a/misc/kdepimlibs4/buildlink3.mk +++ b/misc/kdepimlibs4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2012/06/14 22:09:13 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.19.2.1 2012/08/16 20:30:18 spz Exp $ BUILDLINK_TREE+= kdepimlibs @@ -9,9 +9,13 @@ BUILDLINK_API_DEPENDS.kdepimlibs+= kdepimlibs4>=4.0.0 BUILDLINK_ABI_DEPENDS.kdepimlibs+= kdepimlibs4>=4.8.2nb2 BUILDLINK_PKGSRCDIR.kdepimlibs?= ../../misc/kdepimlibs4 +.include "../../mk/bsd.fast.prefs.mk" + .include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" +.if ${OPSYS} == "Linux" .include "../../devel/libuuid/buildlink3.mk" +.endif .include "../../mail/akonadi/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" |