Make wm/blackbox the latest version, remove weird versioned packages

concept ok'd by gutteridge

58 files changed, 172 insertions, 701 deletions

diff --git a/wm/Makefile b/wm/Makefile
index bee80b40ba3..54f96808a73 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -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
diff --git a/wm/bbkeys/MESSAGE b/wm/bbkeys/MESSAGE
deleted file mode 100644
index 30b92b8854a..00000000000
--- a/wm/bbkeys/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/07/14 03:48:02 dholland Exp $
-
-This version of bbkeys does not work with semi-recent X servers (since
-Xorg) unless the compositing extension ("Composite") is disabled in
-the server configuration.
-===========================================================================
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index 6ea8f3549a5..8693fcb98b8 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -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
 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"
diff --git a/wm/bbkeys/PLIST b/wm/bbkeys/PLIST
index 2aebf7e327a..9913bcd2e63 100644
--- a/wm/bbkeys/PLIST
+++ b/wm/bbkeys/PLIST
@@ -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
diff --git a/wm/bbkeys/distinfo b/wm/bbkeys/distinfo
index 221e6919982..bf4ea4d07c5 100644
--- a/wm/bbkeys/distinfo
+++ b/wm/bbkeys/distinfo
@@ -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
diff --git a/wm/bbkeys09/patches/patch-Makefile.in b/wm/bbkeys/patches/patch-Makefile.in
index f8ec5d1419b..df06b782a74 100644
--- a/wm/bbkeys09/patches/patch-Makefile.in
+++ b/wm/bbkeys/patches/patch-Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/11/17 15:59:13 he Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2021/06/10 12:48:49 nia Exp $
 
 Place documents elsewhere.
 
diff --git a/wm/bbkeys/patches/patch-aa b/wm/bbkeys/patches/patch-aa
deleted file mode 100644
index 789729d637a..00000000000
--- a/wm/bbkeys/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/24 14:21:53 jschauma Exp $
-
---- Makefile.in.orig	Tue Sep 24 10:06:49 2002
-+++ Makefile.in	Tue Sep 24 10:07:14 2002
-@@ -80,7 +80,7 @@
- 
- SUBDIRS = src data doc redhat
- 
--docdir = $(prefix)/doc/bbkeys
-+docdir = $(prefix)/share/doc/bbkeys
- doc_DATA = README AUTHORS BUGS ChangeLog NEWS
- EXTRA_DIST = $(doc_DATA) debian
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/wm/bbkeys09/patches/patch-src_Config.cpp b/wm/bbkeys/patches/patch-src_Config.cpp
index ffaf2196fda..af00a943ec6 100644
--- a/wm/bbkeys09/patches/patch-src_Config.cpp
+++ b/wm/bbkeys/patches/patch-src_Config.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Config.cpp,v 1.2 2015/11/17 15:59:13 he Exp $
+$NetBSD: patch-src_Config.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
 
 Include strings.h too.
 
diff --git a/wm/bbkeys09/patches/patch-src_KeyClient.cpp b/wm/bbkeys/patches/patch-src_KeyClient.cpp
index fbde1e7b188..cc332edcf9b 100644
--- a/wm/bbkeys09/patches/patch-src_KeyClient.cpp
+++ b/wm/bbkeys/patches/patch-src_KeyClient.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_KeyClient.cpp,v 1.2 2015/11/17 15:59:13 he Exp $
+$NetBSD: patch-src_KeyClient.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
 
 Include strings.h too.
 Initialize all pointers.
diff --git a/wm/bbkeys09/patches/patch-src_Netclient.cpp b/wm/bbkeys/patches/patch-src_Netclient.cpp
index 92c71b857b0..4baea04234c 100644
--- a/wm/bbkeys09/patches/patch-src_Netclient.cpp
+++ b/wm/bbkeys/patches/patch-src_Netclient.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Netclient.cpp,v 1.2 2015/11/17 15:59:13 he Exp $
+$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.
 
diff --git a/wm/bbkeys09/patches/patch-src_ScreenHandler.cpp b/wm/bbkeys/patches/patch-src_ScreenHandler.cpp
index 1d710ef903b..94bb703e194 100644
--- a/wm/bbkeys09/patches/patch-src_ScreenHandler.cpp
+++ b/wm/bbkeys/patches/patch-src_ScreenHandler.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_ScreenHandler.cpp,v 1.1 2015/11/17 15:59:13 he Exp $
+$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,
diff --git a/wm/bbkeys09/DESCR b/wm/bbkeys09/DESCR
deleted file mode 100644
index f909dc57ed4..00000000000
--- a/wm/bbkeys09/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Provide keyboard shortcuts for X11R6, specifically intended for use with the
-Blackbox window manager but usable with any.
-
-Can bind actions such as executing commands, altering the states of windows,
-switching workspaces, etc. to arbitrary keys.
diff --git a/wm/bbkeys09/Makefile b/wm/bbkeys09/Makefile
deleted file mode 100644
index fa8f881c9a0..00000000000
--- a/wm/bbkeys09/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2021/05/24 19:55:09 wiz Exp $
-#
-
-DISTNAME=	bbkeys-0.9.1
-PKGNAME=	bbkeys09-0.9.1
-PKGREVISION=	7
-CATEGORIES=	x11 wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://bbkeys.sourceforge.net/
-COMMENT=	General X Window keygrabber
-LICENSE=	mit
-
-CONFLICTS+=	bbkeys<=0.9
-
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	perl:run pkg-config
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../wm/blackbox70/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"
diff --git a/wm/bbkeys09/PLIST b/wm/bbkeys09/PLIST
deleted file mode 100644
index c973bf3ab31..00000000000
--- a/wm/bbkeys09/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:40:04 joerg Exp $
-bin/bbkeys
-man/man1/bbkeys.1
-man/man5/bbkeysrc.5
-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
diff --git a/wm/bbkeys09/distinfo b/wm/bbkeys09/distinfo
deleted file mode 100644
index b5451f41346..00000000000
--- a/wm/bbkeys09/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2015/11/17 15:59:13 he Exp $
-
-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
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index f3edf788706..df073e0759e 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -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
 #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"
diff --git a/wm/bbpager/PLIST b/wm/bbpager/PLIST
index 9a21020802e..e0292b9cc70 100644
--- a/wm/bbpager/PLIST
+++ b/wm/bbpager/PLIST
@@ -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
diff --git a/wm/bbpager/distinfo b/wm/bbpager/distinfo
index 9334d62c6e5..e7122e32e4c 100644
--- a/wm/bbpager/distinfo
+++ b/wm/bbpager/distinfo
@@ -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
diff --git a/wm/bbpager/patches/patch-aa b/wm/bbpager/patches/patch-aa
index 8b7f7cce882..8d1f0a642e8 100644
--- a/wm/bbpager/patches/patch-aa
+++ b/wm/bbpager/patches/patch-aa
@@ -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
diff --git a/wm/bbpager/patches/patch-ab b/wm/bbpager/patches/patch-ab
index 087d20af4d6..23f4599c2cb 100644
--- a/wm/bbpager/patches/patch-ab
+++ b/wm/bbpager/patches/patch-ab
@@ -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
diff --git a/wm/bbpager/patches/patch-resource.cc b/wm/bbpager/patches/patch-resource.cc
deleted file mode 100644
index 03d6b848bf4..00000000000
--- a/wm/bbpager/patches/patch-resource.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-resource.cc,v 1.1 2015/07/17 04:53:28 bsiegert Exp $
-
---- resource.cc.orig	2015-07-17 04:49:35.000000000 +0000
-+++ resource.cc
-@@ -148,6 +148,7 @@ void Resource::SizeAndPosition() {
-        columns=1;
-      else {
-        position.vertical=True;
-+       position.horizontal=False;
-        if (columns==0) columns=1;
-      }
-   }
-@@ -159,6 +160,7 @@ void Resource::SizeAndPosition() {
-     if (sscanf(value.addr, "%u", &rows) != 1)
-       rows=1;
-     else {
-+      position.vertical=False;
-       position.horizontal=True;
-       if (rows==0) rows=1;
-     }
diff --git a/wm/bbpager04/patches/patch-src_Baseresource.cxx b/wm/bbpager/patches/patch-src_Baseresource.cxx
index c86e99460cf..83b93bca037 100644
--- a/wm/bbpager04/patches/patch-src_Baseresource.cxx
+++ b/wm/bbpager/patches/patch-src_Baseresource.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Baseresource.cxx,v 1.1 2011/11/25 22:22:05 joerg Exp $
+$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
diff --git a/wm/bbpager04/patches/patch-src_main.cxx b/wm/bbpager/patches/patch-src_main.cxx
index 0e535b75f35..2a938378d7b 100644
--- a/wm/bbpager04/patches/patch-src_main.cxx
+++ b/wm/bbpager/patches/patch-src_main.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_main.cxx,v 1.1 2011/11/25 22:22:05 joerg Exp $
+$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
diff --git a/wm/bbpager04/patches/patch-src_resource.cxx b/wm/bbpager/patches/patch-src_resource.cxx
index 63636a42672..44bc6e5a59b 100644
--- a/wm/bbpager04/patches/patch-src_resource.cxx
+++ b/wm/bbpager/patches/patch-src_resource.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_resource.cxx,v 1.1 2011/11/25 22:22:05 joerg Exp $
+$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
diff --git a/wm/bbpager04/DESCR b/wm/bbpager04/DESCR
deleted file mode 100644
index 91b869db9e3..00000000000
--- a/wm/bbpager04/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Pager for Blackbox window manager.
diff --git a/wm/bbpager04/Makefile b/wm/bbpager04/Makefile
deleted file mode 100644
index cb11ee56015..00000000000
--- a/wm/bbpager04/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2018/10/30 10:19:12 bsiegert Exp $
-
-DISTNAME=	bbpager-0.4.7
-PKGNAME=	bbpager04-0.4.7
-CATEGORIES=	wm x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbtools/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://bbtools.windsofstorm.net/available.phtml
-COMMENT=	Pager for the blackbox window manager
-LICENSE=	gnu-gpl-v2
-
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../wm/blackbox70/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"
diff --git a/wm/bbpager04/PLIST b/wm/bbpager04/PLIST
deleted file mode 100644
index 0031f480ac0..00000000000
--- a/wm/bbpager04/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:40:05 joerg Exp $
-bin/bbpager
-man/man1/bbpager.1
-man/man5/bbpager.bb.5
-share/bbtools/README.bbpager
-share/bbtools/bbpager.rc
diff --git a/wm/bbpager04/distinfo b/wm/bbpager04/distinfo
deleted file mode 100644
index feafd30709b..00000000000
--- a/wm/bbpager04/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2018/10/30 10:19:12 bsiegert Exp $
-
-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-src_Baseresource.cxx) = 7006a4d1a6fd703b13a4171701b2d2e69200a5dd
-SHA1 (patch-src_main.cxx) = c0f7db4d3e6ccff5fd39ac15ece795cc30d6648d
-SHA1 (patch-src_resource.cxx) = 219d895eb25b92aa2902ef763039a9d4e6fe873b
diff --git a/wm/bbpager04/patches/patch-aa b/wm/bbpager04/patches/patch-aa
deleted file mode 100644
index c725797f2f0..00000000000
--- a/wm/bbpager04/patches/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/08/20 23:07:18 jschauma Exp $
-
---- /dev/null	Fri Dec 13 18:13:40 2002
-+++ bbpager.1	Fri Dec 13 19:13:48 2002
-@@ -0,0 +1,84 @@
-+.TH BBPAGER 1 "August 08, 2001" bbpager "bbtools"
-+.SH NAME
-+bbpager \- a pager tool for Blackbox
-+
-+.SH SYNOPSIS
-+.B bbpager
-+[\fIOPTIONS\fR]
-+
-+.SH DESCRIPTION
-+\fBbbpager\fR is a pager for Blackbox and other Window Managers.
-+
-+.SH USAGE
-+By default \fBbbpager\fR reads the Blackbox style-file as defined in
-+\fI$HOME/.blackboxrc\fR and copies as much of the style as possible. The
-+result is an application which looks a lot like the toolbar.
-+
-+The \fI-geometry\fR is given as +x+y or -x-y (or combination)
-+where -x-y is the (x,y) distance of the right bottom of screen
-+to the right bottom of \fBbbpager\fR.
-+
-+So \fI-geometry -0-0\fR puts the application in the lower right corner of the
-+screen.
-+
-+.SH OPTIONS
-+A summary of the options supported by \fBbbpager\fR is included below.
-+
-+.TP
-+\fB\-c[onfig]\fR \fIfilename\fR
-+use alternate config file
-+.TP
-+.B \-d[ecorated]
-+Show 'normal' decorated window
-+.TP
-+\fB\-display\fR \fIdisplay name\fR
-+X server to connect to
-+.TP
-+\fB\-geom[etry]\fR \fIgeometry\fR
-+Set geometry of window
-+.TP
-+\fB\-h[elp]\fR
-+Show summary of options and exit.
-+.TP
-+\fB\-n[obb]\fR
-+fall back on default configuration
-+.TP
-+\fB\-s[hape]\fR
-+Don't display groundplate
-+.TP
-+\fB\-v[ersion]\fR
-+Display version number
-+.TP
-+\fB\-w[ithdrawn]\fR
-+Place bbtool in the Slit
-+
-+.SH FILES
-+Default: \fI$datadir=/usr/local/share/\fR
-+.br
-+.SS "Under Blackbox"
-+.nf
-+\fI$datadir/bbtools/bbpager.bb\fR the global configuration file
-+\fI$HOME/.bbtools/bbpager.bb\fR a local configuration file
-+
-+.SS "Under other Window managers"
-+.nf
-+\fI$datadir/bbtools/bbpager.nobb\fR the global configuration file
-+\fI$HOME/.bbtools/bbpager.nobb\fR a local configuration file
-+
-+.SH VERSION
-+0.3.1
-+
-+.SH BUGS
-+- reports X-windows errors on certain windows
-+.br
-+- moving 'stick'ed windows to other workspace causes segfault
-+.br
-+- shaded windows don't show as such on the pager
-+
-+.SH "SEE ALSO"
-+.BR bbpager.bb(5)
-+
-+.SH AUTHOR
-+John Kennis <j.m.b.m.kennis@ele.tue.nl> - bbpager
-+.br
-+Jan Schaumann <jschauma@netmeister.org> - this man page
diff --git a/wm/bbpager04/patches/patch-ab b/wm/bbpager04/patches/patch-ab
deleted file mode 100644
index 186ca775463..00000000000
--- a/wm/bbpager04/patches/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/08/20 23:07:18 jschauma Exp $
-
---- /dev/null	Fri Dec 13 18:13:40 2002
-+++ bbpager.bb.5	Fri Dec 13 19:12:19 2002
-@@ -0,0 +1,51 @@
-+.TH BBPAGER.BB 5 "August 08, 2001" bbpager.bb bbtools
-+.SH NAME
-+bbpager.bb \- bbpager configuration file
-+
-+.SH SYNOPSIS
-+.B $HOME/.bbtools/bbpager.bb
-+
-+.SH DESCRIPTION
-+By default \fBbbpager\fR reads the Blackbox style-file as defined in
-+\fI$HOME/.blackboxrc\fR and copies as much of the style as possible. The
-+result is an application which looks a lot like the toolbar.
-+
-+.SS "Reconfigure bbpager"
-+If the resource \fIbbpager.autoConfig\fR is set to \fItrue\fR the tool will
-+periodically check if the main config files, \fI$HOME/.blackboxrc\fR for
-+Blackbox users and the file specified in \fI$HOME/.bbtoolsrc\fR for other WM's
-+to see if they have changed. If so \fBbbpager\fR will reconfigure.
-+
-+.SS "Copying the look of the Blackbox toolbar"
-+\fBbbpager\fR automatically copies the style of the blackbox toolbar. It
-+copies:
-+
-+.nr
-+bevelWidth -> bbpager.bevelWidth
-+.br
-+toolbar -> bbpager.frame
-+.br
-+toolbar.label -> bbpager.label
-+.br
-+toolbar.color -> bbpager.frame.color
-+.br
-+toolbar.colorTo -> bbpager.frame.colorTo
-+.br
-+toolbar.label.color -> bbpager.label.color
-+.br
-+toolbar.label.colorTo -> bbpager.label.colorTo
-+.br
-+toolbar.textColor -> bbpager.textColor
-+
-+.SH WARNING
-+If \fI$HOME/.bbtoolsrc\fR is defined \fBbbpager\fR won't copy the blackbox
-+style.
-+
-+.SH "SEE ALSO"
-+.BR bbpager(1)
-+
-+.SH AUTHOR
-+.nr
-+John Kennis <j.m.b.m.kennis@ele.tue.nl> - bbpager
-+.br
-+Jan Schaumann <jschauma@netmeister.org> - this man page
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index b66e304c50d..b585adf6060 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -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
-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=	bsetroot-[0-9]*
+CONFLICTS+=	blackbox70-[0-9]*
+SUPERSEDES+=	blackbox70-[0-9]*
+PREV_PKGPATH=	wm/blackbox70
 
-CONFLICTS+=	blackbox70>=0.70.1
-
-USE_LANGUAGES=	c c++
+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"
diff --git a/wm/blackbox/PLIST b/wm/blackbox/PLIST
index 411c117879d..ec14d80a7d4 100644
--- a/wm/blackbox/PLIST
+++ b/wm/blackbox/PLIST
@@ -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
diff --git a/wm/blackbox/distinfo b/wm/blackbox/distinfo
index a43d65d79c6..270687d8cb0 100644
--- a/wm/blackbox/distinfo
+++ b/wm/blackbox/distinfo
@@ -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
diff --git a/wm/blackbox/patches/patch-aa b/wm/blackbox/patches/patch-aa
deleted file mode 100644
index 2981fdefb12..00000000000
--- a/wm/blackbox/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/11 19:07:40 tonio Exp $
-
---- doc/Makefile.in.orig	Wed Nov 20 12:08:31 2002
-+++ doc/Makefile.in	Wed Nov 20 12:08:43 2002
-@@ -75,7 +75,7 @@
- 
- CLEANFILES = blackbox.1
- MAINTAINERCLEANFILES = Makefile.in
--man_MANS = blackbox.1 bsetroot.1 bsetbg.1
-+man_MANS = blackbox.1
- 
- DEFAULT_MENU = $(pkgdatadir)/menu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/wm/blackbox/patches/patch-ab b/wm/blackbox/patches/patch-ab
deleted file mode 100644
index dbdf0bc6ce2..00000000000
--- a/wm/blackbox/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/11/11 19:22:39 tonio Exp $
-
---- Makefile.in.orig	Wed Nov 20 12:09:13 2002
-+++ Makefile.in	Wed Nov 20 12:09:22 2002
-@@ -75,7 +75,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = data doc nls src util
-+SUBDIRS = data doc nls src
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/wm/blackbox/patches/patch-ac b/wm/blackbox/patches/patch-ac
deleted file mode 100644
index 0eac7a0adf2..00000000000
--- a/wm/blackbox/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/02/20 16:54:17 jschauma Exp $
-
---- src/i18n.cc.orig	Thu Feb 20 11:26:34 2003
-+++ src/i18n.cc	Thu Feb 20 11:28:49 2003
-@@ -58,7 +58,8 @@
- I18n::I18n(void) {
-   mb = False;
- #ifdef    HAVE_SETLOCALE
--  locale = setlocale(LC_ALL, "");
-+  (void)setlocale(LC_ALL, "");
-+  locale = setlocale(LC_MESSAGES, NULL);
-   if (! locale) {
-     fprintf(stderr, "failed to set locale, reverting to \"C\"\n");
- #endif // HAVE_SETLOCALE
diff --git a/wm/blackbox/patches/patch-ad b/wm/blackbox/patches/patch-ad
deleted file mode 100644
index 290e41107e0..00000000000
--- a/wm/blackbox/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/08/30 20:34:14 reed Exp $
-
---- src/Window.cc.orig	2002-09-17 08:23:35.000000000 -0700
-+++ src/Window.cc
-@@ -44,6 +44,8 @@ extern "C" {
- #endif // HAVE_STDLIB_H
- }
- 
-+#include <cassert>
-+
- #include "i18n.hh"
- #include "blackbox.hh"
- #include "GCCache.hh"
diff --git a/wm/blackbox/patches/patch-ae b/wm/blackbox/patches/patch-ae
deleted file mode 100644
index 1c1be7d2a9a..00000000000
--- a/wm/blackbox/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/02 21:47:44 joerg Exp $
-
---- src/Timer.hh.orig	2006-01-02 21:42:01.000000000 +0000
-+++ src/Timer.hh
-@@ -98,9 +98,9 @@ public:
-   ~_timer_queue(void) {}
- 
-   void release(const _Tp& value) {
--    c.erase(std::remove(c.begin(), c.end(), value), c.end());
-+    this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end());
-     // after removing the item we need to make the heap again
--    std::make_heap(c.begin(), c.end(), comp);
-+    std::make_heap(this->c.begin(), this->c.end(), this->comp);
-   }
-   bool empty(void) const { return _Base::empty(); }
-   size_t size(void) const { return _Base::size(); }
diff --git a/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in b/wm/blackbox/patches/patch-doc_fr__FR_Makefile.in
index 1ae171accfd..f0ba9cf4831 100644
--- a/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in
+++ b/wm/blackbox/patches/patch-doc_fr__FR_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_fr__FR_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in b/wm/blackbox/patches/patch-doc_ja__JP_Makefile.in
index d0f019abf04..e96ce8f133e 100644
--- a/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in
+++ b/wm/blackbox/patches/patch-doc_ja__JP_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_ja__JP_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in b/wm/blackbox/patches/patch-doc_nl__NL_Makefile.in
index 6f188f78b1e..876855ac478 100644
--- a/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in
+++ b/wm/blackbox/patches/patch-doc_nl__NL_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_nl__NL_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in b/wm/blackbox/patches/patch-doc_sl__SI_Makefile.in
index d112edaa418..c9303b9d0c2 100644
--- a/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in
+++ b/wm/blackbox/patches/patch-doc_sl__SI_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_sl__SI_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-lib_Image.cc b/wm/blackbox/patches/patch-lib_Image.cc
index e87d65a92ff..2946e5b3e8e 100644
--- a/wm/blackbox70/patches/patch-lib_Image.cc
+++ b/wm/blackbox/patches/patch-lib_Image.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Image.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+$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).
diff --git a/wm/blackbox70/patches/patch-lib_Menu.cc b/wm/blackbox/patches/patch-lib_Menu.cc
index 66cb7a24922..f1113b88332 100644
--- a/wm/blackbox70/patches/patch-lib_Menu.cc
+++ b/wm/blackbox/patches/patch-lib_Menu.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Menu.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-lib_Unicode.cc b/wm/blackbox/patches/patch-lib_Unicode.cc
index ffc39836664..66e0ae9f48d 100644
--- a/wm/blackbox70/patches/patch-lib_Unicode.cc
+++ b/wm/blackbox/patches/patch-lib_Unicode.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Unicode.cc,v 1.2 2020/03/18 18:02:41 joerg Exp $
+$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
diff --git a/wm/blackbox/patches/patch-src_GCCache.cc b/wm/blackbox/patches/patch-src_GCCache.cc
deleted file mode 100644
index 5cfb6a85e9b..00000000000
--- a/wm/blackbox/patches/patch-src_GCCache.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_GCCache.cc,v 1.1 2013/04/30 22:34:32 joerg Exp $
-
---- src/GCCache.cc.orig	2013-04-30 19:20:02.000000000 +0000
-+++ src/GCCache.cc
-@@ -26,6 +26,7 @@
- #endif // HAVE_CONFIG_H
- 
- extern "C" {
-+#include <stdlib.h>
- #include <stdio.h>
- }
- 
diff --git a/wm/blackbox/patches/patch-src_Image.cc b/wm/blackbox/patches/patch-src_Image.cc
deleted file mode 100644
index 49202690edc..00000000000
--- a/wm/blackbox/patches/patch-src_Image.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_Image.cc,v 1.1 2011/11/26 17:22:25 joerg Exp $
-
---- src/Image.cc.orig	2011-11-26 14:37:13.000000000 +0000
-+++ src/Image.cc
-@@ -29,6 +29,7 @@
- #  include <stdio.h>
- #endif // HAVE_STDIO_H
- 
-+#include <cstring>
- #include <algorithm>
- using std::max;
- using std::min;
diff --git a/wm/blackbox/patches/patch-src_ImageControl.cc b/wm/blackbox/patches/patch-src_ImageControl.cc
deleted file mode 100644
index 860bb1fbf1f..00000000000
--- a/wm/blackbox/patches/patch-src_ImageControl.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_ImageControl.cc,v 1.1 2013/04/30 22:34:32 joerg Exp $
-
---- src/ImageControl.cc.orig	2013-04-30 19:20:20.000000000 +0000
-+++ src/ImageControl.cc
-@@ -34,6 +34,7 @@ extern "C" {
- #  include <ctype.h>
- #endif // HAVE_CTYPE_H
- 
-+#include <stdlib.h>
- #include <X11/Xlib.h>
- }
- 
diff --git a/wm/blackbox70/patches/patch-src_Screen.cc b/wm/blackbox/patches/patch-src_Screen.cc
index f1197d32f65..9204c5e04fe 100644
--- a/wm/blackbox70/patches/patch-src_Screen.cc
+++ b/wm/blackbox/patches/patch-src_Screen.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Screen.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-src_Toolbar.cc b/wm/blackbox/patches/patch-src_Toolbar.cc
index a3a47c8400c..2cdaadddd83 100644
--- a/wm/blackbox70/patches/patch-src_Toolbar.cc
+++ b/wm/blackbox/patches/patch-src_Toolbar.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Toolbar.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+$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.
 
diff --git a/wm/blackbox70/patches/patch-src_main.cc b/wm/blackbox/patches/patch-src_main.cc
index 00285cf02c4..631c2d42554 100644
--- a/wm/blackbox70/patches/patch-src_main.cc
+++ b/wm/blackbox/patches/patch-src_main.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_main.cc,v 1.1 2018/12/27 15:10:17 joerg Exp $
+$NetBSD: patch-src_main.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
 
 Uses LC_ALL.
 
diff --git a/wm/blackbox70/patches/patch-util_bsetbg b/wm/blackbox/patches/patch-util_bsetbg
index b5408d0129f..4592b0fc422 100644
--- a/wm/blackbox70/patches/patch-util_bsetbg
+++ b/wm/blackbox/patches/patch-util_bsetbg
@@ -1,4 +1,4 @@
-$NetBSD: patch-util_bsetbg,v 1.1 2018/10/12 18:00:55 he Exp $
+$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
diff --git a/wm/blackbox70/DESCR b/wm/blackbox70/DESCR
deleted file mode 100644
index e077c77e4ae..00000000000
--- a/wm/blackbox70/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Blackbox is yet another addition to the list of window managers for X11.
-Blackbox is built with C++, sharing no common code with any other window
-manager.  It is designed to be small and fast, with a built in graphics class,
-near complete ICCCM compliance, and support for multple desktop environments.
diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile
deleted file mode 100644
index dabe37ec4f2..00000000000
--- a/wm/blackbox70/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2021/06/08 21:42:33 gutteridge Exp $
-
-VERSION=	0.77
-DISTNAME=	blackbox-${VERSION}
-PKGNAME=	blackbox70-${VERSION}
-CATEGORIES=	wm x11
-MASTER_SITES=	${MASTER_SITE_GITHUB:=bbidulock/}
-GITHUB_PROJECT=	blackboxwm
-GITHUB_RELEASE=	${VERSION}
-EXTRACT_SUFX=	.tar.lz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/bbidulock/blackboxwm
-COMMENT=	Small and fast X11 window manager
-LICENSE=	mit
-
-CONFLICTS=	bsetroot-[0-9]*
-CONFLICTS+=	blackbox-[0-9]*
-
-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 "options.mk"
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox70/PLIST b/wm/blackbox70/PLIST
deleted file mode 100644
index d81c81fc5d8..00000000000
--- a/wm/blackbox70/PLIST
+++ /dev/null
@@ -1,81 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2020/09/30 03:07:25 gutteridge 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/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
diff --git a/wm/blackbox70/buildlink3.mk b/wm/blackbox70/buildlink3.mk
deleted file mode 100644
index 6b9ac0b9fd7..00000000000
--- a/wm/blackbox70/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/10/02 16:40:32 gutteridge Exp $
-
-BUILDLINK_TREE+=	blackbox70
-
-.if !defined(BLACKBOX70_BUILDLINK3_MK)
-BLACKBOX70_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.blackbox70+=	blackbox70>=0.70.0
-BUILDLINK_ABI_DEPENDS.blackbox70+=	blackbox70>=0.70.0
-BUILDLINK_PKGSRCDIR.blackbox70?=	../../wm/blackbox70
-
-pkgbase:= blackbox70
-.include "../../mk/pkg-build-options.mk"
-
-.include "../../x11/libX11/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.blackbox70:Mxft2}
-.include "../../x11/libXft/buildlink3.mk"
-.endif
-.endif # BLACKBOX70_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-blackbox70
diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo
deleted file mode 100644
index 4141a214b26..00000000000
--- a/wm/blackbox70/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.18 2021/06/08 21:42:33 gutteridge Exp $
-
-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
diff --git a/wm/blackbox70/options.mk b/wm/blackbox70/options.mk
deleted file mode 100644
index bddd4845cec..00000000000
--- a/wm/blackbox70/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $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