CVS commit: pkgsrc/wm/fluxbox

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Sep 20 13:30:45 UTC 2020

Modified Files:
        pkgsrc/wm/fluxbox: Makefile options.mk

Log Message:
fluxbox: Enable xft support by default, rename option for consistency

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/wm/fluxbox/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/fluxbox/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/fluxbox/Makefile
diff -u pkgsrc/wm/fluxbox/Makefile:1.70 pkgsrc/wm/fluxbox/Makefile:1.71
--- pkgsrc/wm/fluxbox/Makefile:1.70     Mon Aug 17 20:20:16 2020
+++ pkgsrc/wm/fluxbox/Makefile  Sun Sep 20 13:30:45 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2020/08/17 20:20:16 leot Exp $
+# $NetBSD: Makefile,v 1.71 2020/09/20 13:30:45 nia Exp $
 
 DISTNAME=      fluxbox-1.3.7
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/fluxbox/options.mk
diff -u pkgsrc/wm/fluxbox/options.mk:1.7 pkgsrc/wm/fluxbox/options.mk:1.8
--- pkgsrc/wm/fluxbox/options.mk:1.7    Sat Mar 21 15:58:49 2020
+++ pkgsrc/wm/fluxbox/options.mk        Sun Sep 20 13:30:45 2020
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2020/03/21 15:58:49 rillig Exp $
+# $NetBSD: options.mk,v 1.8 2020/09/20 13:30:45 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fluxbox
-PKG_SUPPORTED_OPTIONS= imlib2 xft xrender nls
-PKG_SUGGESTED_OPTIONS= xrender
+PKG_SUPPORTED_OPTIONS= imlib2 xft2 xrender nls
+PKG_SUGGESTED_OPTIONS= xft2 xrender
+
+PKG_OPTIONS_LEGACY_OPTS+=      xft:xft2
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,7 +21,7 @@ CONFIGURE_ARGS+=      --enable-imlib2
 CONFIGURE_ARGS+=       --disable-imlib2
 .endif
 
-.if !empty(PKG_OPTIONS:Mxft)
+.if !empty(PKG_OPTIONS:Mxft2)
 CONFIGURE_ARGS+=       --enable-xft
 .include "../../x11/libXft/buildlink3.mk"
 .else