CVS commit: pkgsrc/wm/blackbox70

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm/blackbox70
From: "David H. Gutteridge" <gutteridge%netbsd.org@localhost>
Date: Wed, 30 Sep 2020 03:07:25 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Sep 30 03:07:25 UTC 2020

Modified Files:
        pkgsrc/wm/blackbox70: Makefile PLIST
Added Files:
        pkgsrc/wm/blackbox70: options.mk

Log Message:
blackbox70: add nls and xft2 options

Add xft2 as a recommended option, following the example of fluxbox.
While here, also make nls a recommended option, rather than being
unconditionally enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/wm/blackbox70/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/blackbox70/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/blackbox70/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/blackbox70/Makefile
diff -u pkgsrc/wm/blackbox70/Makefile:1.23 pkgsrc/wm/blackbox70/Makefile:1.24
--- pkgsrc/wm/blackbox70/Makefile:1.23  Tue Jun 16 23:47:07 2020
+++ pkgsrc/wm/blackbox70/Makefile       Wed Sep 30 03:07:25 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2020/06/16 23:47:07 gutteridge Exp $
+# $NetBSD: Makefile,v 1.24 2020/09/30 03:07:25 gutteridge Exp $
 
 VERSION=       0.76
 DISTNAME=      blackbox-${VERSION}
 PKGNAME=       blackbox70-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bbidulock/}
 GITHUB_PROJECT=        blackboxwm
@@ -25,13 +26,10 @@ GNU_CONFIGURE=      YES
 CXXFLAGS.Linux+=       -fpermissive
 CXXFLAGS.SunOS+=       -fpermissive
 
-CONFIGURE_ARGS+=       --enable-nls
-
-BROKEN_GETTEXT_DETECTION=      yes
-
 BUILDLINK_DEPMETHOD.libXt?=    build
 
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "options.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/blackbox70/PLIST
diff -u pkgsrc/wm/blackbox70/PLIST:1.4 pkgsrc/wm/blackbox70/PLIST:1.5
--- pkgsrc/wm/blackbox70/PLIST:1.4      Tue Oct 23 12:26:06 2018
+++ pkgsrc/wm/blackbox70/PLIST  Wed Sep 30 03:07:25 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/10/23 12:26:06 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/09/30 03:07:25 gutteridge Exp $
 bin/blackbox
 bin/bsetbg
 bin/bsetroot
@@ -23,16 +23,16 @@ include/bt/Util.hh
 include/bt/XDG.hh
 lib/libbt.la
 lib/pkgconfig/libbt.pc
-man/fr/man1/blackbox.1
-man/fr/man1/bsetroot.1
-man/ja/man1/blackbox.1
-man/ja/man1/bsetroot.1
+${PLIST.nls}man/fr/man1/blackbox.1
+${PLIST.nls}man/fr/man1/bsetroot.1
+${PLIST.nls}man/ja/man1/blackbox.1
+${PLIST.nls}man/ja/man1/bsetroot.1
 man/man1/blackbox.1
 man/man1/bsetbg.1
 man/man1/bsetroot.1
-man/nl/man1/blackbox.1
-man/nl/man1/bsetroot.1
-man/sl/man1/blackbox.1
+${PLIST.nls}man/nl/man1/blackbox.1
+${PLIST.nls}man/nl/man1/bsetroot.1
+${PLIST.nls}man/sl/man1/blackbox.1
 share/blackbox/menu
 share/blackbox/styles/Artwiz
 share/blackbox/styles/Blue
@@ -53,29 +53,29 @@ share/blackbox/styles/Shade
 share/blackbox/styles/Spiff
 share/blackbox/styles/TDF
 share/blackbox/styles/Twice
-share/locale/da/LC_MESSAGES/blackbox.mo
-share/locale/de/LC_MESSAGES/blackbox.mo
-share/locale/en@boldquot/LC_MESSAGES/blackbox.mo
-share/locale/en@quot/LC_MESSAGES/blackbox.mo
-share/locale/es/LC_MESSAGES/blackbox.mo
-share/locale/es_AR/LC_MESSAGES/blackbox.mo
-share/locale/et/LC_MESSAGES/blackbox.mo
-share/locale/fr/LC_MESSAGES/blackbox.mo
-share/locale/hu/LC_MESSAGES/blackbox.mo
-share/locale/it/LC_MESSAGES/blackbox.mo
-share/locale/ja/LC_MESSAGES/blackbox.mo
-share/locale/ko/LC_MESSAGES/blackbox.mo
-share/locale/lv/LC_MESSAGES/blackbox.mo
-share/locale/nl/LC_MESSAGES/blackbox.mo
-share/locale/no/LC_MESSAGES/blackbox.mo
-share/locale/pl/LC_MESSAGES/blackbox.mo
-share/locale/pt_BR/LC_MESSAGES/blackbox.mo
-share/locale/ro/LC_MESSAGES/blackbox.mo
-share/locale/ru/LC_MESSAGES/blackbox.mo
-share/locale/sk/LC_MESSAGES/blackbox.mo
-share/locale/sl/LC_MESSAGES/blackbox.mo
-share/locale/sv/LC_MESSAGES/blackbox.mo
-share/locale/tr/LC_MESSAGES/blackbox.mo
-share/locale/uk/LC_MESSAGES/blackbox.mo
-share/locale/zh_CN/LC_MESSAGES/blackbox.mo
-share/locale/zh_TW/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/en@quot/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/es_AR/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/lv/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/no/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/blackbox.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/blackbox.mo

Added files:

Index: pkgsrc/wm/blackbox70/options.mk
diff -u /dev/null pkgsrc/wm/blackbox70/options.mk:1.1
--- /dev/null   Wed Sep 30 03:07:25 2020
+++ pkgsrc/wm/blackbox70/options.mk     Wed Sep 30 03:07:25 2020
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1 2020/09/30 03:07:25 gutteridge Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.blackbox70
+PKG_SUPPORTED_OPTIONS= nls xft2
+PKG_SUGGESTED_OPTIONS= nls xft2
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   nls
+
+# The nls option also controls whether the fr/ja/nl/sl man pages are
+# installed.
+.if !empty(PKG_OPTIONS:Mnls)
+BROKEN_GETTEXT_DETECTION=      yes
+CONFIGURE_ARGS+=       --enable-nls
+.include "../../devel/gettext-lib/buildlink3.mk"
+PLIST.nls=     yes
+.else
+CONFIGURE_ARGS+=       --disable-nls
+.endif
+
+.if !empty(PKG_OPTIONS:Mxft2)
+CONFIGURE_ARGS+=       --enable-xft
+.include "../../x11/libXft/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-xft
+.endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index