Update to 0.95.7. Changes include:

- Window snapping (maximize a window to a side or corder of the screen) by
  dragging is now supported.

- It is now possible to customize behavior when a maximized window is
  dragged.

- A knob is added to globally ignore decoration hints from GNOME
  appications.

- A ICCCM protocol for window manager replacement has been supported.

4 files changed, 29 insertions, 14 deletions

diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index e0b341138c2c..b9cf7a0e1aa3 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTVERSION=	0.95.6
-PORTREVISION=	4
+PORTVERSION=	0.95.7
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -19,19 +18,21 @@ LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
 		libwebp.so:${PORTSDIR}/graphics/webp \
 		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 
-USES=		libtool pathfix pkgconfig
+USES=		jpeg libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_XORG=	xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
 INSTALL_WRKSRC=	${WRKSRC}/wrlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
-		--with-nlsdir=${PREFIX}/share/locale \
+		--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-xinerama \
+		--enable-usermenu \
+		--enable-wmreplace \
 		--with-x
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-wm/libwraster/distinfo b/x11-wm/libwraster/distinfo
index befc6d63369d..30084ce6fee7 100644
--- a/x11-wm/libwraster/distinfo
+++ b/x11-wm/libwraster/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WindowMaker-0.95.6.tar.gz) = 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4
-SIZE (WindowMaker-0.95.6.tar.gz) = 3004856
+SHA256 (WindowMaker-0.95.7.tar.gz) = 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
+SIZE (WindowMaker-0.95.7.tar.gz) = 3238325
diff --git a/x11-wm/libwraster/files/patch-configure b/x11-wm/libwraster/files/patch-configure
new file mode 100644
index 000000000000..b991f2a3bf22
--- /dev/null
+++ b/x11-wm/libwraster/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2015-08-11 18:52:18 UTC
++++ configure
+@@ -13782,7 +13782,7 @@ case "$host" in #(
+   *-*-linux*|*-*-cygwin*|*-gnu*) :
+     WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
+   *-*-freebsd*|*-k*bsd-gnu*) :
+-    WM_OSDEP="bsd"   ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -DFREEBSD" ;; #(
++    WM_OSDEP="bsd"   ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=700 -DFREEBSD" ;; #(
+   *-*-netbsd*) :
+     WM_OSDEP="bsd"   ; CPPFLAGS="$CPPFLAGS -DNETBSD" ;; #(
+   *-*-openbsd*) :
diff --git a/x11-wm/libwraster/files/patch-wrlib__wraster.h b/x11-wm/libwraster/files/patch-wrlib__wraster.h
index 8161430594bc..164b7430dcd9 100644
--- a/x11-wm/libwraster/files/patch-wrlib__wraster.h
+++ b/x11-wm/libwraster/files/patch-wrlib__wraster.h
@@ -1,17 +1,20 @@
---- wrlib/wraster.h.orig	2014-08-30 21:29:09.000000000 +0900
-+++ wrlib/wraster.h	2014-09-15 02:31:40.000000000 +0900
-@@ -61,7 +61,13 @@
+--- wrlib/wraster.h.orig	2015-08-11 18:41:14 UTC
++++ wrlib/wraster.h
+@@ -61,10 +61,14 @@
   * mechanism and define an internal macro appropriately. Please note that the macro are not considered being
   * part of the public API.
   */
--#if __GNUC__ >= 3
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
 +#ifndef __has_feature
-+#define	__has_feature(x) 0
++#define	__has_feature(x)	0
 +#endif
 +#ifndef __has_extension
-+#define	__has_extension __has_feature
++#define	__has_extension	__has_feature
 +#endif
-+#if __has_extension(attribute_deprecated_with_message)
++#if __has_extension(attribute_depreated_with_message)
  #define __wrlib_deprecated(msg)  __attribute__ ((deprecated(msg)))
+-#elif __GNUC__ >= 3
+-#define __wrlib_deprecated(msg)  __attribute__ ((deprecated))
  #else
  #define __wrlib_deprecated(msg)
+ #endif