3 files changed, 31 insertions, 45 deletions

diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 51b4e73401ae..f578d4c6bb8d 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -1,30 +1,29 @@
-# New ports collection makefile for:	i3
-# Date created:		2009-04-19
-# Whom:			Dennis Herrmann <dhn@FreeBSD.org>
-#
+# Created by: Dennis Herrmann <dhn@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	i3
-DISTVERSION=	4.2
-PORTREVISION=	1
+DISTVERSION=	4.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dhn
 
-MAINTAINER=	dhn@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	An improved dynamic tiling window manager
 
-BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex \
-		pcre>=0:${PORTSDIR}/devel/pcre
-LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+LICENSE=	BSD
+
+BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
+LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
+		startup-notification:${PORTSDIR}/x11/startup-notification \
 		xcb-util:${PORTSDIR}/x11/xcb-util \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
-		ev.4:${PORTSDIR}/devel/libev \
-		yajl.2:${PORTSDIR}/devel/yajl
+		ev:${PORTSDIR}/devel/libev \
+		yajl:${PORTSDIR}/devel/yajl \
+		cairo:${PORTSDIR}/graphics/cairo \
+		pangocairo:${PORTSDIR}/x11-toolkits/pango \
+		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
@@ -39,59 +38,57 @@ MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/i3 \
 		bin/i3-config-wizard \
+		bin/i3-dmenu-desktop \
+		bin/i3-dump-log \
 		bin/i3-input \
+		bin/i3-migrate-config-to-v4 \
 		bin/i3-msg \
 		bin/i3-nagbar \
-		bin/i3bar \
-		bin/i3-migrate-config-to-v4 \
 		bin/i3-sensible-editor \
 		bin/i3-sensible-pager \
 		bin/i3-sensible-terminal \
-		bin/i3-wsbar \
+		bin/i3bar \
 		etc/i3/config.sample \
 		etc/i3/config.keycodes \
-		etc/i3/welcome
 
 PLIST_DIRS=	etc/i3
 
-MANUALS=	i3-config-wizard.1 i3-input.1 \
+MANUALS=	i3-config-wizard.1 i3-dmenu-desktop.1 \
+		i3-dump-log.1 i3-input.1 \
 		i3-migrate-config-to-v4.1 i3-msg.1 \
-		i3-nagbar.1 i3-wsbar.1 \
-		i3.1 i3-sensible-terminal.1
+		i3-nagbar.1 i3-sensible-editor.1 \
+		i3-sensible-pager.1 i3-sensible-terminal.1 \
+		i3.1 i3bar.1
 
 MAN1=	${MANUALS}
 
-.include <bsd.port.pre.mk>
-
 post-extract:
-	@cd ${WRKSRC} && ${CP} i3.welcome welcome
 	@cd ${WRKSRC} && ${CP} i3.config config.sample
 	@cd ${WRKSRC} && ${CP} i3.config.keycodes config.keycodes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/src/config.c
-	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/welcome
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/config.sample
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/config.keycodes
 	@${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}/|g' ${WRKSRC}/man/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/common.mk
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/man/i3.1
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/man/i3-msg.1
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/man/i3-input.1
 	@${REINPLACE_CMD} -e 's|.SILENT||g' ${WRKSRC}/common.mk
-	@${REINPLACE_CMD} -e 's|-Iinclude|-Iinclude -Isrc|g' ${WRKSRC}/common.mk
-	@${REINPLACE_CMD} -e 's|flex|${LOCALBASE}/bin/flex|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-Iinclude|-Iinclude -Isrc|g' \
+			  -e 's|flex|${LOCALBASE}/bin/flex|g' \
+			  -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/common.mk
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-.for i in i3-config-wizard i3-input i3-msg i3-nagbar i3bar
+.for i in i3-config-wizard i3-dump-log i3-input i3-msg i3-nagbar i3bar
 	${INSTALL_SCRIPT} ${WRKSRC}/$i/$i ${PREFIX}/bin/
 .endfor
-.for i in i3-sensible-editor i3-sensible-pager i3-sensible-terminal i3-wsbar i3-migrate-config-to-v4
+.for i in i3-dmenu-desktop i3-sensible-editor i3-sensible-pager \
+	i3-sensible-terminal i3-migrate-config-to-v4
 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/bin/
 .endfor
 	@${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/welcome ${PREFIX}/etc/${PORTNAME}/welcome
 	${INSTALL_DATA} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/config.keycodes ${PREFIX}/etc/${PORTNAME}
 .for i in ${MANUALS}
@@ -106,4 +103,4 @@ do-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "======================================================================================"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index abfdd14ec02c..29881d2c24e9 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (i3-4.2.tar.bz2) = e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b
-SIZE (i3-4.2.tar.bz2) = 758109
+SHA256 (i3-4.4.tar.bz2) = 99875749eab6d6f5a3058f3325532cd223a9fa22771a54c2fd06c0ded97f481b
+SIZE (i3-4.4.tar.bz2) = 884182
diff --git a/x11-wm/i3/files/patch-src__cfgparse.y b/x11-wm/i3/files/patch-src__cfgparse.y
deleted file mode 100644
index bb0774f83f69..000000000000
--- a/x11-wm/i3/files/patch-src__cfgparse.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/cfgparse.y.orig	2012-04-28 00:14:46.000000000 +0200
-+++ ./src/cfgparse.y	2012-04-28 00:15:01.000000000 +0200
-@@ -619,7 +619,7 @@
-         start_configerror_nagbar(f);
-     }
- 
--    yylex_destroy();
-+    // yylex_destroy();
-     FREE(context->line_copy);
-     free(context);
-     FREE(font_pattern);