[pkgsrc/pkgsrc-2022Q2]: pkgsrc/x11/libXft Pullup ticket #6648 - requested by nia

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/746fcad546d6
branches:  pkgsrc-2022Q2
changeset: 381561:746fcad546d6
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jul 09 10:48:24 2022 +0000

description:
Pullup ticket #6648 - requested by nia
x11/libXft: NetBSD 8 build fix

Revisions pulled up:
- x11/libXft/Makefile                                           1.26

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Fri Jul  8 06:39:57 UTC 2022

   Modified Files:
        pkgsrc/x11/libXft: Makefile

   Log Message:
   PR pkg/56909 libXft cannot avoid-duplicate because the native fontconfig
   is always ignored on NetBSD 8 due to a (possibly wrong for native Xorg)
   ABI_DEPENDS setting elsewhere in pkgsrc

diffstat:

 x11/libXft/Makefile |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r 324e5ffac88f -r 746fcad546d6 x11/libXft/Makefile
--- a/x11/libXft/Makefile       Sat Jul 09 10:48:17 2022 +0000
+++ b/x11/libXft/Makefile       Sat Jul 09 10:48:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:15 nia Exp $
+# $NetBSD: Makefile,v 1.25.2.1 2022/07/09 10:48:24 bsiegert Exp $
 
 DISTNAME=      libXft-2.3.4
 CATEGORIES=    x11 fonts
@@ -16,8 +16,6 @@
 USE_TOOLS+=            pkg-config
 PKGCONFIG_OVERRIDE=    xft.pc.in
 
-X11_LIB_NAME?=         libXft
-.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"