ports/174710: [Patch] Update x11-wm/i3 to version 4.4
Herbert J. Skuhra
h.skuhra at gmail.com
Wed Dec 26 01:30:00 UTC 2012
>Number: 174710
>Category: ports
>Synopsis: [Patch] Update x11-wm/i3 to version 4.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 26 01:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Herbert J. Skuhra
>Release: FreeBSD 9.1-PRERELEASE i386
>Organization:
>Environment:
FreeBSD oslo.ath.cx 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r244606: Sun Dec 23 12:50:27 CET 2012 herbert at oslo.ath.cx:/usr/obj/usr/src/sys/PC1 i386
>Description:
The attached patch updates x11-wm/i3 to version 4.4.
Note: files/patch-src__cfgparse.y has been removed
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 309470)
+++ Makefile (working copy)
@@ -1,13 +1,8 @@
-# New ports collection makefile for: i3
-# Date created: 2009-04-19
-# Whom: Dennis Herrmann <dhn at FreeBSD.org>
-#
+# Created by: Dennis Herrmann <dhn at 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}
@@ -18,13 +13,15 @@
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 \
+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
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,38 +36,38 @@
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
@@ -80,18 +77,18 @@
@${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|flex|${LOCALBASE}/bin/flex|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}
Index: distinfo
===================================================================
--- distinfo (revision 309470)
+++ distinfo (working copy)
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list