Sun Dec 27 02:33:27 2020 UTC ()
Fix librsvg dependency patterns.

For the rust case, drop the redundant ancient API version and always add
the default ABI version, even if a package already specified one.

For the C case, provide an upper limit for both the API and ABI version,
so that the merge logic handles the cases correctly. Most noticable,
don't provide separate upper and lower limits.


(joerg)
diff -r1.60 -r1.61 pkgsrc/graphics/librsvg/buildlink3.mk
cvs diff -r1.60 -r1.61 pkgsrc/graphics/librsvg/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/librsvg/buildlink3.mk 2020/11/05 09:06:55 1.60
+++ pkgsrc/graphics/librsvg/buildlink3.mk 2020/12/27 02:33:27 1.61
@@ -1,35 +1,32 @@ @@ -1,35 +1,32 @@
1# $NetBSD: buildlink3.mk,v 1.60 2020/11/05 09:06:55 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.61 2020/12/27 02:33:27 joerg Exp $
2 2
3BUILDLINK_TREE+= librsvg 3BUILDLINK_TREE+= librsvg
4 4
5.if !defined(LIBRSVG_BUILDLINK3_MK) 5.if !defined(LIBRSVG_BUILDLINK3_MK)
6LIBRSVG_BUILDLINK3_MK:= 6LIBRSVG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1 
9 
10.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
11 9
12.include "../../graphics/librsvg/available.mk" 10.include "../../graphics/librsvg/available.mk"
13 11
14.if ${LIBRSVG_TYPE} == "rust" 12.if ${LIBRSVG_TYPE} == "rust"
15BUILDLINK_ABI_DEPENDS.librsvg?= librsvg>=2.48.3nb3 
16BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg 13BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
 14BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.48.3nb3
17BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.41 15BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.41
18BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.48.0 
19.elif ${LIBRSVG_TYPE} == "c" 16.elif ${LIBRSVG_TYPE} == "c"
20BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg-c 17BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg-c
21BUILDLINK_API_DEPENDS.librsvg+= librsvg<2.41 18BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.40.20nb4<2.41
22BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.40.20nb4 19BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1<2.41
23 20
24.include "../../textproc/libcroco/buildlink3.mk" 21.include "../../textproc/libcroco/buildlink3.mk"
25.else 22.else
26PKG_FAIL_REASON+= "[graphics/librsvg/buildlink3.mk] Invalid value ${LIBRSVG_TYPE} for LIBRSVG_TYPE." 23PKG_FAIL_REASON+= "[graphics/librsvg/buildlink3.mk] Invalid value ${LIBRSVG_TYPE} for LIBRSVG_TYPE."
27.endif 24.endif
28 25
29.include "../../devel/pango/buildlink3.mk" 26.include "../../devel/pango/buildlink3.mk"
30.include "../../graphics/cairo/buildlink3.mk" 27.include "../../graphics/cairo/buildlink3.mk"
31.include "../../graphics/cairo-gobject/buildlink3.mk" 28.include "../../graphics/cairo-gobject/buildlink3.mk"
32.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 29.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
33.endif # LIBRSVG_BUILDLINK3_MK 30.endif # LIBRSVG_BUILDLINK3_MK
34 31
35BUILDLINK_TREE+= -librsvg 32BUILDLINK_TREE+= -librsvg