- Update to 4.1

PR:		ports/160036
Submitted by:	Aldis Berjoza <aldis@bsdroot.lv>
Feature safe:	yes

4 files changed, 45 insertions, 15 deletions

diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 2a546f4d26fd..e97741d16b82 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	i3
-DISTVERSION=	3.e-bf3
-PORTREVISION=	1
+DISTVERSION=	4.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -16,7 +15,10 @@ MASTER_SITE_SUBDIR=	dhn
 MAINTAINER=	dhn@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 \
 		xcb-event.1:${PORTSDIR}/x11/xcb-util \
 		ev.4:${PORTSDIR}/devel/libev \
 		yajl.1:${PORTSDIR}/devel/yajl
@@ -30,15 +32,19 @@ USE_ICONV=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/i3 \
-		bin/i3-msg \
+		bin/i3-config-wizard \
 		bin/i3-input \
+		bin/i3-msg \
+		bin/i3-nagbar \
+		bin/i3bar \
 		etc/i3/config.sample \
 		etc/i3/welcome
+
 PLIST_DIRS=	etc/i3
 
-MAN1=	i3.1 \
-	i3-msg.1 \
-	i3-input.1
+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
+
+MAN1=	${MANUALS}
 
 .include <bsd.port.pre.mk>
 
@@ -57,17 +63,19 @@ post-patch:
 	@${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
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-msg/${PORTNAME}-msg ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-input/${PORTNAME}-input ${PREFIX}/bin/
+.for i in i3-config-wizard i3-input i3-msg i3-nagbar i3bar
+	${INSTALL_SCRIPT} ${WRKSRC}/$i/$i ${PREFIX}/bin/
+.endfor
 	@${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/welcome ${PREFIX}/etc/${PORTNAME}/welcome
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-msg.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-input.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/welcome ${PREFIX}/etc/${PORTNAME}/welcome
+.for i in ${MANUALS}
+	${INSTALL_MAN} ${WRKSRC}/man/${i} ${MANPREFIX}/man/man1/
+.endfor
 
 	@${ECHO_MSG} "======================================================================================"
 	@${ECHO_MSG} ""
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index 02a09a48ecb9..e4d7de1242a8 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (i3-3.e-bf3.tar.bz2) = e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
-SIZE (i3-3.e-bf3.tar.bz2) = 360704
+SHA256 (i3-4.1.tar.bz2) = 3b4f21d9bf66f8e4588521dfa706d8cc3fe1999976a55fb5a6c13a621a1455a0
+SIZE (i3-4.1.tar.bz2) = 564086
diff --git a/x11-wm/i3/files/patch-src__cfgparse.y b/x11-wm/i3/files/patch-src__cfgparse.y
new file mode 100644
index 000000000000..cccf21967aff
--- /dev/null
+++ b/x11-wm/i3/files/patch-src__cfgparse.y
@@ -0,0 +1,11 @@
+--- ./src/cfgparse.y.orig	2011-08-01 23:24:22.000000000 +0200
++++ ./src/cfgparse.y	2011-08-07 13:35:02.000000000 +0200
+@@ -468,7 +468,7 @@
+         start_configerror_nagbar(f);
+     }
+ 
+-    yylex_destroy();
++    // yylex_destroy();
+     FREE(context->line_copy);
+     free(context);
+     free(new);
diff --git a/x11-wm/i3/files/patch-src__cmdparse.y b/x11-wm/i3/files/patch-src__cmdparse.y
new file mode 100644
index 000000000000..c64ed4c4eb5b
--- /dev/null
+++ b/x11-wm/i3/files/patch-src__cmdparse.y
@@ -0,0 +1,11 @@
+--- ./src/cmdparse.y.orig	2011-08-07 13:35:55.000000000 +0200
++++ ./src/cmdparse.y	2011-08-07 13:35:24.000000000 +0200
+@@ -99,7 +99,7 @@
+     }
+     printf("done, json output = %s\n", json_output);
+ 
+-    cmdyylex_destroy();
++    // cmdyylex_destroy();
+     FREE(context->line_copy);
+     FREE(context->compact_error);
+     free(context);