blackbox70: Various fixes, now builds on SunOS.

4 files changed, 34 insertions, 26 deletions

diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile
index 8ef5b8191c0..bb9b8ed254d 100644
--- a/wm/blackbox70/Makefile
+++ b/wm/blackbox70/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/10/12 19:16:29 he Exp $
+# $NetBSD: Makefile,v 1.16 2018/10/23 12:26:06 jperkin Exp $
 
 VERSION=	0.72
 DISTNAME=	blackbox-${VERSION}
@@ -16,17 +16,18 @@ CONFLICTS=	bsetroot-[0-9]*
 CONFLICTS+=	blackbox-[0-9]*
 
 USE_LANGUAGES=	c c++03
-GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_TOOLS+=	automake autoconf gettext-m4
+USE_TOOLS+=	autoconf automake autopoint gettext-m4 gsed pkg-config
+GNU_CONFIGURE=	YES
+
+CONFIGURE_ARGS+=	--enable-nls
 
 LIBS+=		${BUILDLINK_LDADD.iconv}
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 pre-configure:
-		cd ${WRKSRC}; ${SH} ./autogen.sh
+	cd ${WRKSRC}; ${SH} ./autogen.sh
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/wm/blackbox70/PLIST b/wm/blackbox70/PLIST
index 9052d42e4c3..539eb3383b2 100644
--- a/wm/blackbox70/PLIST
+++ b/wm/blackbox70/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/10/12 18:00:55 he Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/10/23 12:26:06 jperkin Exp $
 bin/blackbox
 bin/bsetbg
 bin/bsetroot
@@ -53,3 +53,29 @@ share/blackbox/styles/Shade
 share/blackbox/styles/Spiff
 share/blackbox/styles/TDF
 share/blackbox/styles/Twice
+share/locale/da/LC_MESSAGES/blackbox.mo
+share/locale/de/LC_MESSAGES/blackbox.mo
+share/locale/en@boldquot/LC_MESSAGES/blackbox.mo
+share/locale/en@quot/LC_MESSAGES/blackbox.mo
+share/locale/es/LC_MESSAGES/blackbox.mo
+share/locale/es_AR/LC_MESSAGES/blackbox.mo
+share/locale/et/LC_MESSAGES/blackbox.mo
+share/locale/fr/LC_MESSAGES/blackbox.mo
+share/locale/hu/LC_MESSAGES/blackbox.mo
+share/locale/it/LC_MESSAGES/blackbox.mo
+share/locale/ja/LC_MESSAGES/blackbox.mo
+share/locale/ko/LC_MESSAGES/blackbox.mo
+share/locale/lv/LC_MESSAGES/blackbox.mo
+share/locale/nl/LC_MESSAGES/blackbox.mo
+share/locale/no/LC_MESSAGES/blackbox.mo
+share/locale/pl/LC_MESSAGES/blackbox.mo
+share/locale/pt_BR/LC_MESSAGES/blackbox.mo
+share/locale/ro/LC_MESSAGES/blackbox.mo
+share/locale/ru/LC_MESSAGES/blackbox.mo
+share/locale/sk/LC_MESSAGES/blackbox.mo
+share/locale/sl/LC_MESSAGES/blackbox.mo
+share/locale/sv/LC_MESSAGES/blackbox.mo
+share/locale/tr/LC_MESSAGES/blackbox.mo
+share/locale/uk/LC_MESSAGES/blackbox.mo
+share/locale/zh_CN/LC_MESSAGES/blackbox.mo
+share/locale/zh_TW/LC_MESSAGES/blackbox.mo
diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo
index e8bf0d643d0..d47ed82fb8a 100644
--- a/wm/blackbox70/distinfo
+++ b/wm/blackbox70/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2018/10/21 05:48:56 he Exp $
+$NetBSD: distinfo,v 1.10 2018/10/23 12:26:06 jperkin Exp $
 
 SHA1 (blackbox-0.72.tar.gz) = 87e90c7d6da9f94a79100433490b33de4189f194
 RMD160 (blackbox-0.72.tar.gz) = 3991d8512703cceafcd93185978684441d06d7d7
@@ -12,7 +12,6 @@ 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-Toolbar.cc) = 6f301302c3370b67feb22dc066ed4aac0624d23d
 SHA1 (patch-src_Screen.cc) = 7a75160a66eb6317930af063514688c6e5028569
 SHA1 (patch-src_Toolbar.cc) = 2fdcea33eff7b6a99f22ce7a77c9b713b4f005b5
 SHA1 (patch-util_bsetbg) = 2e5ea600ef842ff677591220398fb7300d210397
diff --git a/wm/blackbox70/patches/patch-src-Toolbar.cc b/wm/blackbox70/patches/patch-src-Toolbar.cc
deleted file mode 100644
index aae1fbc6722..00000000000
--- a/wm/blackbox70/patches/patch-src-Toolbar.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src-Toolbar.cc,v 1.1 2012/06/28 05:24:22 dholland Exp $
-
-Fix build failure when time_t is 64 bits on a 32-bit machine.
-
---- src/Toolbar.cc~	2005-04-12 07:38:00.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))));
- }
-