CVS commit: [pkgsrc-2021Q4] pkgsrc/x11/xkeyboard-config

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jan 30 16:54:39 UTC 2022

Modified Files:
        pkgsrc/x11/xkeyboard-config [pkgsrc-2021Q4]: Makefile

Log Message:
Pullup ticket #6573 - requested by nia
x11/xkeyboard-config: build fix

Revisions pulled up:
- x11/xkeyboard-config/Makefile                                 1.48

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Tue Jan 25 11:16:57 UTC 2022

   Modified Files:
        pkgsrc/x11/xkeyboard-config: Makefile

   Log Message:
   xkeyboard-config: remove avoid-duplicate.mk

   PR pkg/56667 (tigervnc dropped from binary packages)


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.2.1 pkgsrc/x11/xkeyboard-config/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/xkeyboard-config/Makefile
diff -u pkgsrc/x11/xkeyboard-config/Makefile:1.47 pkgsrc/x11/xkeyboard-config/Makefile:1.47.2.1
--- pkgsrc/x11/xkeyboard-config/Makefile:1.47   Wed Dec  1 13:01:16 2021
+++ pkgsrc/x11/xkeyboard-config/Makefile        Sun Jan 30 16:54:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2021/12/01 13:01:16 nia Exp $
+# $NetBSD: Makefile,v 1.47.2.1 2022/01/30 16:54:39 bsiegert Exp $
 
 DISTNAME=              xkeyboard-config-2.34
 CATEGORIES=            x11
@@ -55,8 +55,6 @@ OWN_DIRS+=            ${XKBCOMPDIR}
 
 BUILDLINK_DEPMETHOD.gettext=   build   # for the configure only
 .include "../../devel/gettext-lib/buildlink3.mk"
-X11_BUILTIN_NAME=      xkeyboard-config
-.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"