Thu Jun 26 09:27:04 2014 UTC ()
Limit BUILDLINK_API_DEPENDS to <1.7 to ensure the wrong cups doesn't get
pulled in, should fix bulk build failures seen with a number of packages.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/print/cups15/buildlink3.mk
cvs diff -r1.2 -r1.3 pkgsrc/print/cups15/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/cups15/Attic/buildlink3.mk 2014/06/18 10:33:30 1.2
+++ pkgsrc/print/cups15/Attic/buildlink3.mk 2014/06/26 09:27:04 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.2 2014/06/18 10:33:30 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2014/06/26 09:27:04 jperkin Exp $
2 2
3BUILDLINK_TREE+= cups 3BUILDLINK_TREE+= cups
4 4
5.if !defined(CUPS_BUILDLINK3_MK) 5.if !defined(CUPS_BUILDLINK3_MK)
6CUPS_BUILDLINK3_MK:= 6CUPS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3 8BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3<1.7
9BUILDLINK_ABI_DEPENDS.cups+= cups>=1.5.4nb9<1.7 9BUILDLINK_ABI_DEPENDS.cups+= cups>=1.5.4nb9<1.7
10BUILDLINK_PKGSRCDIR.cups?= ../../print/cups15 10BUILDLINK_PKGSRCDIR.cups?= ../../print/cups15
11 11
12pkgbase := cups 12pkgbase := cups
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos) 15.if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos)
16.include "../../mk/krb5.buildlink3.mk" 16.include "../../mk/krb5.buildlink3.mk"
17.endif 17.endif
18 18
19.if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd) 19.if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd)
20.include "../../net/mDNSResponder/buildlink3.mk" 20.include "../../net/mDNSResponder/buildlink3.mk"
21.endif 21.endif