Index: head/x11-wm/spectrwm/Makefile
===================================================================
--- head/x11-wm/spectrwm/Makefile	(revision 451243)
+++ head/x11-wm/spectrwm/Makefile	(revision 451244)
@@ -1,56 +1,67 @@
 # Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
 
 PORTNAME=	spectrwm
 DISTVERSIONPREFIX=	SPECTRWM_
-DISTVERSION=	3_0_2
+DISTVERSION=	3_1_0
 CATEGORIES=	x11-wm
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Small, dynamic tiling window manager for X11
 
 LICENSE=	ISCL
 
 LIB_DEPENDS+=	libxcb-util.so:x11/xcb-util \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
 RUN_DEPENDS+=	dmenu:x11/dmenu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	conformal
 
+OPTIONS_DEFINE= EXAMPLES
+
+.include	<bsd.port.options.mk>
+
 USE_XORG=	x11 xcb xcursor xft xrandr xt
 
 USE_LDCONFIG=	yes
-PORTEXAMPLES=	spectrwm_cz.conf \
+CONFEXAMPLES=	spectrwm_cz.conf \
 		spectrwm_es.conf \
 		spectrwm_fr.conf \
 		spectrwm_fr_ch.conf \
 		spectrwm_se.conf \
 		spectrwm_us.conf
 
+SCRIPTEXAMPLES=	baraction.sh \
+		screenshot.sh
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
 
 do-build:
-	${CC} ${CFLAGS} -I${LOCALBASE}/include \
+	${CC} ${CFLAGS} -Wall -Werror -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \
 		-lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \
 		-lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xtest -lXcursor \
 		-lXft -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
 		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
-	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \
+	${CC} ${CFLAGS} -Wall -Werror -I${LOCALBASE}/include -shared -fpic -DPIC \
 		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample
+
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for conf in ${PORTEXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${conf} ${STAGEDIR}${EXAMPLESDIR}
+.for file in ${CONFEXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
+.endfor
+.for file in ${SCRIPTEXAMPLES}
+	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/spectrwm/distinfo
===================================================================
--- head/x11-wm/spectrwm/distinfo	(revision 451243)
+++ head/x11-wm/spectrwm/distinfo	(revision 451244)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465236118
-SHA256 (conformal-spectrwm-SPECTRWM_3_0_2_GH0.tar.gz) = 82ce0280039de642c41684f3096abb0388926b60c37987ca1dbc53a0913cab18
-SIZE (conformal-spectrwm-SPECTRWM_3_0_2_GH0.tar.gz) = 147355
+TIMESTAMP = 1507141425
+SHA256 (conformal-spectrwm-SPECTRWM_3_1_0_GH0.tar.gz) = b7a5e24fe6d923aadab947d354ff44ad742b721daaf334584e8eea9e15649d9a
+SIZE (conformal-spectrwm-SPECTRWM_3_1_0_GH0.tar.gz) = 147206
Index: head/x11-wm/spectrwm/files/patch-spectrwm.c
===================================================================
--- head/x11-wm/spectrwm/files/patch-spectrwm.c	(revision 451243)
+++ head/x11-wm/spectrwm/files/patch-spectrwm.c	(revision 451244)
@@ -1,11 +1,11 @@
---- spectrwm.c.orig	2016-06-05 07:12:06 UTC
+--- spectrwm.c.orig	2017-10-04 18:36:20 UTC
 +++ spectrwm.c
-@@ -7876,7 +7876,7 @@ validate_spawns(void)
+@@ -7960,7 +7960,7 @@ validate_spawns(void)
  void
  setup_spawn(void)
  {
 -	setconfspawn("lock",		"xlock",		0);
 +	setconfspawn("lock",		"xlock",		SWM_SPAWN_OPTIONAL);
  
  	setconfspawn("term",		"xterm",		0);
  	setconfspawn("spawn_term",	"xterm",		0);
Index: head/x11-wm/spectrwm/pkg-plist
===================================================================
--- head/x11-wm/spectrwm/pkg-plist	(revision 451243)
+++ head/x11-wm/spectrwm/pkg-plist	(revision 451244)
@@ -1,5 +1,12 @@
 bin/spectrwm
-bin/screenshot.sh
 lib/libswmhack.so
 man/man1/spectrwm.1.gz
 @sample etc/spectrwm.conf.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_cz.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_es.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr_ch.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_se.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_us.conf