Index: head/x11-wm/blackbox/Makefile
===================================================================
--- head/x11-wm/blackbox/Makefile	(revision 402630)
+++ head/x11-wm/blackbox/Makefile	(revision 402631)
@@ -1,49 +1,53 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME=	blackbox
 PORTVERSION=	0.70.1
 PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}wm/${PORTNAME}wm/Blackbox%20${PORTVERSION}
 
 MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	Small and fast window manager for X11R6
 
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig iconv
 USE_XORG=	x11 xft
 LDFLAGS+=	${ICONV_LIB}
 
 PORTDOCS=	README.bbtools README.bsetbg
 
 OPTIONS_DEFINE=		TOOLS_ONLY
 TOOLS_ONLY_DESC=	Do not install window manager, only tools
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_Toolbar.cc
+.endif
+
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
 PKGNAMESUFFIX=	-tools
 COMMENT+=	(tools only)
 MAKE_ARGS=	SUBDIRS="doc lib util" bin_PROGRAMS=bsetroot
 INSTALL_TARGET=	-C util install		# XXX dirty hack :(
 .else
 PORTDOCS+=	AUTHORS COMPLIANCE ChangeLog README RELNOTES TODO
 .endif
 
 post-patch:
 # Fix the build with libX11 > 1.40
 	@${REINPLACE_CMD} -e 's/_XUTIL_H_/_X11&/' ${WRKSRC}/lib/Util.hh
 
 post-install:
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
 	@${REINPLACE_CMD} -E '/[^s]\/blackbox|bstyleconvert|lib|include/d' \
 		${TMPPLIST}
 	${INSTALL_MAN} ${MAN1:S#^#${WRKSRC}/doc/#} ${STAGEDIR}${MANPREFIX}/man/man1
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S#^#${WRKSRC}/#} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc
===================================================================
--- head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc	(nonexistent)
+++ head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc	(revision 402631)
@@ -0,0 +1,11 @@
+--- src/Toolbar.cc.orig	2015-05-11 11:54:54 UTC
++++ src/Toolbar.cc
+@@ -44,7 +44,7 @@ long nextTimeout(int resolution)
+ {
+   timeval now;
+   gettimeofday(&now, 0);
+-  return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l))
++  return (std::max(1000ll, ((((resolution - (now.tv_sec % resolution)) * 1000l))
+                            - (now.tv_usec / 1000l))));
+ }
+ 

Property changes on: head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property