Sun Sep 20 13:30:45 2020 UTC ()
fluxbox: Enable xft support by default, rename option for consistency

Bump PKGREVISION


(nia)
diff -r1.70 -r1.71 pkgsrc/wm/fluxbox/Makefile
diff -r1.7 -r1.8 pkgsrc/wm/fluxbox/options.mk
cvs diff -r1.70 -r1.71 pkgsrc/wm/fluxbox/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/fluxbox/Makefile 2020/08/17 20:20:16 1.70
+++ pkgsrc/wm/fluxbox/Makefile 2020/09/20 13:30:45 1.71
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.70 2020/08/17 20:20:16 leot Exp $ 1# $NetBSD: Makefile,v 1.71 2020/09/20 13:30:45 nia Exp $
2 2
3DISTNAME= fluxbox-1.3.7 3DISTNAME= fluxbox-1.3.7
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= wm x11 5CATEGORIES= wm x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= sborrill@NetBSD.org 9MAINTAINER= sborrill@NetBSD.org
10HOMEPAGE= http://fluxbox.sourceforge.net/ 10HOMEPAGE= http://fluxbox.sourceforge.net/
11COMMENT= Window Manager for X based on Blackbox 11COMMENT= Window Manager for X based on Blackbox
12LICENSE= mit 12LICENSE= mit
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
cvs diff -r1.7 -r1.8 pkgsrc/wm/fluxbox/options.mk (expand / switch to unified diff)

--- pkgsrc/wm/fluxbox/options.mk 2020/03/21 15:58:49 1.7
+++ pkgsrc/wm/fluxbox/options.mk 2020/09/20 13:30:45 1.8
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: options.mk,v 1.7 2020/03/21 15:58:49 rillig Exp $ 1# $NetBSD: options.mk,v 1.8 2020/09/20 13:30:45 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.fluxbox 3PKG_OPTIONS_VAR= PKG_OPTIONS.fluxbox
4PKG_SUPPORTED_OPTIONS= imlib2 xft xrender nls 4PKG_SUPPORTED_OPTIONS= imlib2 xft2 xrender nls
5PKG_SUGGESTED_OPTIONS= xrender 5PKG_SUGGESTED_OPTIONS= xft2 xrender
 6
 7PKG_OPTIONS_LEGACY_OPTS+= xft:xft2
6 8
7.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
8 10
9.if ${OPSYS} != "MirBSD" 11.if ${OPSYS} != "MirBSD"
10PKG_SUGGESTED_OPTIONS+= nls 12PKG_SUGGESTED_OPTIONS+= nls
11.endif 13.endif
12 14
13PLIST_VARS+= nls 15PLIST_VARS+= nls
14 16
15.if !empty(PKG_OPTIONS:Mimlib2) 17.if !empty(PKG_OPTIONS:Mimlib2)
16CONFIGURE_ARGS+= --enable-imlib2 18CONFIGURE_ARGS+= --enable-imlib2
17.include "../../graphics/imlib2/buildlink3.mk" 19.include "../../graphics/imlib2/buildlink3.mk"
18.else 20.else
19CONFIGURE_ARGS+= --disable-imlib2 21CONFIGURE_ARGS+= --disable-imlib2
20.endif 22.endif
21 23
22.if !empty(PKG_OPTIONS:Mxft) 24.if !empty(PKG_OPTIONS:Mxft2)
23CONFIGURE_ARGS+= --enable-xft 25CONFIGURE_ARGS+= --enable-xft
24.include "../../x11/libXft/buildlink3.mk" 26.include "../../x11/libXft/buildlink3.mk"
25.else 27.else
26CONFIGURE_ARGS+= --disable-xft 28CONFIGURE_ARGS+= --disable-xft
27.endif 29.endif
28 30
29.if !empty(PKG_OPTIONS:Mxrender) 31.if !empty(PKG_OPTIONS:Mxrender)
30CONFIGURE_ARGS+= --enable-xrender 32CONFIGURE_ARGS+= --enable-xrender
31.include "../../x11/libXrender/buildlink3.mk" 33.include "../../x11/libXrender/buildlink3.mk"
32.else 34.else
33CONFIGURE_ARGS+= --disable-xrender 35CONFIGURE_ARGS+= --disable-xrender
34.endif 36.endif
35 37