From owner-svn-ports-head@FreeBSD.ORG Mon Sep 23 06:21:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 18820AE8; Mon, 23 Sep 2013 06:21:34 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 05F052195; Mon, 23 Sep 2013 06:21:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8N6LXk6079400; Mon, 23 Sep 2013 06:21:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8N6LXOv079399; Mon, 23 Sep 2013 06:21:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201309230621.r8N6LXOv079399@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 23 Sep 2013 06:21:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327939 - head/x11-wm/i3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 06:21:34 -0000 Author: bapt Date: Mon Sep 23 06:21:33 2013 New Revision: 327939 URL: http://svnweb.freebsd.org/changeset/ports/327939 Log: Use stage Install .desktop files Install the sample configuration as default configuration (on first run it will run a config-wizard). Bump portrevision Modified: head/x11-wm/i3/Makefile Modified: head/x11-wm/i3/Makefile ============================================================================== --- head/x11-wm/i3/Makefile Mon Sep 23 06:20:07 2013 (r327938) +++ head/x11-wm/i3/Makefile Mon Sep 23 06:21:33 2013 (r327939) @@ -3,6 +3,7 @@ PORTNAME= i3 DISTVERSION= 4.6 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://i3wm.org/downloads/ @@ -11,15 +12,15 @@ COMMENT= Improved dynamic tiling window LICENSE= BSD -LIB_DEPENDS= 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:${PORTSDIR}/devel/libev \ - yajl:${PORTSDIR}/devel/yajl \ - cairo:${PORTSDIR}/graphics/cairo \ - pangocairo:${PORTSDIR}/x11-toolkits/pango \ - pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ + libxcb-util.so:${PORTSDIR}/x11/xcb-util \ + libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \ + libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \ + libev.so:${PORTSDIR}/devel/libev \ + libyajl.so:${PORTSDIR}/devel/yajl \ + libcairo.so:${PORTSDIR}/graphics/cairo \ + libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \ + libpcre.so:${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 @@ -30,33 +31,6 @@ USE_BZIP2= yes USE_PERL5= run 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/i3-sensible-editor \ - bin/i3-sensible-pager \ - bin/i3-sensible-terminal \ - bin/i3bar \ - etc/i3/config.sample \ - etc/i3/config.keycodes \ - -PLIST_DIRS= etc/i3 - -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-sensible-editor.1 \ - i3-sensible-pager.1 i3-sensible-terminal.1 \ - i3.1 i3bar.1 - -MAN1= ${MANUALS} - -NO_STAGE= yes post-extract: @cd ${WRKSRC} && ${CP} i3.config config.sample @cd ${WRKSRC} && ${CP} i3.config.keycodes config.keycodes @@ -74,28 +48,7 @@ post-patch: -e 's|-liconv|${ICONV_LIB}|' \ -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/common.mk -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ -.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-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}/config.sample ${PREFIX}/etc/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/config.keycodes ${PREFIX}/etc/${PORTNAME} -.for i in ${MANUALS} - ${INSTALL_MAN} ${WRKSRC}/man/${i} ${MANPREFIX}/man/man1/ -.endfor - - @${ECHO_MSG} "======================================================================================" - @${ECHO_MSG} "" - @${ECHO_MSG} " ${PORTNAME} needs a config file! You can find an example in ${PREFIX}/etc/${PORTNAME}" - @${ECHO_MSG} " Please rename it to ${PREFIX}/etc/${PORTNAME}/config" - @${ECHO_MSG} " For more information read the manpage :)" - @${ECHO_MSG} "" - @${ECHO_MSG} "======================================================================================" +post-install: + @${INSTALL_DATA} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/ .include