Index: head/x11-wm/fluxbox/Makefile
===================================================================
--- head/x11-wm/fluxbox/Makefile	(revision 508347)
+++ head/x11-wm/fluxbox/Makefile	(revision 508348)
@@ -1,93 +1,66 @@
 # Created by: spn
 # $FreeBSD$
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.3.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Small and fast window manager based on BlackBox
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	xmessage:x11/xmessage
 LIB_DEPENDS=	libfribidi.so:converters/fribidi \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		gmake pkgconfig
 
 USE_XORG=	x11 xext xorgproto xft xpm xrandr
 GNU_CONFIGURE=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
 
-DOCSVERSION=	20060629
-
-OPTIONS_DEFINE=	DOCS DOCHTML PDFDOCS DEBUG IMLIB2 XINERAMA \
+OPTIONS_DEFINE=	DOCS DEBUG IMLIB2 XINERAMA \
 		XRENDER NLS SLIT SYSTRAY REMEMBER TOOLBAR
 OPTIONS_DEFAULT=	XRENDER SLIT SYSTRAY REMEMBER TOOLBAR XINERAMA
-DOCHTML_DESC=	Install html documentation
-PDFDOCS_DESC=	Build and install PDF documentation
 REMEMBER_DESC=	Enable remember feature
 SLIT_DESC=	Enable slit feature
 SYSTRAY_DESC=	Enable systray feature
 TOOLBAR_DESC=	Enable toolbar feature
 XRENDER_DESC=	Enable xrender support
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 IMLIB2_CONFIGURE_ENABLE=	imlib2
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	iconv
 NLS_VARS=	CPPFLAGS+="-I${LOCALBASE}/include" LIBS+="-L${LOCALBASE}/lib ${ICONV_LIB}"
 NLS_VARS_OFF=	CPPFLAGS+="-I${LOCALBASE}/include" LIBS+="-L${LOCALBASE}/lib"
 REMEMBER_CONFIGURE_ENABLE=	remember
 SLIT_CONFIGURE_ENABLE=	slit
 SYSTRAY_CONFIGURE_ENABLE=	systray
 TOOLBAR_CONFIGURE_ENABLE=	toolbar
 XINERAMA_CONFIGURE_ENABLE=	xinerama
 XINERAMA_USE=	XORG=xinerama
 XRENDER_USE=	XORG=xrender
 XRENDER_CONFIGURE_ENABLE=	xrender
 
-# http://fluxbox.org/docbook/en/tarballs/
-DOCHTML_MASTER_SITES=	LOCAL/mezz:html \
-			http://people.freebsd.org/~mezz/distfiles/:html
-DOCHTML_DISTFILES=	fb-doc-mfhtml-${DOCSVERSION}.tgz:html
-DOCHTML_EXTRACT_ONLY=	fb-doc-mfhtml-${DOCSVERSION}.tgz
-# http://fluxbox.org/docbook/en/pdf/
-PDFDOCS_MASTER_SITES=	LOCAL/mezz:pdf \
-			http://people.freebsd.org/~mezz/distfiles/:pdf
-PDFDOCS_DISTFILES=	fluxbook-${DOCSVERSION}.pdf:pdf
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/util/fluxbox-generate_menu.in ${WRKSRC}/util/fbsetbg
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|iconv_works=yes|iconv_works=no|' \
 		${WRKSRC}/configure
 
 post-install-DOCS-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog NEWS README TODO" \
 		${STAGEDIR}${DOCSDIR})
-
-post-install-PDFDOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
-	${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \
-		${STAGEDIR}${DOCSDIR}/pdf/
-
-post-install-DOCHTML-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-. for h in *.css *.html
-	(cd ${WRKDIR}/html && ${INSTALL_DATA} ${h} ${STAGEDIR}${DOCSDIR}/html)
-. endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/fluxbox/distinfo
===================================================================
--- head/x11-wm/fluxbox/distinfo	(revision 508347)
+++ head/x11-wm/fluxbox/distinfo	(revision 508348)
@@ -1,6 +1,3 @@
+TIMESTAMP = 1565199689
 SHA256 (fluxbox-1.3.7.tar.gz) = c99e2baa06fff1e96342b20415059d12ff1fa2917ade0173c75b2fa570295b9f
 SIZE (fluxbox-1.3.7.tar.gz) = 1267833
-SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
-SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
-SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde
-SIZE (fluxbook-20060629.pdf) = 430351
Index: head/x11-wm/fluxbox/files/patch-util_fbsetbg
===================================================================
--- head/x11-wm/fluxbox/files/patch-util_fbsetbg	(revision 508347)
+++ head/x11-wm/fluxbox/files/patch-util_fbsetbg	(revision 508348)
@@ -1,43 +1,43 @@
---- util/fbsetbg.orig	2008-09-22 13:47:05.000000000 -0500
-+++ util/fbsetbg	2008-09-22 13:52:03.000000000 -0500
-@@ -49,7 +49,7 @@
+--- util/fbsetbg.orig	2015-02-08 10:44:45 UTC
++++ util/fbsetbg
+@@ -49,7 +49,7 @@ lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
  
  
  WHOAMI=`whoami`
 -[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
 +[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
  
  command="`basename \"$0\"`"
  
-@@ -129,9 +129,28 @@
+@@ -133,9 +133,28 @@ Common tips to use with $command:
  EOF
  }
  
 -find_it() {
 -    [ -n "$1" ] && hash $1 2> /dev/null
 -}
 +# some which's have a reliable return code, some don't
 +# Lets figure out which which we have.
 +if which this_program_does_not_exist-no_really-aA1zZ9 >/dev/null 2>/dev/null; then
 +    # can't rely on return value
 +    find_it() {
 +        file=`which $1 2> /dev/null`
 +        if [ -x "$file" ]; then
 +            if [ $# -gt 1 ]; then
 +                shift
 +                $*
 +            fi
 +            return 0
 +        else
 +            return 1
 +        fi
 +    }
 +else
 +    # can rely on return value
 +    find_it() {
 +        which $1 > /dev/null 2>&1 && shift && $*
 +    }
 +fi
  
  message() {