Sat Jan 4 16:21:00 2014 UTC ()
Remove --with-xinput configure argument.

--with-xinput was renamed --enable-xinput a while ago, and then removed
completely. XINPUT2 is no longer optional.


(prlw1)
diff -r1.5 -r1.6 pkgsrc/x11/gtk3/options.mk
cvs diff -r1.5 -r1.6 pkgsrc/x11/gtk3/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/options.mk 2013/05/11 19:49:15 1.5
+++ pkgsrc/x11/gtk3/options.mk 2014/01/04 16:21:00 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2013/05/11 19:49:15 riastradh Exp $ 1# $NetBSD: options.mk,v 1.6 2014/01/04 16:21:00 prlw1 Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3 3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3
4PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug 4PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug
5PKG_OPTIONS_REQUIRED_GROUPS= gdk-target 5PKG_OPTIONS_REQUIRED_GROUPS= gdk-target
6PKG_OPTIONS_GROUP.gdk-target= x11 6PKG_OPTIONS_GROUP.gdk-target= x11
7.if exists(/System/Library/Frameworks/Quartz.framework) 7.if exists(/System/Library/Frameworks/Quartz.framework)
8PKG_OPTIONS_GROUP.gdk-target+= quartz 8PKG_OPTIONS_GROUP.gdk-target+= quartz
9.endif 9.endif
10PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11 10PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14PLIST_VARS+= cups 14PLIST_VARS+= cups
@@ -22,27 +22,26 @@ CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG= @@ -22,27 +22,26 @@ CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=
22.if !empty(PKG_OPTIONS:Mdebug) 22.if !empty(PKG_OPTIONS:Mdebug)
23CONFIGURE_ARGS+= --enable-debug=yes 23CONFIGURE_ARGS+= --enable-debug=yes
24.endif 24.endif
25 25
26### 26###
27### GDK target 27### GDK target
28### 28###
29PLIST_VARS+= quartz x11 29PLIST_VARS+= quartz x11
30.if !empty(PKG_OPTIONS:Mquartz) 30.if !empty(PKG_OPTIONS:Mquartz)
31CONFIGURE_ARGS+= --without-x 31CONFIGURE_ARGS+= --without-x
32CONFIGURE_ARGS+= --enable-quartz-backend 32CONFIGURE_ARGS+= --enable-quartz-backend
33PLIST.quartz= yes 33PLIST.quartz= yes
34.else 34.else
35CONFIGURE_ARGS+= --with-xinput=xfree 
36CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no 35CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no
37CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no 36CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no
38PLIST.x11= yes 37PLIST.x11= yes
39 38
40. if !empty(PKG_OPTIONS:Mgtk3-atk-bridge) 39. if !empty(PKG_OPTIONS:Mgtk3-atk-bridge)
41BUILDLINK_API_DEPENDS.at-spi2-atk+= at-spi2-atk>=2.6.1 40BUILDLINK_API_DEPENDS.at-spi2-atk+= at-spi2-atk>=2.6.1
42. include "../../devel/at-spi2-atk/buildlink3.mk" 41. include "../../devel/at-spi2-atk/buildlink3.mk"
43. else 42. else
44CONFIGURE_ARGS+= --without-atk-bridge 43CONFIGURE_ARGS+= --without-atk-bridge
45. endif 44. endif
46 45
47BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 46BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2
48 47