CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Dec  3 12:50:14 UTC 2021

Modified Files:
        pkgsrc/x11/xf86-input-acecad: Makefile
        pkgsrc/x11/xf86-input-elographics: Makefile
        pkgsrc/x11/xf86-input-fpit: Makefile
        pkgsrc/x11/xf86-input-hyperpen: Makefile
        pkgsrc/x11/xf86-input-joystick: Makefile
        pkgsrc/x11/xf86-input-keyboard: Makefile
        pkgsrc/x11/xf86-input-mouse: Makefile
        pkgsrc/x11/xf86-input-mutouch: Makefile
        pkgsrc/x11/xf86-input-penmount: Makefile
        pkgsrc/x11/xf86-input-vmmouse: Makefile
        pkgsrc/x11/xf86-input-void: Makefile
        pkgsrc/x11/xf86-input-ws: Makefile

Log Message:
xf86-input-*: Add avoid-duplicate.mk


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xf86-input-acecad/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-elographics/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xf86-input-fpit/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-hyperpen/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xf86-input-joystick/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/xf86-input-mouse/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-mutouch/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xf86-input-penmount/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xf86-input-void/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xf86-input-ws/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/xf86-input-acecad/Makefile
diff -u pkgsrc/x11/xf86-input-acecad/Makefile:1.11 pkgsrc/x11/xf86-input-acecad/Makefile:1.12
--- pkgsrc/x11/xf86-input-acecad/Makefile:1.11  Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-acecad/Makefile       Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-acecad-1.5.0
 PKGREVISION=   5
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-acecad
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"

Index: pkgsrc/x11/xf86-input-elographics/Makefile
diff -u pkgsrc/x11/xf86-input-elographics/Makefile:1.8 pkgsrc/x11/xf86-input-elographics/Makefile:1.9
--- pkgsrc/x11/xf86-input-elographics/Makefile:1.8      Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-elographics/Makefile  Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-elographics-1.4.2
 CATEGORIES=    x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-elographics
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-input-fpit/Makefile
diff -u pkgsrc/x11/xf86-input-fpit/Makefile:1.7 pkgsrc/x11/xf86-input-fpit/Makefile:1.8
--- pkgsrc/x11/xf86-input-fpit/Makefile:1.7     Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-fpit/Makefile Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-fpit-1.4.0
 PKGREVISION=   2
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-fpit
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"

Index: pkgsrc/x11/xf86-input-hyperpen/Makefile
diff -u pkgsrc/x11/xf86-input-hyperpen/Makefile:1.8 pkgsrc/x11/xf86-input-hyperpen/Makefile:1.9
--- pkgsrc/x11/xf86-input-hyperpen/Makefile:1.8 Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-hyperpen/Makefile     Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-hyperpen-1.4.1
 PKGREVISION=   2
@@ -20,6 +20,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-hyperpen
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-input-joystick/Makefile
diff -u pkgsrc/x11/xf86-input-joystick/Makefile:1.11 pkgsrc/x11/xf86-input-joystick/Makefile:1.12
--- pkgsrc/x11/xf86-input-joystick/Makefile:1.11        Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-joystick/Makefile     Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-joystick-1.6.3
 PKGREVISION=   2
@@ -28,6 +28,8 @@ SUBST_FILES.usbhid+=          src/backend_bsd.c
 SUBST_SED.usbhid=              -e 's,dev/usb/,bus/u4b/,g'
 SUBST_MESSAGE.usbhid=          Correct usbhid include paths
 
+X11_BUILTIN_NAME=      xf86-input-joystick
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"

Index: pkgsrc/x11/xf86-input-keyboard/Makefile
diff -u pkgsrc/x11/xf86-input-keyboard/Makefile:1.29 pkgsrc/x11/xf86-input-keyboard/Makefile:1.30
--- pkgsrc/x11/xf86-input-keyboard/Makefile:1.29        Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-keyboard/Makefile     Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.30 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-keyboard-1.9.0
 PKGREVISION=   3
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-keyboard
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"

Index: pkgsrc/x11/xf86-input-mouse/Makefile
diff -u pkgsrc/x11/xf86-input-mouse/Makefile:1.32 pkgsrc/x11/xf86-input-mouse/Makefile:1.33
--- pkgsrc/x11/xf86-input-mouse/Makefile:1.32   Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-mouse/Makefile        Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.33 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-mouse-1.9.3
 CATEGORIES=    x11
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-mouse
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-input-mutouch/Makefile
diff -u pkgsrc/x11/xf86-input-mutouch/Makefile:1.8 pkgsrc/x11/xf86-input-mutouch/Makefile:1.9
--- pkgsrc/x11/xf86-input-mutouch/Makefile:1.8  Tue Nov  2 08:20:24 2021
+++ pkgsrc/x11/xf86-input-mutouch/Makefile      Fri Dec  3 12:50:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/02 08:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/03 12:50:13 nia Exp $
 
 DISTNAME=      xf86-input-mutouch-1.3.0
 PKGREVISION=   2
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-mutouch
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-input-penmount/Makefile
diff -u pkgsrc/x11/xf86-input-penmount/Makefile:1.11 pkgsrc/x11/xf86-input-penmount/Makefile:1.12
--- pkgsrc/x11/xf86-input-penmount/Makefile:1.11        Tue Nov  2 08:20:25 2021
+++ pkgsrc/x11/xf86-input-penmount/Makefile     Fri Dec  3 12:50:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/03 12:50:14 nia Exp $
 
 DISTNAME=      xf86-input-penmount-1.5.0
 PKGREVISION=   5
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-penmount
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"

Index: pkgsrc/x11/xf86-input-vmmouse/Makefile
diff -u pkgsrc/x11/xf86-input-vmmouse/Makefile:1.26 pkgsrc/x11/xf86-input-vmmouse/Makefile:1.27
--- pkgsrc/x11/xf86-input-vmmouse/Makefile:1.26 Tue Nov  2 08:20:25 2021
+++ pkgsrc/x11/xf86-input-vmmouse/Makefile      Fri Dec  3 12:50:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.27 2021/12/03 12:50:14 nia Exp $
 
 DISTNAME=      xf86-input-vmmouse-13.1.0
 PKGREVISION=   2
@@ -25,6 +25,8 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=
 # Currently libudev is unsupported in pkgsrc
 CONFIGURE_ARGS+=       --without-libudev
 
+X11_BUILTIN_NAME=      xf86-input-vmmouse
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-input-void/Makefile
diff -u pkgsrc/x11/xf86-input-void/Makefile:1.19 pkgsrc/x11/xf86-input-void/Makefile:1.20
--- pkgsrc/x11/xf86-input-void/Makefile:1.19    Tue Nov  2 08:20:25 2021
+++ pkgsrc/x11/xf86-input-void/Makefile Fri Dec  3 12:50:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/03 12:50:14 nia Exp $
 
 DISTNAME=      xf86-input-void-1.4.1
 PKGREVISION=   2
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=      partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=      xf86-input-void
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-input-ws/Makefile
diff -u pkgsrc/x11/xf86-input-ws/Makefile:1.5 pkgsrc/x11/xf86-input-ws/Makefile:1.6
--- pkgsrc/x11/xf86-input-ws/Makefile:1.5       Tue Nov  2 08:20:25 2021
+++ pkgsrc/x11/xf86-input-ws/Makefile   Fri Dec  3 12:50:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/03 12:50:14 nia Exp $
 
 DISTNAME=      xf86-input-ws-1.3.0.20151010
 PKGREVISION=   2
@@ -17,6 +17,8 @@ USE_TOOLS+=   pkg-config
 
 RELRO_SUPPORTED=       partial
 
+X11_BUILTIN_NAME=      xf86-input-ws
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"