Tue Sep 26 10:02:21 2017 UTC ()
scim: Remove commented out qt3 option


(wiz)
diff -r1.1 -r1.2 pkgsrc/inputmethod/scim/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/scim/options.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim/options.mk 2012/08/19 08:09:08 1.1
+++ pkgsrc/inputmethod/scim/options.mk 2017/09/26 10:02:21 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2012/08/19 08:09:08 obache Exp $ 1# $NetBSD: options.mk,v 1.2 2017/09/26 10:02:21 wiz Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.scim 4PKG_OPTIONS_VAR= PKG_OPTIONS.scim
5PKG_OPTIONS_REQUIRED_GROUPS= gtk 5PKG_OPTIONS_REQUIRED_GROUPS= gtk
6PKG_OPTIONS_GROUP.gtk= gtk gtk3 6PKG_OPTIONS_GROUP.gtk= gtk gtk3
7PKG_SUPPORTED_OPTIONS= qt 7PKG_SUPPORTED_OPTIONS= qt
8PKG_SUGGESTED_OPTIONS= gtk 8PKG_SUGGESTED_OPTIONS= gtk
9 9
10PLIST_VARS+= gtk2 gtk3 qt 10PLIST_VARS+= gtk2 gtk3 qt
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Mgtk) 14.if !empty(PKG_OPTIONS:Mgtk)
@@ -19,34 +19,26 @@ PLIST.gtk2= yes @@ -19,34 +19,26 @@ PLIST.gtk2= yes
19.else 19.else
20CONFIGURE_ARGS+= --enable-gtk2-immodule=no 20CONFIGURE_ARGS+= --enable-gtk2-immodule=no
21.endif 21.endif
22 22
23.if !empty(PKG_OPTIONS:Mgtk3) 23.if !empty(PKG_OPTIONS:Mgtk3)
24GTK3_IMMODULES= yes 24GTK3_IMMODULES= yes
25.include "../../x11/gtk3/modules.mk" 25.include "../../x11/gtk3/modules.mk"
26CONFIGURE_ARGS+= --enable-gtk3-immodule 26CONFIGURE_ARGS+= --enable-gtk3-immodule
27PLIST.gtk3= yes 27PLIST.gtk3= yes
28.else 28.else
29CONFIGURE_ARGS+= --enable-gtk3-immodule=no 29CONFIGURE_ARGS+= --enable-gtk3-immodule=no
30.endif 30.endif
31 31
32#.if !empty(PKG_OPTIONS:Mqt3) 
33#.include "../../x11/qt3-libs/buildlink3.mk" 
34#CONFIGURE_ARGS+= --enable-qt3-immodule 
35#PLIST.qt= yes 
36#.else 
37#CONFIGURE_ARGS+= --disable-qt3-immodule 
38#.endif 
39 
40.if !empty(PKG_OPTIONS:Mqt) 32.if !empty(PKG_OPTIONS:Mqt)
41.include "../../x11/qt4-libs/buildlink3.mk" 33.include "../../x11/qt4-libs/buildlink3.mk"
42CONFIGURE_ARGS+= --enable-qt4-immodule 34CONFIGURE_ARGS+= --enable-qt4-immodule
43CONFIGURE_ARGS+= --with-qt4-im-module-dir=${QTDIR}/plugins/inputmethods 35CONFIGURE_ARGS+= --with-qt4-im-module-dir=${QTDIR}/plugins/inputmethods
44PLIST.qt= yes 36PLIST.qt= yes
45.else 37.else
46CONFIGURE_ARGS+= --disable-qt4-immodule 38CONFIGURE_ARGS+= --disable-qt4-immodule
47.endif 39.endif
48 40
49.if !empty(PKG_OPTIONS:Mgtk3) 41.if !empty(PKG_OPTIONS:Mgtk3)
50CONFIGURE_ARGS+= --with-gtk-version=3 42CONFIGURE_ARGS+= --with-gtk-version=3
51.include "../../x11/gtk3/buildlink3.mk" 43.include "../../x11/gtk3/buildlink3.mk"
52.else 44.else