pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/wm
Module Name: pkgsrc
Committed By: nia
Date: Thu Jun 10 12:48:51 UTC 2021
Modified Files:
pkgsrc/wm: Makefile
pkgsrc/wm/bbkeys: Makefile PLIST distinfo
pkgsrc/wm/bbpager: Makefile PLIST distinfo
pkgsrc/wm/bbpager/patches: patch-aa patch-ab
pkgsrc/wm/blackbox: Makefile PLIST distinfo
Added Files:
pkgsrc/wm/bbkeys/patches: patch-Makefile.in patch-src_Config.cpp
patch-src_KeyClient.cpp patch-src_Netclient.cpp
patch-src_ScreenHandler.cpp
pkgsrc/wm/bbpager/patches: patch-src_Baseresource.cxx
patch-src_main.cxx patch-src_resource.cxx
pkgsrc/wm/blackbox/patches: patch-doc_fr__FR_Makefile.in
patch-doc_ja__JP_Makefile.in patch-doc_nl__NL_Makefile.in
patch-doc_sl__SI_Makefile.in patch-lib_Image.cc patch-lib_Menu.cc
patch-lib_Unicode.cc patch-src_Screen.cc patch-src_Toolbar.cc
patch-src_main.cc patch-util_bsetbg
Removed Files:
pkgsrc/wm/bbkeys: MESSAGE
pkgsrc/wm/bbkeys/patches: patch-aa
pkgsrc/wm/bbkeys09: DESCR Makefile PLIST distinfo
pkgsrc/wm/bbkeys09/patches: patch-Makefile.in patch-src_Config.cpp
patch-src_KeyClient.cpp patch-src_Netclient.cpp
patch-src_ScreenHandler.cpp
pkgsrc/wm/bbpager/patches: patch-resource.cc
pkgsrc/wm/bbpager04: DESCR Makefile PLIST distinfo
pkgsrc/wm/bbpager04/patches: patch-aa patch-ab
patch-src_Baseresource.cxx patch-src_main.cxx
patch-src_resource.cxx
pkgsrc/wm/blackbox/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae patch-src_GCCache.cc patch-src_Image.cc
patch-src_ImageControl.cc
pkgsrc/wm/blackbox70: DESCR Makefile PLIST buildlink3.mk distinfo
options.mk
pkgsrc/wm/blackbox70/patches: patch-doc_fr__FR_Makefile.in
patch-doc_ja__JP_Makefile.in patch-doc_nl__NL_Makefile.in
patch-doc_sl__SI_Makefile.in patch-lib_Image.cc patch-lib_Menu.cc
patch-lib_Unicode.cc patch-src_Screen.cc patch-src_Toolbar.cc
patch-src_main.cc patch-util_bsetbg
Log Message:
Make wm/blackbox the latest version, remove weird versioned packages
concept ok'd by gutteridge
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 pkgsrc/wm/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/bbkeys/MESSAGE
cvs rdiff -u -r1.36 -r1.37 pkgsrc/wm/bbkeys/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/bbkeys/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/bbkeys/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/bbkeys/patches/patch-Makefile.in \
pkgsrc/wm/bbkeys/patches/patch-src_Config.cpp \
pkgsrc/wm/bbkeys/patches/patch-src_KeyClient.cpp \
pkgsrc/wm/bbkeys/patches/patch-src_Netclient.cpp \
pkgsrc/wm/bbkeys/patches/patch-src_ScreenHandler.cpp
cvs rdiff -u -r1.2 -r0 pkgsrc/wm/bbkeys/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/bbkeys09/DESCR
cvs rdiff -u -r1.20 -r0 pkgsrc/wm/bbkeys09/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/wm/bbkeys09/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/wm/bbkeys09/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/bbkeys09/patches/patch-Makefile.in \
pkgsrc/wm/bbkeys09/patches/patch-src_ScreenHandler.cpp
cvs rdiff -u -r1.2 -r0 pkgsrc/wm/bbkeys09/patches/patch-src_Config.cpp \
pkgsrc/wm/bbkeys09/patches/patch-src_KeyClient.cpp \
pkgsrc/wm/bbkeys09/patches/patch-src_Netclient.cpp
cvs rdiff -u -r1.25 -r1.26 pkgsrc/wm/bbpager/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/bbpager/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/bbpager/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/bbpager/patches/patch-aa \
pkgsrc/wm/bbpager/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/bbpager/patches/patch-resource.cc
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/bbpager/patches/patch-src_Baseresource.cxx \
pkgsrc/wm/bbpager/patches/patch-src_main.cxx \
pkgsrc/wm/bbpager/patches/patch-src_resource.cxx
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/bbpager04/DESCR
cvs rdiff -u -r1.10 -r0 pkgsrc/wm/bbpager04/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/wm/bbpager04/PLIST pkgsrc/wm/bbpager04/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/bbpager04/patches/patch-aa \
pkgsrc/wm/bbpager04/patches/patch-ab \
pkgsrc/wm/bbpager04/patches/patch-src_Baseresource.cxx \
pkgsrc/wm/bbpager04/patches/patch-src_main.cxx \
pkgsrc/wm/bbpager04/patches/patch-src_resource.cxx
cvs rdiff -u -r1.36 -r1.37 pkgsrc/wm/blackbox/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/blackbox/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/wm/blackbox/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/wm/blackbox/patches/patch-aa \
pkgsrc/wm/blackbox/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/blackbox/patches/patch-ac \
pkgsrc/wm/blackbox/patches/patch-ad pkgsrc/wm/blackbox/patches/patch-ae \
pkgsrc/wm/blackbox/patches/patch-src_GCCache.cc \
pkgsrc/wm/blackbox/patches/patch-src_Image.cc \
pkgsrc/wm/blackbox/patches/patch-src_ImageControl.cc
cvs rdiff -u -r0 -r1.1 \
pkgsrc/wm/blackbox/patches/patch-doc_fr__FR_Makefile.in \
pkgsrc/wm/blackbox/patches/patch-doc_ja__JP_Makefile.in \
pkgsrc/wm/blackbox/patches/patch-doc_nl__NL_Makefile.in \
pkgsrc/wm/blackbox/patches/patch-doc_sl__SI_Makefile.in \
pkgsrc/wm/blackbox/patches/patch-lib_Image.cc \
pkgsrc/wm/blackbox/patches/patch-lib_Menu.cc \
pkgsrc/wm/blackbox/patches/patch-lib_Unicode.cc \
pkgsrc/wm/blackbox/patches/patch-src_Screen.cc \
pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc \
pkgsrc/wm/blackbox/patches/patch-src_main.cc \
pkgsrc/wm/blackbox/patches/patch-util_bsetbg
cvs rdiff -u -r1.3 -r0 pkgsrc/wm/blackbox70/DESCR
cvs rdiff -u -r1.25 -r0 pkgsrc/wm/blackbox70/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/wm/blackbox70/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/wm/blackbox70/buildlink3.mk
cvs rdiff -u -r1.18 -r0 pkgsrc/wm/blackbox70/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/blackbox70/options.mk
cvs rdiff -u -r1.1 -r0 \
pkgsrc/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in \
pkgsrc/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in \
pkgsrc/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in \
pkgsrc/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in \
pkgsrc/wm/blackbox70/patches/patch-lib_Image.cc \
pkgsrc/wm/blackbox70/patches/patch-lib_Menu.cc \
pkgsrc/wm/blackbox70/patches/patch-src_Screen.cc \
pkgsrc/wm/blackbox70/patches/patch-src_Toolbar.cc \
pkgsrc/wm/blackbox70/patches/patch-src_main.cc \
pkgsrc/wm/blackbox70/patches/patch-util_bsetbg
cvs rdiff -u -r1.2 -r0 pkgsrc/wm/blackbox70/patches/patch-lib_Unicode.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/wm/Makefile
diff -u pkgsrc/wm/Makefile:1.162 pkgsrc/wm/Makefile:1.163
--- pkgsrc/wm/Makefile:1.162 Sun Apr 25 04:43:30 2021
+++ pkgsrc/wm/Makefile Thu Jun 10 12:48:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2021/04/25 04:43:30 wiz Exp $
+# $NetBSD: Makefile,v 1.163 2021/06/10 12:48:49 nia Exp $
#
COMMENT= X11 window managers, configuration tools, and themes
@@ -11,13 +11,10 @@ SUBDIR+= afterstep
SUBDIR+= amiwm
SUBDIR+= awesome
SUBDIR+= bbkeys
-SUBDIR+= bbkeys09
SUBDIR+= bbpager
-SUBDIR+= bbpager04
SUBDIR+= bbrun
SUBDIR+= berry
SUBDIR+= blackbox
-SUBDIR+= blackbox70
SUBDIR+= bmpanel2
SUBDIR+= bsetroot
SUBDIR+= bspwm
Index: pkgsrc/wm/bbkeys/Makefile
diff -u pkgsrc/wm/bbkeys/Makefile:1.36 pkgsrc/wm/bbkeys/Makefile:1.37
--- pkgsrc/wm/bbkeys/Makefile:1.36 Mon May 24 19:55:09 2021
+++ pkgsrc/wm/bbkeys/Makefile Thu Jun 10 12:48:49 2021
@@ -1,24 +1,29 @@
-# $NetBSD: Makefile,v 1.36 2021/05/24 19:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2021/06/10 12:48:49 nia Exp $
#
-DISTNAME= bbkeys-0.8.6
-PKGREVISION= 10
+DISTNAME= bbkeys-0.9.1
CATEGORIES= x11 wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbkeys/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://bbkeys.sourceforge.net/
COMMENT= General X Window keygrabber
+LICENSE= mit
CONFLICTS+= bbkeys09-[0-9]*
+SUPERSEDES+= bbkeys09-[0-9]*
+PREV_PKGPATH= wm/bbkeys09
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../wm/blackbox/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/bbkeys/PLIST
diff -u pkgsrc/wm/bbkeys/PLIST:1.6 pkgsrc/wm/bbkeys/PLIST:1.7
--- pkgsrc/wm/bbkeys/PLIST:1.6 Sun Jun 14 21:40:04 2009
+++ pkgsrc/wm/bbkeys/PLIST Thu Jun 10 12:48:49 2021
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:40:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/06/10 12:48:49 nia Exp $
bin/bbkeys
-bin/bbkeysconf.pl
man/man1/bbkeys.1
-man/man5/bbkeys.bb.5
man/man5/bbkeysrc.5
-share/bbtools/bbkeys.bb
-share/bbtools/bbkeys.nobb
-share/doc/bbkeys/AUTHORS
-share/doc/bbkeys/BUGS
-share/doc/bbkeys/ChangeLog
-share/doc/bbkeys/NEWS
-share/doc/bbkeys/README
+share/bbkeys/bbkeysrc
+share/bbkeys/defaultStyle
+share/share/doc/bbkeys/AUTHORS
+share/share/doc/bbkeys/BUGS
+share/share/doc/bbkeys/ChangeLog
+share/share/doc/bbkeys/LICENSE
+share/share/doc/bbkeys/NEWS
+share/share/doc/bbkeys/README
+share/share/doc/bbkeys/TODO
Index: pkgsrc/wm/bbkeys/distinfo
diff -u pkgsrc/wm/bbkeys/distinfo:1.7 pkgsrc/wm/bbkeys/distinfo:1.8
--- pkgsrc/wm/bbkeys/distinfo:1.7 Mon Nov 2 23:42:50 2015
+++ pkgsrc/wm/bbkeys/distinfo Thu Jun 10 12:48:49 2021
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.7 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.8 2021/06/10 12:48:49 nia Exp $
-SHA1 (bbkeys-0.8.6.tar.gz) = b1638ec44903fffbe8ca822b6ee854c8d48d91eb
-RMD160 (bbkeys-0.8.6.tar.gz) = c78e1386e18131105a9be7eacf249026d315c516
-SHA512 (bbkeys-0.8.6.tar.gz) = 41d498c75d947ea8f9c1c621e92adb8fcada3e388fdf9da60cd8ab0194f215993f9868b80cc5f0ac1aae2dcd03f03dabfc0de0a59a166d87339143919fd13248
-Size (bbkeys-0.8.6.tar.gz) = 185230 bytes
-SHA1 (patch-aa) = 303186f314c9d0f18415cef97630e874de14048d
+SHA1 (bbkeys-0.9.1.tar.gz) = 93708f6b082e1b6e61173b49e2198f24411f3470
+RMD160 (bbkeys-0.9.1.tar.gz) = b498845ea6cd11dd638f203b75e9ec14ca0e62ce
+SHA512 (bbkeys-0.9.1.tar.gz) = c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
+Size (bbkeys-0.9.1.tar.gz) = 226941 bytes
+SHA1 (patch-Makefile.in) = 3e61b500d79de5cafa5d746b546196c9a9a3a652
+SHA1 (patch-src_Config.cpp) = 8624e2bc6a08c6d6de0b0e488617ce84c1fe1d15
+SHA1 (patch-src_KeyClient.cpp) = e6c9479b1847f0872d729cc5a112b9293d6158ee
+SHA1 (patch-src_Netclient.cpp) = 6d91c21a6eb33dd860c39e207d8c3fa3b1842b9b
+SHA1 (patch-src_ScreenHandler.cpp) = 8c883c9c9db39bca86f8579dc8ba1cc35b619d7c
Index: pkgsrc/wm/bbpager/Makefile
diff -u pkgsrc/wm/bbpager/Makefile:1.25 pkgsrc/wm/bbpager/Makefile:1.26
--- pkgsrc/wm/bbpager/Makefile:1.25 Tue Aug 1 16:47:45 2017
+++ pkgsrc/wm/bbpager/Makefile Thu Jun 10 12:48:50 2021
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.25 2017/08/01 16:47:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.26 2021/06/10 12:48:50 nia Exp $
-DISTNAME= bbpager-0.3.1
-PKGREVISION= 3
+DISTNAME= bbpager-0.4.7
CATEGORIES= wm x11
-#MASTER_SITES= http://bbtools.windsofstorm.net/sources/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbtools/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
#HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml
COMMENT= Pager for the blackbox window manager
-
-CONFLICTS+= bbpager04-[0-9]*
+LICENSE= gnu-gpl-v2
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config
+
+CONFLICTS+= bbpager04-[0-9]*
+SUPERSEDES+= bbpager04-[0-9]*
+PREV_PKGPATH= wm/bbpager04
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/bbtools
+INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
post-install:
${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
@@ -23,7 +25,9 @@ post-install:
BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../wm/blackbox/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/bbpager/PLIST
diff -u pkgsrc/wm/bbpager/PLIST:1.4 pkgsrc/wm/bbpager/PLIST:1.5
--- pkgsrc/wm/bbpager/PLIST:1.4 Sun Jun 14 21:40:05 2009
+++ pkgsrc/wm/bbpager/PLIST Thu Jun 10 12:48:50 2021
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:40:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/06/10 12:48:50 nia Exp $
bin/bbpager
man/man1/bbpager.1
man/man5/bbpager.bb.5
share/bbtools/README.bbpager
-share/bbtools/bbpager.bb
-share/bbtools/bbpager.nobb
+share/bbtools/bbpager.rc
Index: pkgsrc/wm/bbpager/distinfo
diff -u pkgsrc/wm/bbpager/distinfo:1.5 pkgsrc/wm/bbpager/distinfo:1.6
--- pkgsrc/wm/bbpager/distinfo:1.5 Mon Nov 2 23:42:50 2015
+++ pkgsrc/wm/bbpager/distinfo Thu Jun 10 12:48:50 2021
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.5 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2021/06/10 12:48:50 nia Exp $
-SHA1 (bbpager-0.3.1.tar.gz) = a0a6708e7badb62d5e8cbbac276ccdc4eb109ea4
-RMD160 (bbpager-0.3.1.tar.gz) = 6be45a7150d83de4e078b4feea0ad81b8aa491dd
-SHA512 (bbpager-0.3.1.tar.gz) = 1cd8012e130dbb1e4130920c042b145bf4b9944f40bebec6c8d17a6f93e38fb0835d08654a77aa2d0c98ca32d0cddd2fff55cc7857fd479b801d5272a96d00d0
-Size (bbpager-0.3.1.tar.gz) = 81686 bytes
+SHA1 (bbpager-0.4.7.tar.gz) = 37217534369b32650c154cd387da6d837c097ee6
+RMD160 (bbpager-0.4.7.tar.gz) = e7a8fb13a4ed11bd319d212bb0bac81ff27bf172
+SHA512 (bbpager-0.4.7.tar.gz) = 33202efd4d55639ab4c5f9fe54b9b0a6e4d32dd822119fb5517d5d2231922962d6985b51d7fa84dc3eb909ddea05033965a3882cda2dc10193aae2f873da1869
+Size (bbpager-0.4.7.tar.gz) = 170575 bytes
SHA1 (patch-aa) = b82d730bb85d59df9cfc916865935b6f13988bc4
SHA1 (patch-ab) = 0086f41b642bc8770d19995302701748823386c3
-SHA1 (patch-resource.cc) = c1b0dd77bfdc57e22cb4bf8d1ffa77c75ccfd555
+SHA1 (patch-src_Baseresource.cxx) = 7006a4d1a6fd703b13a4171701b2d2e69200a5dd
+SHA1 (patch-src_main.cxx) = c0f7db4d3e6ccff5fd39ac15ece795cc30d6648d
+SHA1 (patch-src_resource.cxx) = 219d895eb25b92aa2902ef763039a9d4e6fe873b
Index: pkgsrc/wm/bbpager/patches/patch-aa
diff -u pkgsrc/wm/bbpager/patches/patch-aa:1.1 pkgsrc/wm/bbpager/patches/patch-aa:1.2
--- pkgsrc/wm/bbpager/patches/patch-aa:1.1 Sat Dec 14 00:21:37 2002
+++ pkgsrc/wm/bbpager/patches/patch-aa Thu Jun 10 12:48:50 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/12/14 00:21:37 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2021/06/10 12:48:50 nia Exp $
--- /dev/null Fri Dec 13 18:13:40 2002
+++ bbpager.1 Fri Dec 13 19:13:48 2002
Index: pkgsrc/wm/bbpager/patches/patch-ab
diff -u pkgsrc/wm/bbpager/patches/patch-ab:1.1 pkgsrc/wm/bbpager/patches/patch-ab:1.2
--- pkgsrc/wm/bbpager/patches/patch-ab:1.1 Sat Dec 14 00:21:37 2002
+++ pkgsrc/wm/bbpager/patches/patch-ab Thu Jun 10 12:48:50 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/12/14 00:21:37 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2021/06/10 12:48:50 nia Exp $
--- /dev/null Fri Dec 13 18:13:40 2002
+++ bbpager.bb.5 Fri Dec 13 19:12:19 2002
Index: pkgsrc/wm/blackbox/Makefile
diff -u pkgsrc/wm/blackbox/Makefile:1.36 pkgsrc/wm/blackbox/Makefile:1.37
--- pkgsrc/wm/blackbox/Makefile:1.36 Mon Aug 24 04:52:24 2020
+++ pkgsrc/wm/blackbox/Makefile Thu Jun 10 12:48:50 2021
@@ -1,26 +1,34 @@
-# $NetBSD: Makefile,v 1.36 2020/08/24 04:52:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.37 2021/06/10 12:48:50 nia Exp $
-DISTNAME= blackbox-0.65.0
-PKGREVISION= 7
+DISTNAME= blackbox-0.77
CATEGORIES= wm x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=bbidulock/}
+GITHUB_PROJECT= blackboxwm
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .tar.lz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/bradleythughes/blackbox
+HOMEPAGE= https://github.com/bbidulock/blackboxwm
COMMENT= Small and fast X11 window manager
LICENSE= mit
-DEPENDS+= bsetroot>=0.1nb1:../../wm/bsetroot
-
-CONFLICTS+= blackbox70>=0.70.1
-
-USE_LANGUAGES= c c++
+CONFLICTS= bsetroot-[0-9]*
+CONFLICTS+= blackbox70-[0-9]*
+SUPERSEDES+= blackbox70-[0-9]*
+PREV_PKGPATH= wm/blackbox70
+
+USE_LANGUAGES= c c++03
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
+CXXFLAGS.Linux+= -fpermissive
+CXXFLAGS.SunOS+= -fpermissive
+
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
+.include "options.mk"
+
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/blackbox/PLIST
diff -u pkgsrc/wm/blackbox/PLIST:1.7 pkgsrc/wm/blackbox/PLIST:1.8
--- pkgsrc/wm/blackbox/PLIST:1.7 Sun Jun 14 18:18:57 2009
+++ pkgsrc/wm/blackbox/PLIST Thu Jun 10 12:48:50 2021
@@ -1,52 +1,81 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:18:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/06/10 12:48:50 nia Exp $
bin/blackbox
+bin/bsetbg
+bin/bsetroot
+bin/bstyleconvert
+include/bt/Application.hh
+include/bt/Bitmap.hh
+include/bt/Color.hh
+include/bt/Display.hh
+include/bt/EWMH.hh
+include/bt/EventHandler.hh
+include/bt/Font.hh
+include/bt/Image.hh
+include/bt/Menu.hh
+include/bt/Pen.hh
+include/bt/PixmapCache.hh
+include/bt/Rect.hh
+include/bt/Resource.hh
+include/bt/Texture.hh
+include/bt/Timer.hh
+include/bt/Unicode.hh
+include/bt/Util.hh
+include/bt/XDG.hh
+lib/libbt.la
+lib/pkgconfig/libbt.pc
+${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
+${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/nls/C/blackbox.cat
-share/blackbox/nls/POSIX
-share/blackbox/nls/US_ASCII
-share/blackbox/nls/da_DK/blackbox.cat
-share/blackbox/nls/de
-share/blackbox/nls/de_DE/blackbox.cat
-share/blackbox/nls/en
-share/blackbox/nls/en_GB
-share/blackbox/nls/en_US
-share/blackbox/nls/es
-share/blackbox/nls/es_AR/blackbox.cat
-share/blackbox/nls/es_ES/blackbox.cat
-share/blackbox/nls/es_MX
-share/blackbox/nls/fr
-share/blackbox/nls/fr_FR/blackbox.cat
-share/blackbox/nls/hu_HU/blackbox.cat
-share/blackbox/nls/it
-share/blackbox/nls/it_IT/blackbox.cat
-share/blackbox/nls/ja_JP/blackbox.cat
-share/blackbox/nls/ko_KR/blackbox.cat
-share/blackbox/nls/lv_LV/blackbox.cat
-share/blackbox/nls/nl
-share/blackbox/nls/nl_NL/blackbox.cat
-share/blackbox/nls/no_NO/blackbox.cat
-share/blackbox/nls/pl_PL/blackbox.cat
-share/blackbox/nls/pt_BR/blackbox.cat
-share/blackbox/nls/ro_RO/blackbox.cat
-share/blackbox/nls/ru_RU/blackbox.cat
-share/blackbox/nls/sk_SK/blackbox.cat
-share/blackbox/nls/sl_SI/blackbox.cat
-share/blackbox/nls/sv_SE/blackbox.cat
-share/blackbox/nls/uk_UA/blackbox.cat
-share/blackbox/nls/zh_CN/blackbox.cat
-share/blackbox/nls/zh_TW/blackbox.cat
share/blackbox/styles/Artwiz
+share/blackbox/styles/Blue
share/blackbox/styles/Cthulhain
share/blackbox/styles/Flux
+share/blackbox/styles/Gray
+share/blackbox/styles/Green
share/blackbox/styles/Minimal
share/blackbox/styles/Nyz
share/blackbox/styles/Operation
share/blackbox/styles/Outcomes
+share/blackbox/styles/Purple
share/blackbox/styles/Rampage
share/blackbox/styles/Rancor
+share/blackbox/styles/Red
share/blackbox/styles/Results
share/blackbox/styles/Shade
share/blackbox/styles/Spiff
share/blackbox/styles/TDF
share/blackbox/styles/Twice
+${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
Index: pkgsrc/wm/blackbox/distinfo
diff -u pkgsrc/wm/blackbox/distinfo:1.14 pkgsrc/wm/blackbox/distinfo:1.15
--- pkgsrc/wm/blackbox/distinfo:1.14 Mon Nov 2 23:42:51 2015
+++ pkgsrc/wm/blackbox/distinfo Thu Jun 10 12:48:50 2021
@@ -1,14 +1,17 @@
-$NetBSD: distinfo,v 1.14 2015/11/02 23:42:51 agc Exp $
+$NetBSD: distinfo,v 1.15 2021/06/10 12:48:50 nia Exp $
-SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
-RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
-SHA512 (blackbox-0.65.0.tar.gz) = 337f6155674403869c527a70f3a399dfef8291533ec96a02424ecd9d1c43dd004651997f83b6916d273815f25b2434dd3ec181d440988c7932f139b14c9040c9
-Size (blackbox-0.65.0.tar.gz) = 292950 bytes
-SHA1 (patch-aa) = 265249c3e27da0d7dd9b2b85da1c417684c57e0f
-SHA1 (patch-ab) = 6081da04f0dbab0f711523114e130c176a0f1f05
-SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
-SHA1 (patch-ad) = 0906aa36c45b1e9ebd8c10e166ac1ba8e345fd9e
-SHA1 (patch-ae) = 0e919952cd5209e787807548ca7ce45c5ed03497
-SHA1 (patch-src_GCCache.cc) = 7bb4d013160d677a448a964cd2280200e50fceba
-SHA1 (patch-src_Image.cc) = fa9ad93eae4fa6e21b8e9f2811298e87a4901c15
-SHA1 (patch-src_ImageControl.cc) = cd72e47a768f71ad26c76f4268e1c6f0e5f1e12c
+SHA1 (blackbox-0.77.tar.lz) = 4a8c17b3ab885ff417df26bd9f9b7c5163fdd7df
+RMD160 (blackbox-0.77.tar.lz) = c21ede6822115b9163d6bf6482b4a0864f0b0927
+SHA512 (blackbox-0.77.tar.lz) = d33c611ae019ab37b936566470f318b7a9de601da6586f2b7485882e2da2c9a22cfaa6dd4850b9a749791f33a9dbb8bcb84c88cb10a890080eb437131f19c593
+Size (blackbox-0.77.tar.lz) = 566397 bytes
+SHA1 (patch-doc_fr__FR_Makefile.in) = 39af7e28c397bd4201f85d4d13a48892024d274b
+SHA1 (patch-doc_ja__JP_Makefile.in) = bd79553e6bd5368a8b21cf463056a35c84e2e8e0
+SHA1 (patch-doc_nl__NL_Makefile.in) = 5f7df3158b59633fd9633656237f4fd5cdace897
+SHA1 (patch-doc_sl__SI_Makefile.in) = d116093a717a14d8e0b252f0254f7fb03e37f0a1
+SHA1 (patch-lib_Image.cc) = ab49da02853b670843f4884517f0727d4569d50a
+SHA1 (patch-lib_Menu.cc) = b16a7439fa5db1d287e5353ec5986a9c3ffd6cfb
+SHA1 (patch-lib_Unicode.cc) = 7a13e7822a9af71c97b24e167394d87a65e8be73
+SHA1 (patch-src_Screen.cc) = 7a75160a66eb6317930af063514688c6e5028569
+SHA1 (patch-src_Toolbar.cc) = 2fdcea33eff7b6a99f22ce7a77c9b713b4f005b5
+SHA1 (patch-src_main.cc) = 24f43276e20f8fb89c6cb478e5e1bf52ea3eb659
+SHA1 (patch-util_bsetbg) = 2e5ea600ef842ff677591220398fb7300d210397
Added files:
Index: pkgsrc/wm/bbkeys/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/wm/bbkeys/patches/patch-Makefile.in:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbkeys/patches/patch-Makefile.in Thu Jun 10 12:48:49 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Place documents elsewhere.
+
+--- Makefile.in.orig 2008-12-22 03:08:52.000000000 +0000
++++ Makefile.in
+@@ -152,7 +152,7 @@ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/bbkeys
++docdir = $(datadir)/share/doc/bbkeys
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
Index: pkgsrc/wm/bbkeys/patches/patch-src_Config.cpp
diff -u /dev/null pkgsrc/wm/bbkeys/patches/patch-src_Config.cpp:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbkeys/patches/patch-src_Config.cpp Thu Jun 10 12:48:49 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Config.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Include strings.h too.
+
+--- src/Config.cpp.orig 2011-11-25 16:58:41.000000000 +0000
++++ src/Config.cpp
+@@ -25,6 +25,7 @@
+
+ #include "Config.h"
+ #include <string>
++#include <strings.h>
+
+ #include <iostream>
+ using std::cout;
Index: pkgsrc/wm/bbkeys/patches/patch-src_KeyClient.cpp
diff -u /dev/null pkgsrc/wm/bbkeys/patches/patch-src_KeyClient.cpp:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbkeys/patches/patch-src_KeyClient.cpp Thu Jun 10 12:48:49 2021
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_KeyClient.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Include strings.h too.
+Initialize all pointers.
+
+--- src/KeyClient.cpp.orig 2008-12-22 01:52:35.000000000 +0000
++++ src/KeyClient.cpp
+@@ -46,6 +46,7 @@ extern "C" {
+
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <strings.h>
+
+ }
+
+@@ -104,6 +105,10 @@ KeyClient::KeyClient (int argc, char **a
+ _netclient = new Netclient(this->display());
+ _active = _clients.end();
+
++ // Initialize uninitialized pointers to NULL
++ _keybindings = NULL;
++ config_check_timer = NULL;
++
+ initialize();
+ }
+
Index: pkgsrc/wm/bbkeys/patches/patch-src_Netclient.cpp
diff -u /dev/null pkgsrc/wm/bbkeys/patches/patch-src_Netclient.cpp:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbkeys/patches/patch-src_Netclient.cpp Thu Jun 10 12:48:49 2021
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_Netclient.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Fix LP64 problem with the X11 protocol handling, from FreeBSD.
+
+--- src/Netclient.cpp.orig 2008-12-22 01:10:19.000000000 +0000
++++ src/Netclient.cpp
+@@ -141,6 +141,7 @@ bool Netclient::getValue(Window win, Ato
+ int result;
+ unsigned long maxread = nelements;
+ bool ret = False;
++ int bsize;
+
+ // try get the first element
+ result = XGetWindowProperty(_display.XDisplay(), win, atom, 0l, 1l, False,
+@@ -149,18 +150,19 @@ bool Netclient::getValue(Window win, Ato
+ ret = (result == Success && ret_type == type && ret_size == size &&
+ nelements > 0);
+ if (ret) {
++ bsize = (size == 32) ? sizeof(long) : size/8;
+ if (ret_bytes == 0 || maxread <= nelements) {
+ // we got the whole property's value
+- *value = new unsigned char[nelements * size/8 + 1];
+- memcpy(*value, c_val, nelements * size/8 + 1);
++ *value = new unsigned char[nelements * bsize + 1];
++ memcpy(*value, c_val, nelements * bsize + 1);
+ } else {
+ // get the entire property since it is larger than one long
+ XFree(c_val);
+ // the number of longs that need to be retreived to get the property's
+ // entire value. The last + 1 is the first long that we retrieved above.
+ int remain = (ret_bytes - 1)/sizeof(long) + 1 + 1;
+- if (remain > size/8 * (signed)maxread) // dont get more than the max
+- remain = size/8 * (signed)maxread;
++ if (remain > bsize * (signed)maxread) // dont get more than the max
++ remain = bsize * (signed)maxread;
+ result = XGetWindowProperty(_display.XDisplay(), win, atom, 0l, remain, False, type,
+ &ret_type, &ret_size, &nelements, &ret_bytes,
+ &c_val);
+@@ -174,8 +176,8 @@ bool Netclient::getValue(Window win, Ato
+ if (! ret)
+ return getValue(win, atom, type, maxread, value, size);
+
+- *value = new unsigned char[nelements * size/8 + 1];
+- memcpy(*value, c_val, nelements * size/8 + 1);
++ *value = new unsigned char[nelements * bsize + 1];
++ memcpy(*value, c_val, nelements * bsize + 1);
+ }
+ }
+ if (c_val) XFree(c_val);
Index: pkgsrc/wm/bbkeys/patches/patch-src_ScreenHandler.cpp
diff -u /dev/null pkgsrc/wm/bbkeys/patches/patch-src_ScreenHandler.cpp:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbkeys/patches/patch-src_ScreenHandler.cpp Thu Jun 10 12:48:49 2021
@@ -0,0 +1,61 @@
+$NetBSD: patch-src_ScreenHandler.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Debug output for missing active window.
+Used while debugging what turned out to be an LP64 problem,
+but may be useful later, so left here.
+
+--- src/ScreenHandler.cpp.orig 2008-12-22 02:48:59.000000000 +0000
++++ src/ScreenHandler.cpp
+@@ -467,6 +467,9 @@ void ScreenHandler::keyPressEvent (const
+ assert(false); // unhandled action type!
+ break;
+ }
++ } else {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "No active window" <<endl;
+ }
+ }
+
+@@ -564,18 +567,26 @@ void ScreenHandler::updateActiveWindow()
+ {
+ assert(_managed);
+
++ if ( _debug )
++ cout <<BBTOOL << ": " << "checking active window" <<endl;
++
+ Window a = None;
+ _netclient->getValue(_root, _netclient->activeWindow(), XA_WINDOW, a);
+
+ if ( None == a ) {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "no active window found" << endl;
+ return;
+ }
+
+ WindowList::iterator it, end = _clients.end();
+ for (it = _clients.begin(); it != end; ++it) {
+ if ( (*it)->window() == a) {
+- if ( (*it)->getScreenNumber() != _screenNumber )
++ if ( (*it)->getScreenNumber() != _screenNumber ) {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "wrong screen?" << endl;
+ return;
++ }
+ break;
+ }
+ }
+@@ -597,8 +608,14 @@ void ScreenHandler::updateActiveWindow()
+
+ if ( _debug )
+ cout <<BBTOOL << ": " << "active window now: [" << bt::toLocale((*_active)->title()) <<"]" <<endl;
++ } else {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "cycling through window list" <<endl;
+ }
+
++ } else {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "active window == end, ignored" <<endl;
+ }
+
+ }
Index: pkgsrc/wm/bbpager/patches/patch-src_Baseresource.cxx
diff -u /dev/null pkgsrc/wm/bbpager/patches/patch-src_Baseresource.cxx:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbpager/patches/patch-src_Baseresource.cxx Thu Jun 10 12:48:50 2021
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_Baseresource.cxx,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+--- src/Baseresource.cxx.orig 2011-11-25 17:02:36.000000000 +0000
++++ src/Baseresource.cxx
+@@ -19,6 +19,7 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+
++#include <strings.h>
+ #include <string>
+ #include "Baseresource.h"
+ #include <stdio.h>
Index: pkgsrc/wm/bbpager/patches/patch-src_main.cxx
diff -u /dev/null pkgsrc/wm/bbpager/patches/patch-src_main.cxx:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbpager/patches/patch-src_main.cxx Thu Jun 10 12:48:50 2021
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_main.cxx,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+--- src/main.cxx.orig 2011-11-25 17:02:24.000000000 +0000
++++ src/main.cxx
+@@ -24,6 +24,7 @@
+ #include "config.h"
+
+ #include <stdio.h>
++#include <cstring>
+ #include <string>
+ #include <iostream>
+
Index: pkgsrc/wm/bbpager/patches/patch-src_resource.cxx
diff -u /dev/null pkgsrc/wm/bbpager/patches/patch-src_resource.cxx:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/bbpager/patches/patch-src_resource.cxx Thu Jun 10 12:48:50 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_resource.cxx,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+--- src/resource.cxx.orig 2011-11-25 17:02:49.000000000 +0000
++++ src/resource.cxx
+@@ -18,7 +18,7 @@
+ //
+ // (See the included file COPYING / GPL-2.0)
+ //
+-
++#include <strings.h>
+ #include "resource.h"
+ #include "blackboxstyle.h"
+
Index: pkgsrc/wm/blackbox/patches/patch-doc_fr__FR_Makefile.in
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-doc_fr__FR_Makefile.in:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-doc_fr__FR_Makefile.in Thu Jun 10 12:48:50 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_fr__FR_Makefile.in,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Avoid a variable specific to GNU make.
+
+--- doc/fr_FR/Makefile.in.orig 2019-09-06 09:55:03.000000000 +0000
++++ doc/fr_FR/Makefile.in
+@@ -588,7 +588,7 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkgsrc/wm/blackbox/patches/patch-doc_ja__JP_Makefile.in
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-doc_ja__JP_Makefile.in:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-doc_ja__JP_Makefile.in Thu Jun 10 12:48:50 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_ja__JP_Makefile.in,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Avoid a variable specific to GNU make.
+
+--- doc/ja_JP/Makefile.in.orig 2019-09-06 09:55:04.000000000 +0000
++++ doc/ja_JP/Makefile.in
+@@ -588,7 +588,7 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkgsrc/wm/blackbox/patches/patch-doc_nl__NL_Makefile.in
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-doc_nl__NL_Makefile.in:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-doc_nl__NL_Makefile.in Thu Jun 10 12:48:50 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_nl__NL_Makefile.in,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Avoid a variable specific to GNU make.
+
+--- doc/nl_NL/Makefile.in.orig 2019-09-06 09:55:04.000000000 +0000
++++ doc/nl_NL/Makefile.in
+@@ -588,7 +588,7 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkgsrc/wm/blackbox/patches/patch-doc_sl__SI_Makefile.in
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-doc_sl__SI_Makefile.in:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-doc_sl__SI_Makefile.in Thu Jun 10 12:48:50 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_sl__SI_Makefile.in,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Avoid a variable specific to GNU make.
+
+--- doc/sl_SI/Makefile.in.orig 2019-09-06 09:55:04.000000000 +0000
++++ doc/sl_SI/Makefile.in
+@@ -587,7 +587,7 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkgsrc/wm/blackbox/patches/patch-lib_Image.cc
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-lib_Image.cc:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-lib_Image.cc Thu Jun 10 12:48:50 2021
@@ -0,0 +1,49 @@
+$NetBSD: patch-lib_Image.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Sunpro cannot resolve sqrt(int) to either sqrt(double) or
+sqrt(long double).
+
+--- lib/Image.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ lib/Image.cc
+@@ -1704,14 +1704,14 @@ void bt::Image::egradient(const Color &f
+ for (y = 0; y < height; ++y) {
+ for (x = 0; x < width; ++x, ++p) {
+ p->red = static_cast<unsigned char>
+- (tr - (rsign * static_cast<int>(sqrt(xt[0][x] +
+- yt[0][y]))));
++ (tr - (rsign * static_cast<int>(sqrt(double(xt[0][x] +
++ yt[0][y])))));
+ p->green = static_cast<unsigned char>
+- (tg - (gsign * static_cast<int>(sqrt(xt[1][x] +
+- yt[1][y]))));
++ (tg - (gsign * static_cast<int>(sqrt(double(xt[1][x] +
++ yt[1][y])))));
+ p->blue = static_cast<unsigned char>
+- (tb - (bsign * static_cast<int>(sqrt(xt[2][x] +
+- yt[2][y]))));
++ (tb - (bsign * static_cast<int>(sqrt(double(xt[2][x] +
++ yt[2][y])))));
+ }
+ }
+ } else {
+@@ -1719,14 +1719,14 @@ void bt::Image::egradient(const Color &f
+ for (y = 0; y < height; ++y) {
+ for (x = 0; x < width; ++x, ++p) {
+ p->red = static_cast<unsigned char>
+- (tr - (rsign * static_cast<int>(sqrt(xt[0][x]
+- + yt[0][y]))));
++ (tr - (rsign * static_cast<int>(sqrt(double(xt[0][x]
++ + yt[0][y])))));
+ p->green = static_cast<unsigned char>
+- (tg - (gsign * static_cast<int>(sqrt(xt[1][x]
+- + yt[1][y]))));
++ (tg - (gsign * static_cast<int>(sqrt(double(xt[1][x]
++ + yt[1][y])))));
+ p->blue = static_cast<unsigned char>
+- (tb - (bsign * static_cast<int>(sqrt(xt[2][x]
+- + yt[2][y]))));
++ (tb - (bsign * static_cast<int>(sqrt(double(xt[2][x]
++ + yt[2][y])))));
+
+ if (y & 1) {
+ p->red = (p->red >> 1) + (p->red >> 2);
Index: pkgsrc/wm/blackbox/patches/patch-lib_Menu.cc
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-lib_Menu.cc:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-lib_Menu.cc Thu Jun 10 12:48:50 2021
@@ -0,0 +1,87 @@
+$NetBSD: patch-lib_Menu.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Sunpro has problems with a non-const const_reverse_iterator.
+
+--- lib/Menu.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ lib/Menu.cc
+@@ -37,6 +37,7 @@
+
+ #include <cstdio>
+ #include <assert.h>
++#include <cstdlib>
+
+
+ bt::MenuStyle **bt::MenuStyle::styles = 0;
+@@ -365,7 +366,7 @@ unsigned int bt::Menu::insertItem(const
+ } else {
+ index = std::min(static_cast<size_t>(index), _items.size());
+ it = _items.begin();
+- std::advance<ItemList::iterator, signed>(it, index);
++ std::advance(it, index);
+ }
+
+ it = _items.insert(it, item);
+@@ -516,7 +517,7 @@ void bt::Menu::removeItem(unsigned int i
+
+ void bt::Menu::removeIndex(unsigned int index) {
+ ItemList::iterator it = _items.begin();
+- std::advance<ItemList::iterator, signed>(it, index);
++ std::advance(it, index);
+ if (it == _items.end())
+ return; // item not found
+ removeItemByIterator(it);
+@@ -1037,7 +1038,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+ const ItemList::const_iterator &end = _items.end();
+ ItemList::const_iterator anchor = _items.begin();
+ if (_active_index != ~0u) {
+- std::advance<ItemList::const_iterator, signed>(anchor, _active_index);
++ std::advance(anchor, _active_index);
+
+ // go one paste the current active index
+ if (anchor != end && !anchor->separator)
+@@ -1054,11 +1055,10 @@ void bt::Menu::keyPressEvent(const XKeyE
+ }
+
+ case XK_Up: {
+- ItemList::const_reverse_iterator anchor = _items.rbegin();
+- const ItemList::const_reverse_iterator &end = _items.rend();
++ ItemList::reverse_iterator anchor = _items.rbegin();
++ const ItemList::reverse_iterator &end = _items.rend();
+ if (_active_index != ~0u) {
+- std::advance<ItemList::const_reverse_iterator, signed>
+- (anchor, _items.size() - _active_index - 1);
++ std::advance(anchor, _items.size() - _active_index - 1);
+
+ // go one item past the current active index
+ if (anchor != end && !anchor->separator)
+@@ -1067,7 +1067,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+
+ if (anchor == end) anchor = _items.rbegin();
+
+- ItemList::const_reverse_iterator it =
++ ItemList::reverse_iterator it =
+ std::find_if(anchor, end, InteractMatch());
+ if (it != end)
+ activateIndex(it->indx);
+@@ -1075,8 +1075,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+ }
+
+ case XK_Home: {
+- const ItemList::const_iterator &end = _items.end();
+- ItemList::const_iterator it = _items.begin();
++ const ItemList::iterator &end = _items.end();
++ ItemList::iterator it = _items.begin();
+ it = std::find_if(it, end, InteractMatch());
+ if (it != end)
+ activateIndex(it->indx);
+@@ -1084,8 +1084,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+ }
+
+ case XK_End: {
+- const ItemList::const_reverse_iterator &end = _items.rend();
+- ItemList::const_reverse_iterator it = _items.rbegin();
++ const ItemList::reverse_iterator &end = _items.rend();
++ ItemList::reverse_iterator it = _items.rbegin();
+ it = std::find_if(it, end, InteractMatch());
+ if (it != end)
+ activateIndex(it->indx);
Index: pkgsrc/wm/blackbox/patches/patch-lib_Unicode.cc
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-lib_Unicode.cc:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-lib_Unicode.cc Thu Jun 10 12:48:50 2021
@@ -0,0 +1,45 @@
+$NetBSD: patch-lib_Unicode.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+--- lib/Unicode.cc.orig 2014-08-30 08:23:20.000000000 +0000
++++ lib/Unicode.cc
+@@ -35,6 +35,9 @@
+ # include <langinfo.h>
+ #endif
+
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
+
+ namespace bt {
+
+@@ -83,9 +86,13 @@ namespace bt {
+ if (cd == invalid)
+ return;
+
+- char *inp =
+- reinterpret_cast<char *>
++#if defined(__NetBSD__) && (__NetBSD_Version__-0 < 999001700)
++ const char *inp =
++ reinterpret_cast<const char *>
+ (const_cast<typename _Source::value_type *>(in.data()));
++#else
++ char *inp = const_cast<char *>(reinterpret_cast<const char *>((in.data())));
++#endif
+ const typename _Source::size_type in_size =
+ in.size() * sizeof(typename _Source::value_type);
+ typename _Source::size_type in_bytes = in_size;
+@@ -108,9 +115,13 @@ namespace bt {
+ case EINVAL:
+ {
+ const typename _Source::size_type off = in_size - in_bytes + 1;
++#if defined(__NetBSD__) && (__NetBSD_Version__-0 < 999001700)
+ inp =
+- reinterpret_cast<char *>
++ reinterpret_cast<const char *>
+ (const_cast<typename _Source::value_type *>(in.data()));
++#else
++ inp = const_cast<char *>(reinterpret_cast<const char *>((in.data())));
++#endif
+ in_bytes = in_size - off;
+ break;
+ }
Index: pkgsrc/wm/blackbox/patches/patch-src_Screen.cc
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-src_Screen.cc:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-src_Screen.cc Thu Jun 10 12:48:50 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_Screen.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Sunpro has problems with a non-const const_reverse_iterator.
+
+--- src/Screen.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ src/Screen.cc
+@@ -616,8 +616,8 @@ void BScreen::setCurrentWorkspace(unsign
+
+ // withdraw windows in reverse order to minimize the number of
+ // Expose events
+- StackingList::const_reverse_iterator it = _stackingList.rbegin();
+- const StackingList::const_reverse_iterator end = _stackingList.rend();
++ StackingList::reverse_iterator it = _stackingList.rbegin();
++ const StackingList::reverse_iterator end = _stackingList.rend();
+ for (; it != end; ++it) {
+ BlackboxWindow *win = dynamic_cast<BlackboxWindow *>(*it);
+ if (win && win->workspace() == current_workspace)
Index: pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc Thu Jun 10 12:48:50 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Toolbar.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Fix build failure when time_t is 64 bits on a 32-bit machine.
+
+--- src/Toolbar.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ src/Toolbar.cc
+@@ -43,8 +43,10 @@
+ long nextTimeout(int resolution)
+ {
+ timeval now;
++ int secs;
+ gettimeofday(&now, 0);
+- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l))
++ secs = now.tv_sec % resolution;
++ return (std::max(1000l, ((((resolution - secs) * 1000l))
+ - (now.tv_usec / 1000l))));
+ }
+
Index: pkgsrc/wm/blackbox/patches/patch-src_main.cc
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-src_main.cc:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-src_main.cc Thu Jun 10 12:48:50 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_main.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+Uses LC_ALL.
+
+--- src/main.cc.orig 2018-12-26 00:36:20.419139718 +0000
++++ src/main.cc
+@@ -36,7 +36,7 @@
+ #include "version.h"
+
+ #include <cstdio>
+-
++#include <clocale>
+ #include <cstring>
+
+
Index: pkgsrc/wm/blackbox/patches/patch-util_bsetbg
diff -u /dev/null pkgsrc/wm/blackbox/patches/patch-util_bsetbg:1.1
--- /dev/null Thu Jun 10 12:48:51 2021
+++ pkgsrc/wm/blackbox/patches/patch-util_bsetbg Thu Jun 10 12:48:50 2021
@@ -0,0 +1,10 @@
+$NetBSD: patch-util_bsetbg,v 1.1 2021/06/10 12:48:50 nia Exp $
+
+--- util/bsetbg.orig 2016-07-10 16:31:38.000000000 +0000
++++ util/bsetbg
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # Copyright (c) 2000-2002 Timothy M. King (tmk%lordzork.com@localhost)
+ #
Home |
Main Index |
Thread Index |
Old Index