CVS commit: [pkgsrc-2022Q2] pkgsrc/x11/libXft

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jul  9 10:48:25 UTC 2022

Modified Files:
        pkgsrc/x11/libXft [pkgsrc-2022Q2]: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.2.1 pkgsrc/x11/libXft/Makefile

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

Modified files:

Index: pkgsrc/x11/libXft/Makefile
diff -u pkgsrc/x11/libXft/Makefile:1.25 pkgsrc/x11/libXft/Makefile:1.25.2.1
--- pkgsrc/x11/libXft/Makefile:1.25     Sun Apr 10 08:53:15 2022
+++ pkgsrc/x11/libXft/Makefile  Sat Jul  9 10:48:24 2022
@@ -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_LIBTOOL=          YES
 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"