CVS commit: pkgsrc/x11

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec 22 00:39:19 UTC 2021

Modified Files:
        pkgsrc/x11/xcb-proto: Makefile
        pkgsrc/x11/xorgproto: Makefile

Log Message:
Remove more problematic avoid-duplicate


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xcb-proto/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xorgproto/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/xcb-proto/Makefile
diff -u pkgsrc/x11/xcb-proto/Makefile:1.25 pkgsrc/x11/xcb-proto/Makefile:1.26
--- pkgsrc/x11/xcb-proto/Makefile:1.25  Wed Dec  8 16:07:15 2021
+++ pkgsrc/x11/xcb-proto/Makefile       Wed Dec 22 00:39:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/12/08 16:07:15 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/12/22 00:39:19 nia Exp $
 
 DISTNAME=      xcb-proto-1.14.1
 PKGREVISION=   3
@@ -22,8 +22,6 @@ CONFIGURE_ENV+=               XMLLLINT=${BUILDLINK_PR
 # XXX just for the "configure" check
 PYTHON_FOR_BUILD_ONLY= tool
 .include "../../lang/python/application.mk"
-X11_BUILTIN_NAME=      xcb-proto
-.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_DEPMETHOD.libxml2?=  build
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xorgproto/Makefile
diff -u pkgsrc/x11/xorgproto/Makefile:1.19 pkgsrc/x11/xorgproto/Makefile:1.20
--- pkgsrc/x11/xorgproto/Makefile:1.19  Wed Dec  1 13:01:17 2021
+++ pkgsrc/x11/xorgproto/Makefile       Wed Dec 22 00:39:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/12/01 13:01:17 nia Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/22 00:39:19 nia Exp $
 
 DISTNAME=              xorgproto-2021.5
 PKGREVISION=           1
@@ -51,6 +51,4 @@ PKGCONFIG_OVERRIDE+=  xineramaproto.pc.in
 PKGCONFIG_OVERRIDE+=   xproto.pc.in
 PKGCONFIG_OVERRIDE+=   xproxymngproto.pc.in
 
-X11_BUILTIN_NAME=      xorgproto
-.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../mk/bsd.pkg.mk"