Switch upstream for blackbox70, and upgrade to version 0.72.

The old upstream last had a release in November 2005, and the new
upstream in May this year.  In recent rebuilds, the old version
has developed "focus issues" when run with "sloppy focus", as is
my preference. The new upstream is a fork of blackbox but where
this among other issues have been fixed.

The patches have also been re-done and partly renamed, and some of
the old patches to build with SunPro have not been carried forward,
as I don't have a suitable system to verify that these are still
required.

26 files changed, 177 insertions, 223 deletions

diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile
index 8798f33ed62..511efce0b6e 100644
--- a/wm/blackbox70/Makefile
+++ b/wm/blackbox70/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.12 2018/07/18 00:06:24 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2018/10/12 18:00:55 he Exp $
 
-DISTNAME=	blackbox-0.70.1
-PKGNAME=	blackbox70-0.70.1
-PKGREVISION=	1
+VERSION=	0.72
+DISTNAME=	blackbox-${VERSION}
+PKGNAME=	blackbox70-${VERSION}
 CATEGORIES=	wm x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=bbidulock/}
+GITHUB_PROJECT=	blackboxwm
+GITHUB_TAG=	${VERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/bradleythughes/blackbox
-COMMENT=	Small and fast X11R6 window manager
+HOMEPAGE=	https://github.com/bbidulock/blackboxwm
+COMMENT=	Small and fast X11 window manager
 
 CONFLICTS=	bsetroot-[0-9]*
 CONFLICTS+=	blackbox-[0-9]*
@@ -17,11 +19,15 @@ USE_LANGUAGES=	c c++03
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
+USE_TOOLS+=	automake autoconf
 
 LIBS+=		${BUILDLINK_LDADD.iconv}
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+pre-configure:
+		cd ${WRKSRC}; ./autogen.sh
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/wm/blackbox70/PLIST b/wm/blackbox70/PLIST
index c332cacfa37..9052d42e4c3 100644
--- a/wm/blackbox70/PLIST
+++ b/wm/blackbox70/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:18:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/10/12 18:00:55 he Exp $
 bin/blackbox
 bin/bsetbg
 bin/bsetroot
@@ -23,12 +23,33 @@ 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
 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
 share/blackbox/menu
+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
diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo
index 1f4b4e45882..8da93d7eb43 100644
--- a/wm/blackbox70/distinfo
+++ b/wm/blackbox70/distinfo
@@ -1,22 +1,17 @@
-$NetBSD: distinfo,v 1.7 2015/11/02 23:42:51 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/10/12 18:00:55 he Exp $
 
-SHA1 (blackbox-0.70.1.tar.gz) = f0ab7e4b44ae6ee4c2a2136651afc567c47fe2cd
-RMD160 (blackbox-0.70.1.tar.gz) = ab80c43d42dbfac23c9f981885f25a42c66f51a6
-SHA512 (blackbox-0.70.1.tar.gz) = 99d1cd344b37c012828d2892bb6dfab2385aba6f1e3d981f7d976affe553856acadd6e17809fc01d5f6e7c1b8a423acab05c3c44405a716d3141e87a71e38798
-Size (blackbox-0.70.1.tar.gz) = 650400 bytes
-SHA1 (patch-aa) = 36e90d9a54329009c1d1fd9788ebe349858578b3
-SHA1 (patch-ab) = 1e568872f238e05be11d2a4f25cc38c9fa461b71
-SHA1 (patch-ac) = 5f7132230ab4c53bf5042a274592bae45c6a15ed
-SHA1 (patch-lib-Resource.cc) = 8ac7fee379aa940f85c7800572be5ee3bb4202c5
-SHA1 (patch-lib-Util.hh) = b0bbf923ee06d200666ce96b6bf5ad648b361fd8
-SHA1 (patch-lib-XDG.cc) = 55422803fd20b8f100816a204de7af22f00ba51c
-SHA1 (patch-lib_Display.cc) = 3b9c3dd6f9a309d4dc77409f3523608214e52926
-SHA1 (patch-lib_Pen.cc) = 41da4c0b2aad21d875be6521257e791926b31143
-SHA1 (patch-lib_Texture.cc) = 9c076e2f47d7ca99f422098323f19b60bbf389b4
-SHA1 (patch-src-BlackboxResource.cc) = 66d022f7a91f2054c45c3f38a0fe98da4ddce3de
-SHA1 (patch-src-ScreenResource.cc) = ec09befadf9e92bd9e9543f7e9b472639bf6e8d5
-SHA1 (patch-src-Toolbar.cc) = 6f301302c3370b67feb22dc066ed4aac0624d23d
-SHA1 (patch-src-main.cc) = c5469f129f13b77c403ae54beba134ab26631652
-SHA1 (patch-src_Window.cc) = fbf093e74c4d1779e65830ad6c32c0733bfc5ee3
-SHA1 (patch-src_blackbox.cc) = a17c3eec5f6375feb8e68c4d53811bae5ab94d5b
-SHA1 (patch-util-bsetroot.cc) = 87b3e5aab03facfce88286f25df14580c39582c6
+SHA1 (blackbox-0.72.tar.gz) = 87e90c7d6da9f94a79100433490b33de4189f194
+RMD160 (blackbox-0.72.tar.gz) = 3991d8512703cceafcd93185978684441d06d7d7
+SHA512 (blackbox-0.72.tar.gz) = 8fffb8857240cfa11876c29dbb61dff3381b8e5b6f1937e14c81202d30b0cbc23135e42c6d8829c6e7ab7cdc821a1a62fee34db59da9b846634175442c5d7c1e
+Size (blackbox-0.72.tar.gz) = 360673 bytes
+SHA1 (patch-autogen.sh) = 28074bddfdfb4df2d78122f6bb8089522028ef23
+SHA1 (patch-doc_fr__FR_Makefile.am) = 77fdac4d552af2ef0e8d43c5f6f8aeb0f8e20862
+SHA1 (patch-doc_ja__JP_Makefile.am) = e5dcdf4da59f805547cbf0cc9eb5d28468685e2b
+SHA1 (patch-doc_nl__NL_Makefile.am) = 951a4babc59a7a237cf662c7c3a2d2b865d9495b
+SHA1 (patch-doc_sl__SI_Makefile.am) = b348b43e5c8064cd4b46212d3bd609a2f41c7f02
+SHA1 (patch-lib_Image.cc) = ab49da02853b670843f4884517f0727d4569d50a
+SHA1 (patch-lib_Menu.cc) = b16a7439fa5db1d287e5353ec5986a9c3ffd6cfb
+SHA1 (patch-lib_Unicode.cc) = b2936e86dab0e4d0104312b5a387081a3fa02134
+SHA1 (patch-src_Screen.cc) = 7a75160a66eb6317930af063514688c6e5028569
+SHA1 (patch-src_Toolbar.cc) = 2fdcea33eff7b6a99f22ce7a77c9b713b4f005b5
+SHA1 (patch-util_bsetbg) = 2e5ea600ef842ff677591220398fb7300d210397
diff --git a/wm/blackbox70/patches/patch-autogen.sh b/wm/blackbox70/patches/patch-autogen.sh
new file mode 100644
index 00000000000..6b019785174
--- /dev/null
+++ b/wm/blackbox70/patches/patch-autogen.sh
@@ -0,0 +1,10 @@
+$NetBSD: patch-autogen.sh,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- autogen.sh.orig	2016-07-10 16:31:38.000000000 +0000
++++ autogen.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ cd "$(dirname "$0")"
+ 
diff --git a/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am b/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am
new file mode 100644
index 00000000000..2ca0a9c2288
--- /dev/null
+++ b/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_fr__FR_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/fr_FR/Makefile.am.orig	2018-10-10 08:41:59.978660422 +0000
++++ doc/fr_FR/Makefile.am
+@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in
+ 	$(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ 		-e "s,@pkgdatadir@,$(pkgdatadir)," \
+ 		-e "s,@version@,$(VERSION)," \
+-		$< > $@
++		blackbox.1.in > $@
+ 
diff --git a/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am b/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am
new file mode 100644
index 00000000000..c4e012dea1f
--- /dev/null
+++ b/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_ja__JP_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/ja_JP/Makefile.am.orig	2018-10-10 08:42:03.331555177 +0000
++++ doc/ja_JP/Makefile.am
+@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in
+ 	$(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ 		-e "s,@pkgdatadir@,$(pkgdatadir)," \
+ 		-e "s,@version@,$(VERSION)," \
+-		$< > $@
++		blackbox.1.in > $@
+ 
diff --git a/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am b/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am
new file mode 100644
index 00000000000..3c3bafb45da
--- /dev/null
+++ b/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_nl__NL_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/nl_NL/Makefile.am.orig	2018-10-10 08:42:06.624393977 +0000
++++ doc/nl_NL/Makefile.am
+@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in
+ 	$(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ 		-e "s,@pkgdatadir@,$(pkgdatadir)," \
+ 		-e "s,@version@,$(VERSION)," \
+-		$< > $@
++		blackbox.1.in > $@
+ 
diff --git a/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am b/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am
new file mode 100644
index 00000000000..2269767daa0
--- /dev/null
+++ b/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_sl__SI_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/sl_SI/Makefile.am.orig	2018-10-10 08:42:10.007327109 +0000
++++ doc/sl_SI/Makefile.am
+@@ -20,5 +20,5 @@ blackbox.1: blackbox.1.in
+ 	$(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ 		-e "s,@pkgdatadir@,$(pkgdatadir)," \
+ 		-e "s,@version@,$(VERSION)," \
+-		$< > $@
++		blackbox.1.in > $@
+ 
diff --git a/wm/blackbox70/patches/patch-lib-Resource.cc b/wm/blackbox70/patches/patch-lib-Resource.cc
deleted file mode 100644
index 0c344257138..00000000000
--- a/wm/blackbox70/patches/patch-lib-Resource.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-lib-Resource.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
-
---- lib/Resource.cc.orig	2011-11-22 18:36:20.000000000 +0000
-+++ lib/Resource.cc
-@@ -29,6 +29,7 @@
- #include <X11/Xresource.h>
- 
- #include <stdio.h>
-+#include <strings.h>
- 
- 
- bt::Resource::Resource(void)
diff --git a/wm/blackbox70/patches/patch-lib-Util.hh b/wm/blackbox70/patches/patch-lib-Util.hh
deleted file mode 100644
index 85e62b6af43..00000000000
--- a/wm/blackbox70/patches/patch-lib-Util.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib-Util.hh,v 1.1 2011/09/24 13:01:29 joerg Exp $
-
---- lib/Util.hh.orig	2011-09-22 13:58:57.000000000 +0000
-+++ lib/Util.hh
-@@ -94,7 +94,7 @@ namespace bt {
- 
-   std::string tolower(const std::string &string);
- 
--#ifdef _XUTIL_H_
-+#if defined(_XUTIL_H_) || defined(_X11_XUTIL_H_)
-   std::string textPropertyToString(::Display *display,
-                                    ::XTextProperty& text_prop);
- #endif
diff --git a/wm/blackbox70/patches/patch-lib-XDG.cc b/wm/blackbox70/patches/patch-lib-XDG.cc
deleted file mode 100644
index eab1dca138f..00000000000
--- a/wm/blackbox70/patches/patch-lib-XDG.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib-XDG.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
-
---- lib/XDG.cc.orig	2011-11-22 18:41:39.000000000 +0000
-+++ lib/XDG.cc
-@@ -26,7 +26,7 @@
- #include "XDG.hh"
- 
- #include <stdlib.h>
--
-+#include <algorithm>
- 
- // make sure directory names end with a slash
- static std::string terminateDir(const std::string &string)
diff --git a/wm/blackbox70/patches/patch-lib_Display.cc b/wm/blackbox70/patches/patch-lib_Display.cc
deleted file mode 100644
index 872f603f19b..00000000000
--- a/wm/blackbox70/patches/patch-lib_Display.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_Display.cc,v 1.1 2013/04/29 21:27:15 joerg Exp $
-
---- lib/Display.cc.orig	2013-04-28 12:56:05.000000000 +0000
-+++ lib/Display.cc
-@@ -31,7 +31,7 @@
- #include <assert.h>
- #include <fcntl.h>
- #include <stdio.h>
--
-+#include <stdlib.h>
- 
- namespace bt {
- 
diff --git a/wm/blackbox70/patches/patch-aa b/wm/blackbox70/patches/patch-lib_Image.cc
index e018dc85d09..e87d65a92ff 100644
--- a/wm/blackbox70/patches/patch-aa
+++ b/wm/blackbox70/patches/patch-lib_Image.cc
@@ -1,19 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2011/11/22 20:02:48 joerg Exp $
+$NetBSD: patch-lib_Image.cc,v 1.1 2018/10/12 18:00:55 he Exp $
 
 Sunpro cannot resolve sqrt(int) to either sqrt(double) or
 sqrt(long double).
 
---- lib/Image.cc.orig	2005-04-08 15:41:09.000000000 +0000
+--- lib/Image.cc.orig	2016-07-10 16:31:38.000000000 +0000
 +++ lib/Image.cc
-@@ -44,6 +44,7 @@
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- // #define COLORTABLE_DEBUG
- // #define MITSHM_DEBUG
-@@ -1694,14 +1695,14 @@ void bt::Image::egradient(const Color &f
+@@ -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>
@@ -34,7 +26,7 @@ sqrt(long double).
        }
      }
    } else {
-@@ -1709,14 +1710,14 @@ void bt::Image::egradient(const Color &f
+@@ -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>
diff --git a/wm/blackbox70/patches/patch-ab b/wm/blackbox70/patches/patch-lib_Menu.cc
index a5ead2ed837..66cb7a24922 100644
--- a/wm/blackbox70/patches/patch-ab
+++ b/wm/blackbox70/patches/patch-lib_Menu.cc
@@ -1,22 +1,18 @@
-$NetBSD: patch-ab,v 1.2 2013/04/29 21:27:15 joerg Exp $
+$NetBSD: patch-lib_Menu.cc,v 1.1 2018/10/12 18:00:55 he Exp $
 
 Sunpro has problems with a non-const const_reverse_iterator.
 
---- lib/Menu.cc.orig	2005-01-27 17:08:22.000000000 +0000
+--- lib/Menu.cc.orig	2016-07-10 16:31:38.000000000 +0000
 +++ lib/Menu.cc
-@@ -33,9 +33,9 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
+@@ -37,6 +37,7 @@
  
--#include <stdio.h>
+ #include <cstdio>
  #include <assert.h>
--
-+#include <stdio.h>
-+#include <stdlib.h>
++#include <cstdlib>
  
- bt::MenuStyle **bt::MenuStyle::styles = 0;
  
-@@ -363,7 +363,7 @@ unsigned int bt::Menu::insertItem(const 
+ 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();
@@ -25,7 +21,7 @@ Sunpro has problems with a non-const const_reverse_iterator.
    }
  
    it = _items.insert(it, item);
-@@ -514,7 +514,7 @@ void bt::Menu::removeItem(unsigned int i
+@@ -516,7 +517,7 @@ void bt::Menu::removeItem(unsigned int i
  
  void bt::Menu::removeIndex(unsigned int index) {
    ItemList::iterator it = _items.begin();
@@ -34,7 +30,7 @@ Sunpro has problems with a non-const const_reverse_iterator.
    if (it == _items.end())
      return; // item not found
    removeItemByIterator(it);
-@@ -1035,7 +1035,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+@@ -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) {
@@ -43,7 +39,7 @@ Sunpro has problems with a non-const const_reverse_iterator.
  
        // go one paste the current active index
        if (anchor != end && !anchor->separator)
-@@ -1052,11 +1052,10 @@ void bt::Menu::keyPressEvent(const XKeyE
+@@ -1054,11 +1055,10 @@ void bt::Menu::keyPressEvent(const XKeyE
    }
  
    case XK_Up: {
@@ -58,7 +54,7 @@ Sunpro has problems with a non-const const_reverse_iterator.
  
        // go one item past the current active index
        if (anchor != end && !anchor->separator)
-@@ -1065,7 +1064,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+@@ -1067,7 +1067,7 @@ void bt::Menu::keyPressEvent(const XKeyE
  
      if (anchor == end) anchor = _items.rbegin();
  
@@ -67,7 +63,7 @@ Sunpro has problems with a non-const const_reverse_iterator.
        std::find_if(anchor, end, InteractMatch());
      if (it != end)
        activateIndex(it->indx);
-@@ -1073,8 +1072,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+@@ -1075,8 +1075,8 @@ void bt::Menu::keyPressEvent(const XKeyE
    }
  
    case XK_Home: {
@@ -78,7 +74,7 @@ Sunpro has problems with a non-const const_reverse_iterator.
      it = std::find_if(it, end, InteractMatch());
      if (it != end)
        activateIndex(it->indx);
-@@ -1082,8 +1081,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+@@ -1084,8 +1084,8 @@ void bt::Menu::keyPressEvent(const XKeyE
    }
  
    case XK_End: {
diff --git a/wm/blackbox70/patches/patch-lib_Pen.cc b/wm/blackbox70/patches/patch-lib_Pen.cc
deleted file mode 100644
index f279c870c7a..00000000000
--- a/wm/blackbox70/patches/patch-lib_Pen.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-lib_Pen.cc,v 1.1 2013/04/29 21:27:15 joerg Exp $
-
---- lib/Pen.cc.orig	2013-04-28 12:57:35.000000000 +0000
-+++ lib/Pen.cc
-@@ -36,6 +36,7 @@
- 
- #include <assert.h>
- #include <stdio.h>
-+#include <stdlib.h>
- 
- // #define PENCACHE_DEBUG
- 
diff --git a/wm/blackbox70/patches/patch-lib_Texture.cc b/wm/blackbox70/patches/patch-lib_Texture.cc
deleted file mode 100644
index a760287757f..00000000000
--- a/wm/blackbox70/patches/patch-lib_Texture.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_Texture.cc,v 1.1 2013/04/29 21:27:15 joerg Exp $
-
---- lib/Texture.cc.orig	2013-04-28 12:59:39.000000000 +0000
-+++ lib/Texture.cc
-@@ -31,7 +31,7 @@
- 
- #include <X11/Xlib.h>
- #include <ctype.h>
--
-+#include <stdlib.h>
- 
- void bt::Texture::setColor1(const bt::Color &new_color) {
-   c1 = new_color;
diff --git a/wm/blackbox70/patches/patch-lib_Unicode.cc b/wm/blackbox70/patches/patch-lib_Unicode.cc
new file mode 100644
index 00000000000..37d60e645a4
--- /dev/null
+++ b/wm/blackbox70/patches/patch-lib_Unicode.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_Unicode.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- lib/Unicode.cc.orig	2016-07-10 16:31:38.000000000 +0000
++++ lib/Unicode.cc
+@@ -83,8 +83,8 @@ namespace bt {
+     if (cd == invalid)
+       return;
+ 
+-    char *inp =
+-      reinterpret_cast<char *>
++    const char *inp =
++      reinterpret_cast<const char *>
+       (const_cast<typename _Source::value_type *>(in.data()));
+     const typename _Source::size_type in_size =
+       in.size() * sizeof(typename _Source::value_type);
+@@ -109,7 +109,7 @@ namespace bt {
+           {
+             const typename _Source::size_type off = in_size - in_bytes + 1;
+             inp =
+-              reinterpret_cast<char *>
++              reinterpret_cast<const char *>
+               (const_cast<typename _Source::value_type *>(in.data()));
+             in_bytes = in_size - off;
+             break;
diff --git a/wm/blackbox70/patches/patch-src-BlackboxResource.cc b/wm/blackbox70/patches/patch-src-BlackboxResource.cc
deleted file mode 100644
index fc8dc8e1ee5..00000000000
--- a/wm/blackbox70/patches/patch-src-BlackboxResource.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src-BlackboxResource.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
-
---- src/BlackboxResource.cc.orig	2011-11-22 18:43:51.000000000 +0000
-+++ src/BlackboxResource.cc
-@@ -32,6 +32,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
-+#include <strings.h>
- 
- 
- BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
diff --git a/wm/blackbox70/patches/patch-src-ScreenResource.cc b/wm/blackbox70/patches/patch-src-ScreenResource.cc
deleted file mode 100644
index deeb6669cab..00000000000
--- a/wm/blackbox70/patches/patch-src-ScreenResource.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src-ScreenResource.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
-
---- src/ScreenResource.cc.orig	2011-11-22 18:52:35.000000000 +0000
-+++ src/ScreenResource.cc
-@@ -32,7 +32,7 @@
- #include <Resource.hh>
- 
- #include <assert.h>
--
-+#include <strings.h>
- 
- static const int iconify_width  = 9;
- static const int iconify_height = 9;
diff --git a/wm/blackbox70/patches/patch-src-main.cc b/wm/blackbox70/patches/patch-src-main.cc
deleted file mode 100644
index 51dca62fee3..00000000000
--- a/wm/blackbox70/patches/patch-src-main.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src-main.cc,v 1.2 2013/04/29 21:27:15 joerg Exp $
-
---- src/main.cc.orig	2005-01-03 09:42:57.000000000 +0000
-+++ src/main.cc
-@@ -35,7 +35,8 @@
- #include "../version.h"
- 
- #include <stdio.h>
--
-+#include <stdlib.h>
-+#include <string.h>
- 
- static void showHelp(int exitval) {
-   // print version - this should not be localized!
diff --git a/wm/blackbox70/patches/patch-ac b/wm/blackbox70/patches/patch-src_Screen.cc
index 4dfe2b0da1c..f1197d32f65 100644
--- a/wm/blackbox70/patches/patch-ac
+++ b/wm/blackbox70/patches/patch-src_Screen.cc
@@ -1,19 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2011/11/22 20:02:48 joerg Exp $
+$NetBSD: patch-src_Screen.cc,v 1.1 2018/10/12 18:00:55 he Exp $
 
 Sunpro has problems with a non-const const_reverse_iterator.
 
---- src/Screen.cc.orig	2005-10-18 08:07:22.000000000 +0000
+--- src/Screen.cc.orig	2016-07-10 16:31:38.000000000 +0000
 +++ src/Screen.cc
-@@ -47,7 +47,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <dirent.h>
--
-+#include <string.h>
- 
- static bool running = true;
- static int anotherWMRunning(Display *, XErrorEvent *) {
-@@ -492,8 +492,8 @@ void BScreen::setCurrentWorkspace(unsign
+@@ -616,8 +616,8 @@ void BScreen::setCurrentWorkspace(unsign
  
      // withdraw windows in reverse order to minimize the number of
      // Expose events
diff --git a/wm/blackbox70/patches/patch-src_Toolbar.cc b/wm/blackbox70/patches/patch-src_Toolbar.cc
new file mode 100644
index 00000000000..a3a47c8400c
--- /dev/null
+++ b/wm/blackbox70/patches/patch-src_Toolbar.cc
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Toolbar.cc,v 1.1 2018/10/12 18:00:55 he 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))));
+ }
+ 
diff --git a/wm/blackbox70/patches/patch-src_Window.cc b/wm/blackbox70/patches/patch-src_Window.cc
deleted file mode 100644
index 432bb1d15b2..00000000000
--- a/wm/blackbox70/patches/patch-src_Window.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_Window.cc,v 1.1 2013/04/29 21:27:15 joerg Exp $
-
---- src/Window.cc.orig	2013-04-28 13:03:26.000000000 +0000
-+++ src/Window.cc
-@@ -43,6 +43,7 @@
- #endif
- 
- #include <assert.h>
-+#include <stdlib.h>
- 
- /*
-   sometimes C++ is a pain in the ass... it gives us stuff like the
diff --git a/wm/blackbox70/patches/patch-src_blackbox.cc b/wm/blackbox70/patches/patch-src_blackbox.cc
deleted file mode 100644
index 282f61cc598..00000000000
--- a/wm/blackbox70/patches/patch-src_blackbox.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_blackbox.cc,v 1.1 2013/04/29 21:27:15 joerg Exp $
-
---- src/blackbox.cc.orig	2013-04-28 13:04:23.000000000 +0000
-+++ src/blackbox.cc
-@@ -35,6 +35,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
-+#include <stdlib.h>
- #include <signal.h>
- #include <unistd.h>
- 
diff --git a/wm/blackbox70/patches/patch-util-bsetroot.cc b/wm/blackbox70/patches/patch-util-bsetroot.cc
deleted file mode 100644
index 173592cfe8e..00000000000
--- a/wm/blackbox70/patches/patch-util-bsetroot.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-util-bsetroot.cc,v 1.1 2011/11/22 20:02:48 joerg Exp $
-
---- util/bsetroot.cc.orig	2011-11-22 19:00:21.000000000 +0000
-+++ util/bsetroot.cc
-@@ -31,7 +31,8 @@
- 
- #include <X11/Xatom.h>
- #include <stdio.h>
--
-+#include <stdlib.h>
-+#include <string.h>
- 
- // ignore all X errors
- static int x11_error(::Display *, XErrorEvent *)
diff --git a/wm/blackbox70/patches/patch-util_bsetbg b/wm/blackbox70/patches/patch-util_bsetbg
new file mode 100644
index 00000000000..b5408d0129f
--- /dev/null
+++ b/wm/blackbox70/patches/patch-util_bsetbg
@@ -0,0 +1,10 @@
+$NetBSD: patch-util_bsetbg,v 1.1 2018/10/12 18:00:55 he 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)
+ #