3 files changed, 13 insertions, 39 deletions

diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index fdd348831650..0983215183fc 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spectrwm
-PORTVERSION=	1.1.2
+PORTVERSION=	2.0.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://opensource.conformal.com/snapshots/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
@@ -16,12 +16,13 @@ COMMENT=	A small, dynamic tiling window manager for X11
 
 LICENSE=	ISCL
 
-OPTIONS_DEFINE=	DMENU_BOTTOM
-DMENU_BOTTOM_DESC=	dmenu at screen bottom (instead of top)
-
-.include <bsd.port.options.mk>
+LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
+		xcb-util:${PORTSDIR}/x11/xcb-util \
+		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
+		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
+RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 
-USE_XORG=	x11 xproto xrandr xt xtst
+USE_XORG=	x11 xft xrandr xt
 
 MAN1=		spectrwm.1
 USE_LDCONFIG=	yes
@@ -32,19 +33,15 @@ PORTEXAMPLES=	spectrwm_cz.conf \
 		spectrwm_se.conf \
 		spectrwm_us.conf
 
-RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
-
-.if ${PORT_OPTIONS:MDMENU_BOTTOM}
-EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
 
 do-build:
 	${CC} ${CFLAGS} -I${LOCALBASE}/include \
-		-I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \
-		-lXtst -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
+		-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 -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
diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo
index c0aa37e4b0b9..77786231b1eb 100644
--- a/x11-wm/spectrwm/distinfo
+++ b/x11-wm/spectrwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-1.1.2.tgz) = 05ea11f7a519c8885c48d4112453cefac71899b0945d0b26cd677b06cc727309
-SIZE (spectrwm-1.1.2.tgz) = 93088
+SHA256 (spectrwm-2.0.0.tgz) = 6ef5db2bb001c2953d0eea28e1ab36992a2c6ff98411c7299ff6a520e758916d
+SIZE (spectrwm-2.0.0.tgz) = 99759
diff --git a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
deleted file mode 100644
index 844dce1c6d4a..000000000000
--- a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-$FreeBSD$
-
---- spectrwm.c.orig	2012-01-11 19:42:57.000000000 +0100
-+++ spectrwm.c	2012-01-11 21:36:07.000000000 +0100
-@@ -4481,14 +4481,16 @@
- 					" -nb $bar_color"
- 					" -nf $bar_font_color"
- 					" -sb $bar_border"
--					" -sf $bar_color",	0);
-+					" -sf $bar_color"
-+					" -b",	0);
- 	setconfspawn("name_workspace",	"dmenu"
- 					" -p Workspace"
- 					" -fn $bar_font"
- 					" -nb $bar_color"
- 					" -nf $bar_font_color"
- 					" -sb $bar_border"
--					" -sf $bar_color",	0);
-+					" -sf $bar_color"
-+					" -b",	0);
- }
- 
- /* key bindings */