Re: fontconfig and x11-links

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Mon, Mar 19, 2018 at 08:27:44PM -0600, Greg Oster wrote:
> On Mon, 19 Mar 2018 23:22:28 +0100
> Thomas Klausner <wiz%NetBSD.org@localhost> wrote:
> 
> > We thought of extending the sed to make any non-xorgproto version
> > 2007.x for now (with arbitrary x) and lowering the minimum requirement
> > in xorgproto/bl3.mk to that version. But so far it's just an idea
> > without implementation or testing if it even improves the situation.
> 
> So what are those of us running a release with 7.1 xorg supposed to do
> to upgrade packages?

Try this untested patch?
 Thomas

Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorgproto/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- buildlink3.mk	7 Mar 2018 12:00:13 -0000	1.2
+++ buildlink3.mk	20 Mar 2018 07:19:28 -0000
@@ -5,7 +5,7 @@
 .if !defined(XORGPROTO_BUILDLINK3_MK)
 XORGPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xorgproto+=	xorgproto>=2018.1
+BUILDLINK_API_DEPENDS.xorgproto+=	xorgproto>=2017.1
 BUILDLINK_PKGSRCDIR.xorgproto?=		../../x11/xorgproto
 BUILDLINK_DEPMETHOD.xorgproto?=		build
 .endif	# XORGPROTO_BUILDLINK3_MK
Index: builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorgproto/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- builtin.mk	14 Mar 2018 09:37:35 -0000	1.2
+++ builtin.mk	20 Mar 2018 07:19:28 -0000
@@ -47,7 +47,8 @@
 
 BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n \
 	-e 's/Version: 7\.0\.31/2018.1/p' \
-	-e 's/Version: 7\.0\.32/2018.4/p'
+	-e 's/Version: 7\.0\.32/2018.4/p' \
+	-e 's/Version: 7\..*/2017.1/p'
 
 .for _p in ${PRE_XORGPROTO_LIST}
 PKGCONFIG_FILE.xorgproto=	${X11BASE}/lib/pkgconfig/${_p}.pc