CVS commit: pkgsrc/graphics/librsvg

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Dec 27 02:33:27 UTC 2020

Modified Files:
        pkgsrc/graphics/librsvg: buildlink3.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/librsvg/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/librsvg/buildlink3.mk
diff -u pkgsrc/graphics/librsvg/buildlink3.mk:1.60 pkgsrc/graphics/librsvg/buildlink3.mk:1.61
--- pkgsrc/graphics/librsvg/buildlink3.mk:1.60  Thu Nov  5 09:06:55 2020
+++ pkgsrc/graphics/librsvg/buildlink3.mk       Sun Dec 27 02:33:27 2020
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.60 2020/11/05 09:06:55 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2020/12/27 02:33:27 joerg Exp $
 
 BUILDLINK_TREE+=       librsvg
 
 .if !defined(LIBRSVG_BUILDLINK3_MK)
 LIBRSVG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.librsvg+=                librsvg>=2.12.6nb1
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 .include "../../graphics/librsvg/available.mk"
 
 .if ${LIBRSVG_TYPE} == "rust"
-BUILDLINK_ABI_DEPENDS.librsvg?=        librsvg>=2.48.3nb3
 BUILDLINK_PKGSRCDIR.librsvg?=  ../../graphics/librsvg
+BUILDLINK_ABI_DEPENDS.librsvg+=        librsvg>=2.48.3nb3
 BUILDLINK_API_DEPENDS.librsvg+=        librsvg>=2.41
-BUILDLINK_ABI_DEPENDS.librsvg+=        librsvg>=2.48.0
 .elif ${LIBRSVG_TYPE} == "c"
 BUILDLINK_PKGSRCDIR.librsvg?=  ../../graphics/librsvg-c
-BUILDLINK_API_DEPENDS.librsvg+=        librsvg<2.41
-BUILDLINK_ABI_DEPENDS.librsvg+=        librsvg>=2.40.20nb4
+BUILDLINK_ABI_DEPENDS.librsvg+=        librsvg>=2.40.20nb4<2.41
+BUILDLINK_API_DEPENDS.librsvg+=        librsvg>=2.12.6nb1<2.41
 
 .include "../../textproc/libcroco/buildlink3.mk"
 .else