From owner-svn-ports-all@FreeBSD.ORG  Thu Aug 23 11:24:35 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8315C1065670;
	Thu, 23 Aug 2012 11:24:35 +0000 (UTC)
	(envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 544D98FC15;
	Thu, 23 Aug 2012 11:24:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7NBOZ1j014866;
	Thu, 23 Aug 2012 11:24:35 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7NBOZhM014863;
	Thu, 23 Aug 2012 11:24:35 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201208231124.q7NBOZhM014863@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Thu, 23 Aug 2012 11:24:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303001 - in head/x11-wm/spectrwm: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2012 11:24:35 -0000

Author: zeising
Date: Thu Aug 23 11:24:34 2012
New Revision: 303001
URL: http://svn.freebsd.org/changeset/ports/303001

Log:
  Update spectrwm to version 2.0.0
  This is a complete rewrite using xcb and with support for Xft.
  
  Approved by:	kwm (mentor)

Deleted:
  head/x11-wm/spectrwm/files/
Modified:
  head/x11-wm/spectrwm/Makefile
  head/x11-wm/spectrwm/distinfo

Modified: head/x11-wm/spectrwm/Makefile
==============================================================================
--- head/x11-wm/spectrwm/Makefile	Thu Aug 23 11:16:21 2012	(r303000)
+++ head/x11-wm/spectrwm/Makefile	Thu Aug 23 11:24:34 2012	(r303001)
@@ -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 
 
 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

Modified: head/x11-wm/spectrwm/distinfo
==============================================================================
--- head/x11-wm/spectrwm/distinfo	Thu Aug 23 11:16:21 2012	(r303000)
+++ head/x11-wm/spectrwm/distinfo	Thu Aug 23 11:24:34 2012	(r303001)
@@ -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