Date: Sun, 2 Mar 2014 10:34:51 -0500 (EST) From: Adam Weinberger <adamw@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187196: [patch] update and clean up sysutils/byobu Message-ID: <20140302153451.AE66D11F8A5@apnoea.adamw.org> Resent-Message-ID: <201403021540.s22Fe0A5023123@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187196 >Category: ports >Synopsis: [patch] update and clean up sysutils/byobu >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: Sun Mar 02 15:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Adam Weinberger >Release: FreeBSD 10.0-STABLE i386 >Organization: >Environment: System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #0: Fri Feb 28 10:32:45 EST 2014 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386 >Description: Well, sysutils/byobu is using a release from over 3 years ago, and has missed the last 120 updates (not exaggerating). The Makefile also needs to be cleaned up a bit. >How-To-Repeat: >Fix: The attached patch: * Updates to the latest release * Extends the path-fixups to the rest of the missed files * Accounts for having 2 bash ports in the tree * Modernizes the MDOCS behaviour with staging --- byobu.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 346767) +++ Makefile (working copy) @@ -2,31 +2,29 @@ # $FreeBSD$ PORTNAME= byobu -PORTVERSION= 3.29 -PORTREVISION= 1 +PORTVERSION= 5.73 CATEGORIES= sysutils -MASTER_SITES= http://launchpadlibrarian.net/65243016/ +MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= gslin@gslin.org COMMENT= Profile and configuration utilities for GNU Screen -RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ - ${LOCALBASE}/bin/screen:${PORTSDIR}/sysutils/screen +RUN_DEPENDS= screen:${PORTSDIR}/sysutils/screen GNU_CONFIGURE= yes USE_PYTHON= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +OPTIONS_DEFINE= BASH_DEVEL +BASH_DEVEL_DESC=Use bash-devel instead of bash +BASH_DEVEL_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash-devel +BASH_DEVEL_RUN_DEPENDS_OFF= bash:${PORTSDIR}/shells/bash + post-patch: - ${REINPLACE_CMD} \ - -e "s@/bin/bash@${LOCALBASE}/bin/bash@" \ - -e "s@/usr/bin/python@${PYTHON_CMD}@" \ - ${WRKSRC}/usr/bin/* -.if defined(NOPORTDOCS) - ${REINPLACE_CMD} \ - -e "s@^install:.*@install:@" \ - ${WRKSRC}/usr/share/doc/byobu/Makefile.in -.endif + ${FIND} ${WRKSRC} -type f | ${XARGS} \ + ${REINPLACE_CMD} \ + -e "s@/bin/bash@${LOCALBASE}/bin/bash@" \ + -e "s@/usr/bin/python@${PYTHON_CMD}@" .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 346767) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (byobu_3.29.orig.tar.gz) = c451147409bccabd13d22a6f0921e235bc6fa98d04301da2fb8d4ad83bf7a640 -SIZE (byobu_3.29.orig.tar.gz) = 366937 +SHA256 (byobu_5.73.orig.tar.gz) = c5508b591f4bb1f9cbfb3e9264b3e123eac791c395c5864b9ccb3da10e684ce1 +SIZE (byobu_5.73.orig.tar.gz) = 635985 Index: pkg-descr =================================================================== --- pkg-descr (revision 346767) +++ pkg-descr (working copy) @@ -4,4 +4,4 @@ includes an enhanced profile and configuration utilities for the GNU screen window manager, such as toggle-able system status notifications. -WWW: https://launchpad.net/byobu +WWW: http://www.byobu.co Index: pkg-plist =================================================================== --- pkg-plist (revision 346767) +++ pkg-plist (working copy) @@ -1,55 +1,38 @@ -%%DATADIR%%/ec2/rates.eu_ie -%%DATADIR%%/ec2/rates.us_ca -%%DATADIR%%/ec2/rates.us_va -%%DATADIR%%/keybindings/common -%%DATADIR%%/keybindings/f-keys -%%DATADIR%%/keybindings/none -%%DATADIR%%/keybindings/screen-escape-keys -%%DATADIR%%/pixmaps/byobu.svg -%%DATADIR%%/profiles/NONE -%%DATADIR%%/profiles/byoburc -%%DATADIR%%/profiles/common -%%DATADIR%%/profiles/socketdir -%%DATADIR%%/profiles/statusrc -%%DATADIR%%/tests/byobu-time-notifications -%%DATADIR%%/windows/common -%%PORTDOCS%%%%DOCSDIR%%/help.txt -man/man1/byobu-config.1.gz -man/man1/byobu-disable.1.gz -man/man1/byobu-enable.1.gz -man/man1/byobu-export.1.gz -man/man1/byobu-janitor.1.gz -man/man1/byobu-launch.1.gz -man/man1/byobu-launcher-install.1.gz -man/man1/byobu-launcher-uninstall.1.gz -man/man1/byobu-launcher.1.gz -man/man1/byobu-reconnect-sockets.1.gz -man/man1/byobu-select-profile.1.gz -man/man1/byobu-select-session.1.gz -man/man1/byobu-status-detail.1.gz -man/man1/byobu-status.1.gz -man/man1/byobu.1.gz -man/man1/shell.1.gz bin/byobu +bin/byobu-ctrl-a bin/byobu-config bin/byobu-disable +bin/byobu-disable-prompt bin/byobu-enable +bin/byobu-enable-prompt bin/byobu-export bin/byobu-janitor +bin/byobu-keybindings bin/byobu-launch bin/byobu-launcher bin/byobu-launcher-install bin/byobu-launcher-uninstall +bin/byobu-layout +bin/byobu-prompt +bin/byobu-quiet bin/byobu-reconnect-sockets +bin/byobu-screen +bin/byobu-select-backend bin/byobu-select-profile bin/byobu-select-session +bin/byobu-shell +bin/byobu-silent bin/byobu-status bin/byobu-status-detail -bin/shell -lib/byobu/.notify_osd +bin/byobu-tmux +bin/byobu-ugraph +bin/byobu-ulevel +%%ETCDIR%%/backend +%%ETCDIR%%/socketdir lib/byobu/apport lib/byobu/arch lib/byobu/battery +lib/byobu/color lib/byobu/cpu_count lib/byobu/cpu_freq lib/byobu/cpu_temp @@ -57,18 +40,33 @@ lib/byobu/date lib/byobu/disk lib/byobu/disk_io +lib/byobu/distro lib/byobu/ec2_cost +lib/byobu/entropy lib/byobu/fan_speed lib/byobu/hostname +lib/byobu/include/common +lib/byobu/include/config.py +lib/byobu/include/constants +lib/byobu/include/cycle-status +lib/byobu/include/dirs +lib/byobu/include/ec2instancespricing.py +lib/byobu/include/icons +lib/byobu/include/mondrian +lib/byobu/include/notify_osd +lib/byobu/include/select-session.py +lib/byobu/include/shutil +lib/byobu/include/tmux-detach-all-but-current-client +lib/byobu/include/tmux-send-command-to-all-panes +lib/byobu/include/tmux-send-command-to-all-windows +lib/byobu/include/toggle-utf8 lib/byobu/ip_address lib/byobu/load_average lib/byobu/logo lib/byobu/mail -lib/byobu/mem_available -lib/byobu/mem_used +lib/byobu/memory lib/byobu/menu lib/byobu/network -lib/byobu/notify_osd lib/byobu/processes lib/byobu/raid lib/byobu/rcs_cost @@ -75,6 +73,7 @@ lib/byobu/reboot_required lib/byobu/release lib/byobu/services +lib/byobu/session lib/byobu/swap lib/byobu/time lib/byobu/time_binary @@ -85,13 +84,68 @@ lib/byobu/users lib/byobu/whoami lib/byobu/wifi_quality +man/man1/byobu-ctrl-a.1.gz +man/man1/byobu-config.1.gz +man/man1/byobu-disable.1.gz +man/man1/byobu-disable-prompt.1.gz +man/man1/byobu-enable.1.gz +man/man1/byobu-enable-prompt.1.gz +man/man1/byobu-export.1.gz +man/man1/byobu-janitor.1.gz +man/man1/byobu-keybindings.1.gz +man/man1/byobu-launch.1.gz +man/man1/byobu-launcher-install.1.gz +man/man1/byobu-launcher-uninstall.1.gz +man/man1/byobu-launcher.1.gz +man/man1/byobu-layout.1.gz +man/man1/byobu-prompt.1.gz +man/man1/byobu-quiet.1.gz +man/man1/byobu-reconnect-sockets.1.gz +man/man1/byobu-screen.1.gz +man/man1/byobu-select-backend.1.gz +man/man1/byobu-select-profile.1.gz +man/man1/byobu-select-session.1.gz +man/man1/byobu-shell.1.gz +man/man1/byobu-silent.1.gz +man/man1/byobu-status-detail.1.gz +man/man1/byobu-status.1.gz +man/man1/byobu-tmux.1.gz +man/man1/byobu-ugraph.1.gz +man/man1/byobu-ulevel.1.gz +man/man1/byobu.1.gz share/applications/byobu.desktop -@dirrm lib/byobu +%%DATADIR%%/keybindings/common +%%DATADIR%%/keybindings/f-keys +%%DATADIR%%/keybindings/f-keys.screen +%%DATADIR%%/keybindings/f-keys.screen.disable +%%DATADIR%%/keybindings/f-keys.tmux +%%DATADIR%%/keybindings/f-keys.tmux.disable +%%DATADIR%%/keybindings/mouse.tmux.disable +%%DATADIR%%/keybindings/mouse.tmux.enable +%%DATADIR%%/keybindings/none +%%DATADIR%%/keybindings/tmux-screen-keys.conf +%%DATADIR%%/pixmaps/byobu.svg +%%DATADIR%%/profiles/NONE +%%DATADIR%%/profiles/bashrc +%%DATADIR%%/profiles/byoburc +%%DATADIR%%/profiles/common +%%DATADIR%%/profiles/screenrc +%%DATADIR%%/profiles/tmux +%%DATADIR%%/profiles/tmuxrc +%%DATADIR%%/status/status +%%DATADIR%%/status/statusrc +%%DATADIR%%/tests/byobu-time-notifications +%%DATADIR%%/windows/common +%%PORTDOCS%%%%DOCSDIR%%/help.screen.txt +%%PORTDOCS%%%%DOCSDIR%%/help.tmux.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/windows @dirrm %%DATADIR%%/tests +@dirrm %%DATADIR%%/status @dirrm %%DATADIR%%/profiles @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/keybindings -@dirrm %%DATADIR%%/ec2 @dirrm %%DATADIR%% +@dirrm lib/byobu/include +@dirrm lib/byobu +@dirrm %%ETCDIR%% --- byobu.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140302153451.AE66D11F8A5>