diff options
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/i3/Makefile | 40 | ||||
| -rw-r--r-- | wm/i3/PLIST | 11 | ||||
| -rw-r--r-- | wm/i3/distinfo | 8 |
3 files changed, 29 insertions, 30 deletions
diff --git a/wm/i3/Makefile b/wm/i3/Makefile index b3a80b5db18..fecd38939a7 100644 --- a/wm/i3/Makefile +++ b/wm/i3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2014/08/09 19:14:01 degroote Exp $ +# $NetBSD: Makefile,v 1.8 2015/04/05 17:02:51 nros Exp $ # -DISTNAME= i3-4.8 +DISTNAME= i3-4.10.1 CATEGORIES= wm MASTER_SITES= http://i3wm.org/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -16,8 +16,7 @@ USE_LANGUAGES= c99 MAKE_JOBS_SAFE= no PKG_SYSCONFSUBDIR= i3 -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/i3 -INSTALLATION_DIRS+= share/xsessions include/i3 +INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/i3 CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/config @@ -27,33 +26,26 @@ MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:C/\/i3//} MAKE_ENV+= DEBUG=0 MAKE_ENV+= SHM_SUPPORT=0 -REPLACE_INTERPRETER+= perl -REPLACE.perl.old= /usr/bin/env perl -REPLACE.perl.new= ${TOOLS_PATH.perl} -REPLACE_FILES.perl= i3-dmenu-desktop i3-migrate-config-to-v4 +REPLACE_PERL+= i3-dmenu-desktop +REPLACE_PERL+= i3-migrate-config-to-v4 +REPLACE_PERL+= i3-save-tree -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/i3 ${DESTDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/man/i3.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ -.for i in i3 i3-dmenu-desktop i3-migrate-config-to-v4 i3-sensible-editor \ - i3-sensible-pager i3-sensible-terminal - ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ -.endfor -.for i in i3bar i3-config-wizard i3-input i3-msg i3-nagbar - ${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${DESTDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ -.endfor - ${INSTALL_DATA} ${WRKSRC}/i3.config ${DESTDIR}${EGDIR}/config - ${INSTALL_DATA} ${WRKSRC}/i3.config.keycodes ${DESTDIR}${EGDIR}/config.keycodes - ${INSTALL_DATA} ${WRKSRC}/i3.xsession.desktop ${DESTDIR}${PREFIX}/share/xsessions/ - ${INSTALL_DATA} ${WRKSRC}/include/i3/ipc.h ${DESTDIR}${PREFIX}/include/i3/ +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-install +SUBST_MESSAGE.conf= Change src/i3.mk to install conf files in share/examples +SUBST_FILES.conf= src/i3.mk +SUBST_SED.conf= -e s,$$\(SYSCONFDIR\),$$\(PREFIX\)/share/examples,g + +post-install: + ${INSTALL_MAN} ${WRKSRC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} .include "../../devel/libev/buildlink3.mk" .include "../../devel/yajl/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" +.include "../../x11/libxkbcommon/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" .include "../../x11/xcb-util-cursor/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" diff --git a/wm/i3/PLIST b/wm/i3/PLIST index 3faeb5182b0..1301fcbc21f 100644 --- a/wm/i3/PLIST +++ b/wm/i3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/10/17 22:41:12 tonnerre Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/04/05 17:02:51 nros Exp $ bin/i3 bin/i3-config-wizard bin/i3-dmenu-desktop @@ -6,22 +6,29 @@ bin/i3-input bin/i3-migrate-config-to-v4 bin/i3-msg bin/i3-nagbar +bin/i3-save-tree bin/i3-sensible-editor bin/i3-sensible-pager bin/i3-sensible-terminal +bin/i3-with-shmlog bin/i3bar include/i3/ipc.h man/man1/i3-config-wizard.1 man/man1/i3-dmenu-desktop.1 +man/man1/i3-dump-log.1 man/man1/i3-input.1 man/man1/i3-migrate-config-to-v4.1 man/man1/i3-msg.1 man/man1/i3-nagbar.1 +man/man1/i3-save-tree.1 man/man1/i3-sensible-editor.1 man/man1/i3-sensible-pager.1 man/man1/i3-sensible-terminal.1 man/man1/i3.1 man/man1/i3bar.1 +share/applications/i3.desktop +share/doc/i3/LICENSE share/examples/i3/config share/examples/i3/config.keycodes -share/xsessions/i3.xsession.desktop +share/xsessions/i3-with-shmlog.desktop +share/xsessions/i3.desktop diff --git a/wm/i3/distinfo b/wm/i3/distinfo index 115c6edec40..41ab54c7b2e 100644 --- a/wm/i3/distinfo +++ b/wm/i3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2014/08/09 19:14:01 degroote Exp $ +$NetBSD: distinfo,v 1.5 2015/04/05 17:02:51 nros Exp $ -SHA1 (i3-4.8.tar.bz2) = 857d8d0014b873de406e2041dea94d81cc515b74 -RMD160 (i3-4.8.tar.bz2) = 2f21b7f59aa6edab50f2d5dbf093c68e1ddf5d03 -Size (i3-4.8.tar.bz2) = 939690 bytes +SHA1 (i3-4.10.1.tar.bz2) = 2e93308f67479555ca276f1e885a6bebc92ba538 +RMD160 (i3-4.10.1.tar.bz2) = 6cadbbc335e646048f003b70cc05d67fea68e86a +Size (i3-4.10.1.tar.bz2) = 942981 bytes SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a SHA1 (patch-src_log.c) = 75ac4d0681d114e0343ddb015292c6c8ee81c1ae SHA1 (patch-src_main.c) = c03fcb12d404fcdfd14c1892b771ee0c7a86b39d |