From 65c619c0d7e178fddd717834d44713ff290d8a4a Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 26 Dec 2012 12:05:57 +0100
Subject: [PATCH] Update i3 to 4.4

According to the DEPENDS file it is supposed to require at
least pango 1.30.0 and cairo 1.12.2, but seems to work for
me with the older versions available in the ports.
---
 x11-wm/i3/Makefile                    | 38 +++++++++++++++++------------------
 x11-wm/i3/distinfo                    |  4 ++--
 x11-wm/i3/files/patch-src__cfgparse.y | 11 ----------
 3 files changed, 20 insertions(+), 33 deletions(-)
 delete mode 100644 x11-wm/i3/files/patch-src__cfgparse.y

diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 51b4e73..cdcadce 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -1,20 +1,14 @@
-# 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
+MASTER_SITES=	http://i3wm.org/downloads/
 
 MAINTAINER=	dhn@FreeBSD.org
-COMMENT=	An improved dynamic tiling window manager
+COMMENT=	Improved dynamic tiling window manager
 
 BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex \
 		pcre>=0:${PORTSDIR}/devel/pcre
@@ -39,6 +33,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/i3 \
 		bin/i3-config-wizard \
+		bin/i3-dmenu-desktop \
 		bin/i3-input \
 		bin/i3-msg \
 		bin/i3-nagbar \
@@ -47,30 +42,30 @@ PLIST_FILES=	bin/i3 \
 		bin/i3-sensible-editor \
 		bin/i3-sensible-pager \
 		bin/i3-sensible-terminal \
-		bin/i3-wsbar \
 		etc/i3/config.sample \
 		etc/i3/config.keycodes \
-		etc/i3/welcome
 
 PLIST_DIRS=	etc/i3
 
-MANUALS=	i3-config-wizard.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
+MANUALS=	i3.1 \
+		i3-dmenu-desktop.1 \
+		i3-config-wizard.1 \
+		i3-input.1 \
+		i3-migrate-config-to-v4.1 \
+		i3-msg.1 \
+		i3-nagbar.1 \
+		i3-sensible-terminal.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
@@ -81,17 +76,20 @@ post-patch:
 	@${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|yylex_destroy();||' ${WRKSRC}/src/cfgparse.y
+.for f in src/i3.mk i3-config-wizard/i3-config-wizard.mk
+	@${REINPLACE_CMD} -e 's|(FLEX) -i -o |(FLEX) -i -o|' ${WRKSRC}/$f
+.endfor
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 .for i in i3-config-wizard 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}
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index abfdd14..29881d2 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 bb0774f..0000000
--- 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);
-- 
1.8.0.2