Index: head/x11-wm/spectrwm/Makefile
===================================================================
--- head/x11-wm/spectrwm/Makefile	(revision 361983)
+++ head/x11-wm/spectrwm/Makefile	(revision 361984)
@@ -1,55 +1,55 @@
 # Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
 
 PORTNAME=	spectrwm
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://opensource.conformal.com/snapshots/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	A small, dynamic tiling window manager for X11
 
 LICENSE=	ISCL
 
 LIB_DEPENDS+=	libxcb-util.so:${PORTSDIR}/x11/xcb-util \
 		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
 		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
 RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 
 USE_XORG=	x11 xcb xcursor xft xrandr xt
 
 USE_LDCONFIG=	yes
 PORTEXAMPLES=	spectrwm_cz.conf \
 		spectrwm_es.conf \
 		spectrwm_fr.conf \
 		spectrwm_fr_ch.conf \
 		spectrwm_se.conf \
 		spectrwm_us.conf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
 
 do-build:
 	${CC} ${CFLAGS} -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 -lXrandr -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
 		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 	${CC} ${CFLAGS} -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
-	${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for conf in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${conf} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/spectrwm/pkg-plist
===================================================================
--- head/x11-wm/spectrwm/pkg-plist	(revision 361983)
+++ head/x11-wm/spectrwm/pkg-plist	(revision 361984)
@@ -1,7 +1,5 @@
 bin/spectrwm
 bin/screenshot.sh
 lib/libswmhack.so
 man/man1/spectrwm.1.gz
-@unexec if [ ! -f %D/etc/spectrwm.conf ] || cmp -s %D/etc/spectrwm.conf.sample %D/etc/spectrwm.conf; then rm -f %D/etc/spectrwm.conf; else echo %%PREFIX%%/etc/spectrwm.conf contains changes, remove it manually to delete this package completely.; fi
-etc/spectrwm.conf.sample
-@exec [ -f %D/etc/spectrwm.conf ] || cp -p %D/%F %D/etc/spectrwm.conf
+@sample etc/spectrwm.conf.sample