Tue Aug 30 08:00:14 2016 UTC ()
revert hasty cups15->cups options.mk change


(richard)
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/options.mk
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/options.mk 2016/08/30 07:58:27 1.7
+++ pkgsrc/x11/qt4-libs/options.mk 2016/08/30 08:00:14 1.8
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.7 2016/08/30 07:58:27 richard Exp $ 1# $NetBSD: options.mk,v 1.8 2016/08/30 08:00:14 richard Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qt4 3PKG_OPTIONS_VAR= PKG_OPTIONS.qt4
4PKG_SUPPORTED_OPTIONS= cups debug gtk2 4PKG_SUPPORTED_OPTIONS= cups debug gtk2
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Mcups) 8.if !empty(PKG_OPTIONS:Mcups)
9. include "../../print/cups/buildlink3.mk" 9. include "../../print/cups15/buildlink3.mk"
10CONFIGURE_ARGS+= -cups 10CONFIGURE_ARGS+= -cups
11.else 11.else
12CONFIGURE_ARGS+= -no-cups 12CONFIGURE_ARGS+= -no-cups
13.endif 13.endif
14 14
15.if !empty(PKG_OPTIONS:Mgtk2) 15.if !empty(PKG_OPTIONS:Mgtk2)
16. include "../../devel/glib2/buildlink3.mk" 16. include "../../devel/glib2/buildlink3.mk"
17. include "../../x11/gtk2/buildlink3.mk" 17. include "../../x11/gtk2/buildlink3.mk"
18CONFIGURE_ARGS+= -gtkstyle 18CONFIGURE_ARGS+= -gtkstyle
19.else 19.else
20CONFIGURE_ARGS+= -no-gtkstyle 20CONFIGURE_ARGS+= -no-gtkstyle
21.endif 21.endif
22 22