From nobody@FreeBSD.org  Tue Aug 23 19:53:11 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A95501065674
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 23 Aug 2011 19:53:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E9438FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 23 Aug 2011 19:53:11 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7NJrAEa055929
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 23 Aug 2011 19:53:10 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7NJrAwI055920;
	Tue, 23 Aug 2011 19:53:10 GMT
	(envelope-from nobody)
Message-Id: <201108231953.p7NJrAwI055920@red.freebsd.org>
Date: Tue, 23 Aug 2011 19:53:10 GMT
From: Aldis Berjoza <aldis@bsdroot.lv>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH]x11-wm/i3 update to v4.0.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160036
>Category:       ports
>Synopsis:       [PATCH]x11-wm/i3 update to v4.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    dhn
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 23 20:00:17 UTC 2011
>Closed-Date:    Sat Nov 19 08:38:27 UTC 2011
>Last-Modified:  Sat Nov 19 08:40:07 UTC 2011
>Originator:     Aldis Berjoza
>Release:        
>Organization:
>Environment:
>Description:
Update i3 to v4.0.1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN i3.bak/Makefile i3/Makefile
--- i3.bak/Makefile	2011-07-24 11:44:28.000000000 +0300
+++ i3/Makefile	2011-08-23 22:39:04.264530030 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	i3
-DISTVERSION=	3.e-bf3
+DISTVERSION=	4.0.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -20,6 +20,8 @@
 		ev.3:${PORTSDIR}/devel/libev \
 		yajl.1:${PORTSDIR}/devel/yajl
 
+RUN_DEPENDS=	${LOCALBASE}/lib/libfl.a:${PORTSDIR}/textproc/flex
+
 USE_XORG=	x11
 USE_BISON=	build
 USE_XLIB=	yes
@@ -29,15 +31,19 @@
 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>
 
@@ -56,17 +62,19 @@
 	@${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 -ruN i3.bak/distinfo i3/distinfo
--- i3.bak/distinfo	2011-07-24 11:44:28.000000000 +0300
+++ i3/distinfo	2011-08-23 20:11:22.819998670 +0300
@@ -1,2 +1,2 @@
-SHA256 (i3-3.e-bf3.tar.bz2) = e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
-SIZE (i3-3.e-bf3.tar.bz2) = 360704
+SHA256 (i3-4.0.1.tar.bz2) = 2bd27c344d8657f730ac4eeb3e12f1461ebc212a2551b1bd4835541487965756
+SIZE (i3-4.0.1.tar.bz2) = 472222


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dhn 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Aug 23 20:00:36 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160036 

From: Aldis Berjoza <aldis@bsdroot.lv>
To: bug-followup@FreeBSD.org, aldis@bsdroot.lv
Cc:  
Subject: Re: ports/160036: [PATCH]x11-wm/i3 update to v4.0.1
Date: Tue, 23 Aug 2011 23:08:10 +0300

 --Sig_/RbHH.LzSug_FoVdw9DSmI7U
 Content-Type: multipart/mixed; boundary="MP_/f2_B6wTdDmpjRkIkMXe9vjO"
 
 --MP_/f2_B6wTdDmpjRkIkMXe9vjO
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Attaced fixed patch. Previous missed 2 apps
 
 Also might be relavent:
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3D160030
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3D160031
 
 --=20
 Aldis Berjoza
   http://www.bsdroot.lv/
 
 --MP_/f2_B6wTdDmpjRkIkMXe9vjO
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=i3.patch.txt
 
 diff -ruN i3.bak/Makefile i3/Makefile
 --- i3.bak/Makefile	2011-07-24 11:44:28.000000000 +0300
 +++ i3/Makefile	2011-08-23 23:06:17.283145226 +0300
 @@ -6,7 +6,7 @@
  #
 =20
  PORTNAME=3D	i3
 -DISTVERSION=3D	3.e-bf3
 +DISTVERSION=3D	4.0.1
  CATEGORIES=3D	x11-wm
  MASTER_SITES=3D	http://i3wm.org/downloads/ \
  		${MASTER_SITE_LOCAL}
 @@ -20,6 +20,8 @@
  		ev.3:${PORTSDIR}/devel/libev \
  		yajl.1:${PORTSDIR}/devel/yajl
 =20
 +RUN_DEPENDS=3D	${LOCALBASE}/lib/libfl.a:${PORTSDIR}/textproc/flex
 +
  USE_XORG=3D	x11
  USE_BISON=3D	build
  USE_XLIB=3D	yes
 @@ -29,15 +31,21 @@
  MAKE_JOBS_UNSAFE=3D	yes
 =20
  PLIST_FILES=3D	bin/i3 \
 -		bin/i3-msg \
 +		bin/i3-config-wizard \
  		bin/i3-input \
 +		bin/i3-migrate-config-to-v4 \
 +		bin/i3-msg \
 +		bin/i3-nagbar \
 +		bin/i3-wsbar \
 +		bin/i3bar \
  		etc/i3/config.sample \
  		etc/i3/welcome
 +
  PLIST_DIRS=3D	etc/i3
 =20
 -MAN1=3D	i3.1 \
 -	i3-msg.1 \
 -	i3-input.1
 +MANUALS=3D	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=3D	${MANUALS}
 =20
  .include <bsd.port.pre.mk>
 =20
 @@ -56,17 +64,21 @@
  	@${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
 =20
  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/
 +	${INSTALL_SCRIPT} ${WRKSRC}/i3 ${PREFIX}/bin/
 +	${INSTALL_SCRIPT} ${WRKSRC}/i3-wsbar ${PREFIX}/bin/
 +	${INSTALL_SCRIPT} ${WRKSRC}/i3-migrate-config-to-v4 ${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
 =20
  	@${ECHO_MSG} "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"
  	@${ECHO_MSG} ""
 diff -ruN i3.bak/distinfo i3/distinfo
 --- i3.bak/distinfo	2011-07-24 11:44:28.000000000 +0300
 +++ i3/distinfo	2011-08-23 20:11:22.819998670 +0300
 @@ -1,2 +1,2 @@
 -SHA256 (i3-3.e-bf3.tar.bz2) =3D e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b=
 83e31501a361f92e85c68f
 -SIZE (i3-3.e-bf3.tar.bz2) =3D 360704
 +SHA256 (i3-4.0.1.tar.bz2) =3D 2bd27c344d8657f730ac4eeb3e12f1461ebc212a2551=
 b1bd4835541487965756
 +SIZE (i3-4.0.1.tar.bz2) =3D 472222
 
 --MP_/f2_B6wTdDmpjRkIkMXe9vjO--
 
 --Sig_/RbHH.LzSug_FoVdw9DSmI7U
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (FreeBSD)
 
 iQEcBAEBAgAGBQJOVAi7AAoJECrA2xnMujn6yKwH/3FD4ouLKN3skhb/VUSdvsdz
 yOm+1J7b5u7kUWvHJVMiqEmoIK04q/b8mY5zQYMyc3EC8c69sUGWcnMCuPsU5Rv+
 cz8hVxgGLIe+1PIl1CtArkIQYIDDslA5RHyljXzTNvrcjyvEWTW/egEYDX6si1sO
 RJpVuxlPqgt3o3huFBM5AtTzr5IxxRRztPXx+Ds3jGacPYyv7HkXKigUF5+e+nN1
 dKw1CV6vD16pJYkL9qoI4yGnjOnnbT8OullUyG/NO1CqX9qgw14KLiWsE2mryHwy
 jUjGy6x+6E5ypoGMfDW03NZ7aByV3ubrV5kJ1rnCYutCZaF1yEhclSaM2x4lYxo=
 =FxW2
 -----END PGP SIGNATURE-----
 
 --Sig_/RbHH.LzSug_FoVdw9DSmI7U--

From: Aldis Berjoza <aldis@bsdroot.lv>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160036: [PATCH]x11-wm/i3 update to v4.0.1
Date: Wed, 24 Aug 2011 01:15:49 +0300

 --Sig_/U8pa7.XxOPycyH/.R+46mZB
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 On Tue, 23 Aug 2011 23:08:10 +0300
 Aldis Berjoza <aldis@bsdroot.lv> wrote:
 
 > Attaced fixed patch. Previous missed 2 apps
 >=20
 > Also might be relavent:
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D160030
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D160031
 >=20
 
 Btw, when http://www.freebsd.org/cgi/query-pr.cgi?pr=3D160038 will be
 commited, there it could be added to runtime dependencies, or as an
 OPTION
 
 ${SITE_PERL}/AnyEvent/I3.pm:${PORTSDIR}/devel/p5-AnyEvent-I3
 
 --=20
 Aldis Berjoza
   http://www.bsdroot.lv/
 
 --Sig_/U8pa7.XxOPycyH/.R+46mZB
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (FreeBSD)
 
 iQEcBAEBAgAGBQJOVCakAAoJECrA2xnMujn6DHoIAJPHdouGoYoJ4aEpJbzE2Pie
 AWT8WjQ5ZJ+rxmCSoTtg6tQHMianKNokxJ5zLT78o0apNg0PU/sNwzCDX/k5Lazl
 cdcDbCLBaOOy5POW5nIWaQqP9o4nSr0SQ77BWwBE6Pttp9RIyY73dQLPBVtsX5A7
 WrJbPuLA7UD+cCdg/hSDwyIH6S8AcCqZtc2QrHOz30SbzAEMa3VE1tFFfXdLOgHZ
 k/zZ0wFmzBAuSsR9JYpAaHKHkno8YKmsC3t4CrQ5F9y0tcxRNI3zTUxz/noexeMQ
 g0pIUqytQ8PZlhrYFjKR8iYZAYKULeaNGuAMTb7a2YqFf4jmCS6ASpVjjlCJogs=
 =9E/u
 -----END PGP SIGNATURE-----
 
 --Sig_/U8pa7.XxOPycyH/.R+46mZB--
State-Changed-From-To: open->closed 
State-Changed-By: dhn 
State-Changed-When: Sat Nov 19 08:38:25 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160036 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160036: commit references a PR
Date: Sat, 19 Nov 2011 08:38:16 +0000 (UTC)

 dhn         2011-11-19 08:38:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/i3            Makefile distinfo 
   Added files:
     x11-wm/i3/files      patch-src__cfgparse.y 
                          patch-src__cmdparse.y 
   Log:
   - Update to 4.1
   
   PR:             ports/160036
   Submitted by:   Aldis Berjoza <aldis@bsdroot.lv>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.16      +21 -13    ports/x11-wm/i3/Makefile
   1.9       +2 -2      ports/x11-wm/i3/distinfo
   1.1       +11 -0     ports/x11-wm/i3/files/patch-src__cfgparse.y (new)
   1.1       +11 -0     ports/x11-wm/i3/files/patch-src__cmdparse.y (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
