Index: head/x11-wm/libwraster/Makefile
===================================================================
--- head/x11-wm/libwraster/Makefile	(revision 463176)
+++ head/x11-wm/libwraster/Makefile	(revision 463177)
@@ -1,49 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTVERSION=	0.95.7
-PORTREVISION=	5
+PORTVERSION=	0.95.8
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Window Maker raster graphics library
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libMagickWand-6.so:graphics/ImageMagick
 
-USES=		jpeg libtool pathfix pkgconfig
+USES=		jpeg libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xft xinerama xmu xpm
+USE_XORG=	x11 xext xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
 INSTALL_WRKSRC=	${WRKSRC}/wrlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-localedir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
 		--with-gnustepdir="${PREFIX}/GNUstep" \
 		--enable-modelock \
 		--enable-xinerama \
 		--enable-usermenu \
 		--enable-wmreplace \
 		--with-x
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} config-paths.h
 
 post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} \
 	    get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/x11-wm/libwraster/distinfo
===================================================================
--- head/x11-wm/libwraster/distinfo	(revision 463176)
+++ head/x11-wm/libwraster/distinfo	(revision 463177)
@@ -1,2 +1,3 @@
-SHA256 (WindowMaker-0.95.7.tar.gz) = 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
-SIZE (WindowMaker-0.95.7.tar.gz) = 3238325
+TIMESTAMP = 1519792748
+SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
+SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
Index: head/x11-wm/libwraster/pkg-plist
===================================================================
--- head/x11-wm/libwraster/pkg-plist	(revision 463176)
+++ head/x11-wm/libwraster/pkg-plist	(revision 463177)
@@ -1,8 +1,8 @@
 bin/get-wraster-flags
 include/wraster.h
 lib/libwraster.a
 lib/libwraster.so
-lib/libwraster.so.5
-lib/libwraster.so.5.0.0
+lib/libwraster.so.6
+lib/libwraster.so.6.0.0
 libdata/pkgconfig/wrlib.pc
 man/man1/get-wraster-flags.1.gz
Index: head/x11-wm/windowmaker/Makefile
===================================================================
--- head/x11-wm/windowmaker/Makefile	(revision 463176)
+++ head/x11-wm/windowmaker/Makefile	(revision 463177)
@@ -1,66 +1,67 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.95.8
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GNUstep-compliant NeXTstep window manager clone
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libMagickWand-6.so:graphics/ImageMagick \
-		libwraster.so:x11-wm/libwraster \
+		libwraster.so.6:x11-wm/libwraster \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libexif.so:graphics/libexif
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
 
 USES=		jpeg libtool shebangfix pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xft xinerama xmu xpm x11 xext
+USE_XORG=	x11 xext xft xinerama xmu xpm
 SHEBANG_FILES=	util/wkdemenu.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no \
 		wm_cv_func_secure_getenv=no
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--localedir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
 		--with-gnustepdir="${PREFIX}/GNUstep" \
 		--enable-modelock \
 		--enable-xinerama \
 		--enable-usermenu \
 		--enable-wmreplace \
 		--with-x
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ INSTALL \
 		INSTALL-WMAKER NEWS README README.definable-cursor \
 		README.i18n TODO The-perfect-Window-Maker-patch.txt
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENV=	LINGUAS="*"
 NLS_CONFIGURE_ENABLE=	locale
 
 post-install:
 	@${MKDIR} \
 	    ${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
 	    ${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-wm/windowmaker/distinfo
===================================================================
--- head/x11-wm/windowmaker/distinfo	(revision 463176)
+++ head/x11-wm/windowmaker/distinfo	(revision 463177)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497386665
+TIMESTAMP = 1519793700
 SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
 SIZE (WindowMaker-0.95.8.tar.gz) = 3253515