diff options
author | ryoon <ryoon@pkgsrc.org> | 2014-01-01 07:15:58 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2014-01-01 07:15:58 +0000 |
commit | 4582de6977fefc3b99006a16d0894b08131b0fb1 (patch) | |
tree | beba707456a7db006a1f6b7c247942d7aadbd992 | |
parent | 92ab35ddc0d359c559b6c5b484f4d83d7d08bce8 (diff) | |
download | pkgsrc-4582de6977fefc3b99006a16d0894b08131b0fb1.tar.gz |
Import byobu-5.69 as misc/byobu.
Byobu is a GPLv3 open source text-based window manager and terminal
multiplexer. It was originally designed to provide elegant enhancements
to the otherwise functional, plain, practical GNU Screen, for the
Ubuntu server distribution. Byobu now includes an enhanced profiles,
convenient keybindings, configuration utilities, and toggle-able
system status notifications for both the GNU Screen window manager
and the more modern Tmux terminal multiplexer, and works on most
Linux, BSD, and Mac distributions.
36 files changed, 745 insertions, 0 deletions
diff --git a/misc/byobu/DESCR b/misc/byobu/DESCR new file mode 100644 index 00000000000..f7773165bc2 --- /dev/null +++ b/misc/byobu/DESCR @@ -0,0 +1,8 @@ +Byobu is a GPLv3 open source text-based window manager and terminal +multiplexer. It was originally designed to provide elegant enhancements +to the otherwise functional, plain, practical GNU Screen, for the +Ubuntu server distribution. Byobu now includes an enhanced profiles, +convenient keybindings, configuration utilities, and toggle-able +system status notifications for both the GNU Screen window manager +and the more modern Tmux terminal multiplexer, and works on most +Linux, BSD, and Mac distributions. diff --git a/misc/byobu/Makefile b/misc/byobu/Makefile new file mode 100644 index 00000000000..76b30992b12 --- /dev/null +++ b/misc/byobu/Makefile @@ -0,0 +1,81 @@ +# $NetBSD: Makefile,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +DISTNAME= byobu_5.69.orig +PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} +CATEGORIES= misc +MASTER_SITES= http://byobu.co/download/ + +MAINTAINER= ryoon@NetBSD.org +HOMEPAGE= http://byobu.co/download/ +COMMENT= Open source text-based window manager and terminal multiplexer +LICENSE= gnu-gpl-v3 + +WRKSRC= ${WRKDIR}/byobu-5.69 +GNU_CONFIGURE= yes +USE_LANGUAGES= # none +USE_TOOLS+= automake bash:run perl + +REPLACE_BASH+= usr/bin/* +REPLACE_BASH+= usr/lib/byobu/* +REPLACE_BASH+= usr/lib/byobu/include/* +REPLACE_BASH+= usr/share/byobu/tests/* + +REPLACE_PERL+= usr/lib/byobu/include/* +REPLACE_PYTHON+= usr/lib/byobu/include/* + +EGDIR= share/examples/byobu +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${EGDIR} +EGFILES+= byobu/backend \ + byobu/socketdir \ + profile.d/Z97-byobu.sh +# Keep empty directories +MAKE_DIRS+= ${PKG_SYSCONFBASE}/byobu ${PKG_SYSCONFBASE}/profile.d +.for i in ${EGFILES} +CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFBASE}/${i} +.endfor + +BYOBU_IN_FILES+= usr/bin/byobu-config.in \ + usr/bin/byobu-ctrl-a.in \ + usr/bin/byobu-disable-prompt.in \ + usr/bin/byobu-disable.in \ + usr/bin/byobu-enable-prompt.in \ + usr/bin/byobu-enable.in \ + usr/bin/byobu-export.in \ + usr/bin/byobu-janitor.in \ + usr/bin/byobu-launch.in \ + usr/bin/byobu-launcher-install.in \ + usr/bin/byobu-launcher-uninstall.in \ + usr/bin/byobu-launcher.in \ + usr/bin/byobu-layout.in \ + usr/bin/byobu-prompt.in \ + usr/bin/byobu-quiet.in \ + usr/bin/byobu-reconnect-sockets.in \ + usr/bin/byobu-select-backend.in \ + usr/bin/byobu-select-profile.in \ + usr/bin/byobu-select-session.in \ + usr/bin/byobu-shell.in \ + usr/bin/byobu-silent.in \ + usr/bin/byobu-status-detail.in \ + usr/bin/byobu-status.in \ + usr/bin/byobu-ugraph.in \ + usr/bin/byobu-ulevel.in \ + usr/bin/byobu.in \ + etc/profile.d/Z97-byobu.sh.in \ + usr/lib/byobu/include/dirs.in \ + usr/lib/byobu/include/toggle-utf8.in \ + usr/share/byobu/tests/byobu-time-notifications.in \ + usr/lib/byobu/include/config.py.in + +post-extract: +.for i in ${BYOBU_IN_FILES} + cd ${WRKSRC} && ${MV} ${i:S/.in$//} ${i} +.endfor + +pre-configure: + set -e; cd ${WRKSRC}; \ + aclocal; automake -a --foreign -i; autoconf + +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/application.mk" +.include "../../devel/py-newt/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/misc/byobu/PLIST b/misc/byobu/PLIST new file mode 100644 index 00000000000..70f72b18fc0 --- /dev/null +++ b/misc/byobu/PLIST @@ -0,0 +1,140 @@ +@comment $NetBSD: PLIST,v 1.1 2014/01/01 07:15:58 ryoon Exp $ +bin/byobu +bin/byobu-config +bin/byobu-ctrl-a +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/byobu-tmux +bin/byobu-ugraph +bin/byobu-ulevel +lib/byobu/apport +lib/byobu/arch +lib/byobu/battery +lib/byobu/color +lib/byobu/cpu_count +lib/byobu/cpu_freq +lib/byobu/cpu_temp +lib/byobu/custom +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/toggle-utf8 +lib/byobu/ip_address +lib/byobu/load_average +lib/byobu/logo +lib/byobu/mail +lib/byobu/memory +lib/byobu/menu +lib/byobu/network +lib/byobu/processes +lib/byobu/raid +lib/byobu/rcs_cost +lib/byobu/reboot_required +lib/byobu/release +lib/byobu/services +lib/byobu/session +lib/byobu/swap +lib/byobu/time +lib/byobu/time_binary +lib/byobu/time_utc +lib/byobu/trash +lib/byobu/updates_available +lib/byobu/uptime +lib/byobu/users +lib/byobu/whoami +lib/byobu/wifi_quality +man/man1/byobu-config.1 +man/man1/byobu-ctrl-a.1 +man/man1/byobu-disable-prompt.1 +man/man1/byobu-disable.1 +man/man1/byobu-enable-prompt.1 +man/man1/byobu-enable.1 +man/man1/byobu-export.1 +man/man1/byobu-janitor.1 +man/man1/byobu-keybindings.1 +man/man1/byobu-launch.1 +man/man1/byobu-launcher-install.1 +man/man1/byobu-launcher-uninstall.1 +man/man1/byobu-launcher.1 +man/man1/byobu-layout.1 +man/man1/byobu-prompt.1 +man/man1/byobu-quiet.1 +man/man1/byobu-reconnect-sockets.1 +man/man1/byobu-screen.1 +man/man1/byobu-select-backend.1 +man/man1/byobu-select-profile.1 +man/man1/byobu-select-session.1 +man/man1/byobu-shell.1 +man/man1/byobu-silent.1 +man/man1/byobu-status-detail.1 +man/man1/byobu-status.1 +man/man1/byobu-tmux.1 +man/man1/byobu-ugraph.1 +man/man1/byobu-ulevel.1 +man/man1/byobu.1 +share/applications/byobu.desktop +share/byobu/keybindings/common +share/byobu/keybindings/f-keys +share/byobu/keybindings/f-keys.screen +share/byobu/keybindings/f-keys.screen.disable +share/byobu/keybindings/f-keys.tmux +share/byobu/keybindings/f-keys.tmux.disable +share/byobu/keybindings/mouse.tmux.disable +share/byobu/keybindings/mouse.tmux.enable +share/byobu/keybindings/none +share/byobu/keybindings/tmux-screen-keys.conf +share/byobu/pixmaps/byobu.svg +share/byobu/profiles/NONE +share/byobu/profiles/bashrc +share/byobu/profiles/byoburc +share/byobu/profiles/common +share/byobu/profiles/screenrc +share/byobu/profiles/tmux +share/byobu/profiles/tmuxrc +share/byobu/status/status +share/byobu/status/statusrc +share/byobu/tests/byobu-time-notifications +share/byobu/windows/common +share/doc/byobu/help.screen.txt +share/doc/byobu/help.tmux.txt +share/examples/byobu/byobu/backend +share/examples/byobu/byobu/socketdir +share/examples/byobu/profile.d/Z97-byobu.sh diff --git a/misc/byobu/distinfo b/misc/byobu/distinfo new file mode 100644 index 00000000000..6aedb966928 --- /dev/null +++ b/misc/byobu/distinfo @@ -0,0 +1,37 @@ +$NetBSD: distinfo,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +SHA1 (byobu_5.69.orig.tar.gz) = 28823d25563e4356ac7dde7726d7dc68fb01ead8 +RMD160 (byobu_5.69.orig.tar.gz) = 27821ebd0fd4b83bc785005a1fd1971866962788 +Size (byobu_5.69.orig.tar.gz) = 635271 bytes +SHA1 (patch-configure.ac) = 21cac29e1c4c2fed7c6829c344cbe0e63f587fef +SHA1 (patch-etc_profile.d_Z97-byobu.sh.in) = ffcee02f275d8cc7ac3d0d68341732970ba6574f +SHA1 (patch-usr_bin_byobu-config.in) = 6bb580db2ed61960a3c338a95d15522d194735c1 +SHA1 (patch-usr_bin_byobu-ctrl-a.in) = 8ff863de7d232f086c87120e8e159bdcf85165bc +SHA1 (patch-usr_bin_byobu-disable-prompt.in) = 9e903639ab4611141d0172c1c514a3152559a198 +SHA1 (patch-usr_bin_byobu-disable.in) = f21719a475d5470a9297db8c7c418ee37a1ea473 +SHA1 (patch-usr_bin_byobu-enable-prompt.in) = c20bd9062e6b5edb4c4a397ffeabdebb1b5edd65 +SHA1 (patch-usr_bin_byobu-enable.in) = bd16e003838bab3e2738283bec99bf1d67ea7b2b +SHA1 (patch-usr_bin_byobu-export.in) = 6ccc71f97b6e5c5577f561c099001e581a9100be +SHA1 (patch-usr_bin_byobu-janitor.in) = 19b5839576984ff4521a487761d49e3abe989402 +SHA1 (patch-usr_bin_byobu-launch.in) = 0741804991233730f695ae5549bb2914897ba14a +SHA1 (patch-usr_bin_byobu-launcher-install.in) = b9c22c556912f6661a4020788245bbd3c3a7ab3b +SHA1 (patch-usr_bin_byobu-launcher-uninstall.in) = e91e4af5c34958a2c53d5a87b7807dfc27c4061f +SHA1 (patch-usr_bin_byobu-launcher.in) = 7dcede2dafe7d811f91890dea437b8f6bb07a6cf +SHA1 (patch-usr_bin_byobu-layout.in) = 390b69eb7d760d8a0cacd878e41c7d3a3e190219 +SHA1 (patch-usr_bin_byobu-prompt.in) = c4e2fbd007d0b01c1c7cd15ae661c5e84f269c5d +SHA1 (patch-usr_bin_byobu-quiet.in) = 1f9f1eb6f60ad455c337794e53b45d9018d5d300 +SHA1 (patch-usr_bin_byobu-reconnect-sockets.in) = 54d1704528b6f571c905c485fdd9c5b5ba7589d7 +SHA1 (patch-usr_bin_byobu-select-backend.in) = aedd6141e8620725311fad63595d8049e5df03ec +SHA1 (patch-usr_bin_byobu-select-profile.in) = 95267ce4fbaeb0f4af96155d6c651963216604d5 +SHA1 (patch-usr_bin_byobu-select-session.in) = 7d2eb8fdb1a1c0e5240f78cb2276a4ed817cbc82 +SHA1 (patch-usr_bin_byobu-shell.in) = 2bda6c565cbbe390101c7944f31c8cdf4eb78a72 +SHA1 (patch-usr_bin_byobu-silent.in) = 681e61b1b49f26f87c529bf9f5d6e737b1f4c909 +SHA1 (patch-usr_bin_byobu-status-detail.in) = 3213db863ffec32f58cff11e152ee28b55240998 +SHA1 (patch-usr_bin_byobu-status.in) = fcf9cdfb58d9cad79753d5c8b8e520356e4ac8e4 +SHA1 (patch-usr_bin_byobu-ugraph.in) = 6b035b71421504ec84f7a2d153fe39138c904d12 +SHA1 (patch-usr_bin_byobu-ulevel.in) = b8574cfc4f4b3e6e577dc962b3d5ec60c1d4f5b4 +SHA1 (patch-usr_bin_byobu.in) = 659043e79a14a65005fb9ad5a36666a237028a80 +SHA1 (patch-usr_lib_byobu_include_config.py.in) = 8a7f3f27473ea0bbd028a42074ba2275a293b102 +SHA1 (patch-usr_lib_byobu_include_dirs.in) = 13091758e7f86982ff304fd7a9771a94ed9af0b6 +SHA1 (patch-usr_lib_byobu_include_toggle-utf8.in) = 1ac7f90223605b1dc94995bc80fde102be83090d +SHA1 (patch-usr_share_byobu_tests_byobu-time-notifications.in) = 553aa4db17d4d835a0df20541ffb6e50dce1d519 diff --git a/misc/byobu/patches/patch-configure.ac b/misc/byobu/patches/patch-configure.ac new file mode 100644 index 00000000000..7a41bdbcc7c --- /dev/null +++ b/misc/byobu/patches/patch-configure.ac @@ -0,0 +1,43 @@ +$NetBSD: patch-configure.ac,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- configure.ac.orig 2013-08-28 03:50:01.000000000 +0000 ++++ configure.ac +@@ -19,7 +19,38 @@ AC_PROG_LN_S + AC_OUTPUT(Makefile \ + etc/byobu/Makefile \ + etc/profile.d/Makefile \ ++ etc/profile.d/Z97-byobu.sh + usr/share/applications/Makefile \ ++ usr/bin/byobu ++ usr/bin/byobu-config ++ usr/bin/byobu-ctrl-a ++ usr/bin/byobu-disable ++ usr/bin/byobu-disable-prompt ++ usr/bin/byobu-enable ++ usr/bin/byobu-enable-prompt ++ usr/bin/byobu-export ++ usr/bin/byobu-janitor ++ usr/bin/byobu-launch ++ usr/bin/byobu-launcher ++ usr/bin/byobu-launcher-install ++ usr/bin/byobu-launcher-uninstall ++ usr/bin/byobu-layout ++ usr/bin/byobu-prompt ++ usr/bin/byobu-quiet ++ usr/bin/byobu-reconnect-sockets ++ usr/bin/byobu-select-backend ++ usr/bin/byobu-select-profile ++ usr/bin/byobu-select-session ++ usr/bin/byobu-shell ++ usr/bin/byobu-silent ++ usr/bin/byobu-status ++ usr/bin/byobu-status-detail ++ usr/bin/byobu-ugraph ++ usr/bin/byobu-ulevel ++ usr/lib/byobu/include/config.py ++ usr/lib/byobu/include/dirs ++ usr/lib/byobu/include/toggle-utf8 ++ usr/share/byobu/tests/byobu-time-notifications + usr/share/byobu/keybindings/Makefile \ + usr/share/byobu/pixmaps/Makefile \ + usr/share/byobu/profiles/Makefile \ diff --git a/misc/byobu/patches/patch-etc_profile.d_Z97-byobu.sh.in b/misc/byobu/patches/patch-etc_profile.d_Z97-byobu.sh.in new file mode 100644 index 00000000000..71be3479663 --- /dev/null +++ b/misc/byobu/patches/patch-etc_profile.d_Z97-byobu.sh.in @@ -0,0 +1,29 @@ +$NetBSD: patch-etc_profile.d_Z97-byobu.sh.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- etc/profile.d/Z97-byobu.sh.in.orig 2013-10-18 20:25:32.000000000 +0000 ++++ etc/profile.d/Z97-byobu.sh.in +@@ -20,16 +20,16 @@ + # Apologies for borrowing the LC_BYOBU namespace, but: + # a) it's reasonable to assume that no one else is using LC_BYOBU + # b) LC_* is sent and receieved by most /etc/ssh/ssh*_config +-if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "/usr/bin/byobu-launch" ]; then +- . /usr/bin/byobu-launch +-elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "/usr/bin/byobu-launch" ]; then +- . /usr/bin/byobu-launch +-elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "/usr/bin/byobu-launch" ]; then ++if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "@prefix@/bin/byobu-launch" ]; then ++ . @prefix@/bin/byobu-launch ++elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "@prefix@/bin/byobu-launch" ]; then ++ . @prefix@/bin/byobu-launch ++elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "@prefix@/bin/byobu-launch" ]; then + export BYOBU_BACKEND="screen" +- . /usr/bin/byobu-launch +-elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "/usr/bin/byobu-launch" ]; then ++ . @prefix@/bin/byobu-launch ++elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "@prefix@/bin/byobu-launch" ]; then + export BYOBU_BACKEND="tmux" +- . /usr/bin/byobu-launch ++ . @prefix@/bin/byobu-launch + fi + + # vi: syntax=sh ts=4 noexpandtab diff --git a/misc/byobu/patches/patch-usr_bin_byobu-config.in b/misc/byobu/patches/patch-usr_bin_byobu-config.in new file mode 100644 index 00000000000..4fa4919af3b --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-config.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-config.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-config.in.orig 2013-12-17 01:48:21.000000000 +0000 ++++ usr/bin/byobu-config.in +@@ -18,7 +18,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + PKG="byobu" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-ctrl-a.in b/misc/byobu/patches/patch-usr_bin_byobu-ctrl-a.in new file mode 100644 index 00000000000..03617626042 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-ctrl-a.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-ctrl-a.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-ctrl-a.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-ctrl-a.in +@@ -27,7 +27,7 @@ EOF + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + bind_to="" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-disable-prompt.in b/misc/byobu/patches/patch-usr_bin_byobu-disable-prompt.in new file mode 100644 index 00000000000..eddc0c7c574 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-disable-prompt.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-disable-prompt.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-disable-prompt.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-disable-prompt.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + $BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-disable.in b/misc/byobu/patches/patch-usr_bin_byobu-disable.in new file mode 100644 index 00000000000..11e271497e9 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-disable.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-disable.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-disable.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-disable.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + byobu-launcher-uninstall diff --git a/misc/byobu/patches/patch-usr_bin_byobu-enable-prompt.in b/misc/byobu/patches/patch-usr_bin_byobu-enable-prompt.in new file mode 100644 index 00000000000..198c19ad9d1 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-enable-prompt.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-enable-prompt.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-enable-prompt.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-enable-prompt.in +@@ -21,7 +21,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + diff --git a/misc/byobu/patches/patch-usr_bin_byobu-enable.in b/misc/byobu/patches/patch-usr_bin_byobu-enable.in new file mode 100644 index 00000000000..a49cf3d3603 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-enable.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-enable.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-enable.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-enable.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + byobu-launcher-install diff --git a/misc/byobu/patches/patch-usr_bin_byobu-export.in b/misc/byobu/patches/patch-usr_bin_byobu-export.in new file mode 100644 index 00000000000..1c334c6dc14 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-export.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-export.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-export.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-export.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + gettext " diff --git a/misc/byobu/patches/patch-usr_bin_byobu-janitor.in b/misc/byobu/patches/patch-usr_bin_byobu-janitor.in new file mode 100644 index 00000000000..31e0f4ea616 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-janitor.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-janitor.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-janitor.in.orig 2013-11-01 19:44:12.000000000 +0000 ++++ usr/bin/byobu-janitor.in +@@ -21,7 +21,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + # Ensure that all updates get run immediately diff --git a/misc/byobu/patches/patch-usr_bin_byobu-launch.in b/misc/byobu/patches/patch-usr_bin_byobu-launch.in new file mode 100644 index 00000000000..d615df67bb4 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-launch.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-launch.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-launch.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-launch.in +@@ -43,7 +43,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] + BYOBU_SOURCED_PROFILE=1 + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +- [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++ [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + # Ensure that autolaunch is not explicitly disabled + if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then diff --git a/misc/byobu/patches/patch-usr_bin_byobu-launcher-install.in b/misc/byobu/patches/patch-usr_bin_byobu-launcher-install.in new file mode 100644 index 00000000000..667b28c3aa6 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-launcher-install.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-launcher-install.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-launcher-install.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-launcher-install.in +@@ -20,7 +20,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-launcher-uninstall.in b/misc/byobu/patches/patch-usr_bin_byobu-launcher-uninstall.in new file mode 100644 index 00000000000..f50ffe0ab7d --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-launcher-uninstall.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-launcher-uninstall.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-launcher-uninstall.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-launcher-uninstall.in +@@ -20,7 +20,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + remove_launcher() { diff --git a/misc/byobu/patches/patch-usr_bin_byobu-launcher.in b/misc/byobu/patches/patch-usr_bin_byobu-launcher.in new file mode 100644 index 00000000000..3adef1cb042 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-launcher.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-launcher.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-launcher.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-launcher.in +@@ -22,7 +22,7 @@ PKG="byobu" + # ie, rather than "sudo byobu", you must run "sudo -H byobu" + if [ -O "$HOME" ]; then + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +- [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++ [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then + false diff --git a/misc/byobu/patches/patch-usr_bin_byobu-layout.in b/misc/byobu/patches/patch-usr_bin_byobu-layout.in new file mode 100644 index 00000000000..9a9edbb0e2e --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-layout.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-layout.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-layout.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-layout.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + # Get the layouts directory diff --git a/misc/byobu/patches/patch-usr_bin_byobu-prompt.in b/misc/byobu/patches/patch-usr_bin_byobu-prompt.in new file mode 100644 index 00000000000..7879e0d4cbe --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-prompt.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-prompt.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-prompt.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-prompt.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + echo diff --git a/misc/byobu/patches/patch-usr_bin_byobu-quiet.in b/misc/byobu/patches/patch-usr_bin_byobu-quiet.in new file mode 100644 index 00000000000..5a3ab640a9e --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-quiet.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-quiet.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-quiet.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-quiet.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + FLAG="$BYOBU_CONFIG_DIR/status.disable" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-reconnect-sockets.in b/misc/byobu/patches/patch-usr_bin_byobu-reconnect-sockets.in new file mode 100644 index 00000000000..20e7bf89200 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-reconnect-sockets.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-reconnect-sockets.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-reconnect-sockets.in.orig 2013-11-01 19:49:07.000000000 +0000 ++++ usr/bin/byobu-reconnect-sockets.in +@@ -25,7 +25,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + case "$-" in diff --git a/misc/byobu/patches/patch-usr_bin_byobu-select-backend.in b/misc/byobu/patches/patch-usr_bin_byobu-select-backend.in new file mode 100644 index 00000000000..5f44cea8086 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-select-backend.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-select-backend.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-select-backend.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-select-backend.in +@@ -20,7 +20,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + usage () { diff --git a/misc/byobu/patches/patch-usr_bin_byobu-select-profile.in b/misc/byobu/patches/patch-usr_bin_byobu-select-profile.in new file mode 100644 index 00000000000..4e60f4d2489 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-select-profile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-select-profile.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-select-profile.in.orig 2013-11-06 15:18:05.000000000 +0000 ++++ usr/bin/byobu-select-profile.in +@@ -24,7 +24,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + TEXTDOMAIN="$PKG" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-select-session.in b/misc/byobu/patches/patch-usr_bin_byobu-select-session.in new file mode 100644 index 00000000000..1f092da288c --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-select-session.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-select-session.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-select-session.in.orig 2013-12-17 01:48:43.000000000 +0000 ++++ usr/bin/byobu-select-session.in +@@ -18,7 +18,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + PKG="byobu" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/select-session.py" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-shell.in b/misc/byobu/patches/patch-usr_bin_byobu-shell.in new file mode 100644 index 00000000000..56ba1cec59b --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-shell.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-shell.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-shell.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-shell.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-silent.in b/misc/byobu/patches/patch-usr_bin_byobu-silent.in new file mode 100644 index 00000000000..fd78a1646b4 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-silent.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-silent.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-silent.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-silent.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + FLAG="$BYOBU_CONFIG_DIR/status.disable" diff --git a/misc/byobu/patches/patch-usr_bin_byobu-status-detail.in b/misc/byobu/patches/patch-usr_bin_byobu-status-detail.in new file mode 100644 index 00000000000..d308bb27165 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-status-detail.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-status-detail.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-status-detail.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-status-detail.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + if which vim >/dev/null && `vim --version | grep -q +folding`; then diff --git a/misc/byobu/patches/patch-usr_bin_byobu-status.in b/misc/byobu/patches/patch-usr_bin_byobu-status.in new file mode 100644 index 00000000000..ac247a8cf7e --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-status.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-status.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-status.in.orig 2013-11-01 20:40:43.000000000 +0000 ++++ usr/bin/byobu-status.in +@@ -20,7 +20,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + # Make sure status is not disabled diff --git a/misc/byobu/patches/patch-usr_bin_byobu-ugraph.in b/misc/byobu/patches/patch-usr_bin_byobu-ugraph.in new file mode 100644 index 00000000000..02e61623e6d --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-ugraph.in @@ -0,0 +1,22 @@ +$NetBSD: patch-usr_bin_byobu-ugraph.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-ugraph.in.orig 2013-12-17 02:04:48.000000000 +0000 ++++ usr/bin/byobu-ugraph.in +@@ -26,7 +26,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + script_name=${0##*/} +@@ -81,7 +81,7 @@ Examples: + Trailing echo adds a required newline + Note no filename specified. + +- $script_name "(/usr/lib/byobu/mem_used | sed -e 's/% //g';echo)" ++ $script_name "(@prefix@/lib/byobu/mem_used | sed -e 's/% //g';echo)" + + + Using $script_name just to rotate log and display the graph diff --git a/misc/byobu/patches/patch-usr_bin_byobu-ulevel.in b/misc/byobu/patches/patch-usr_bin_byobu-ulevel.in new file mode 100644 index 00000000000..9918c54b357 --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu-ulevel.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_bin_byobu-ulevel.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu-ulevel.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/bin/byobu-ulevel.in +@@ -37,7 +37,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + circles_2=(○ ●) diff --git a/misc/byobu/patches/patch-usr_bin_byobu.in b/misc/byobu/patches/patch-usr_bin_byobu.in new file mode 100644 index 00000000000..acaac82b72c --- /dev/null +++ b/misc/byobu/patches/patch-usr_bin_byobu.in @@ -0,0 +1,21 @@ +$NetBSD: patch-usr_bin_byobu.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/bin/byobu.in.orig 2013-12-17 05:29:51.000000000 +0000 ++++ usr/bin/byobu.in +@@ -41,14 +41,14 @@ if [ -z "${BYOBU_PREFIX}" ]; then + # Find and export the installation location prefix + greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink" + prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))" +- if [ "$prefix" != "/usr" ]; then ++ if [ "$prefix" != "@prefix@" ]; then + echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc" + . "$HOME/.byoburc" + fi + fi + export BYOBU_CHARMAP=$(locale charmap) + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + # Override backend if we can determine intentions from argv[0] diff --git a/misc/byobu/patches/patch-usr_lib_byobu_include_config.py.in b/misc/byobu/patches/patch-usr_lib_byobu_include_config.py.in new file mode 100644 index 00000000000..9d06ebf1abe --- /dev/null +++ b/misc/byobu/patches/patch-usr_lib_byobu_include_config.py.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_lib_byobu_include_config.py.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/lib/byobu/include/config.py.in.orig 2013-12-06 13:39:33.000000000 +0000 ++++ usr/lib/byobu/include/config.py.in +@@ -52,7 +52,7 @@ BYOBU_CONFIG_DIR = os.getenv("BYOBU_CONF + BYOBU_RUN_DIR = os.getenv("BYOBU_RUN_DIR", HOME + "/.cache/byobu") + BYOBU_BACKEND = os.getenv("BYOBU_BACKEND", "tmux") + BYOBU_SOCKETDIR = os.getenv("SOCKETDIR", "/var/run/screen") +-BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "/usr") ++BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "@prefix@") + SHARE = BYOBU_PREFIX + '/share/' + PKG + DOC = BYOBU_PREFIX + '/share/doc/' + PKG + if not os.path.exists(SHARE): diff --git a/misc/byobu/patches/patch-usr_lib_byobu_include_dirs.in b/misc/byobu/patches/patch-usr_lib_byobu_include_dirs.in new file mode 100644 index 00000000000..30f341f3e79 --- /dev/null +++ b/misc/byobu/patches/patch-usr_lib_byobu_include_dirs.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_lib_byobu_include_dirs.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/lib/byobu/include/dirs.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/lib/byobu/include/dirs.in +@@ -22,7 +22,7 @@ PKG="byobu" + + # Some users build and install byobu themselves, rather than from a distro + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr" ++[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="@prefix@" + + # Create and export the user configuration directory + if [ -d "$BYOBU_CONFIG_DIR" ]; then diff --git a/misc/byobu/patches/patch-usr_lib_byobu_include_toggle-utf8.in b/misc/byobu/patches/patch-usr_lib_byobu_include_toggle-utf8.in new file mode 100644 index 00000000000..6cf35afc1bb --- /dev/null +++ b/misc/byobu/patches/patch-usr_lib_byobu_include_toggle-utf8.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_lib_byobu_include_toggle-utf8.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/lib/byobu/include/toggle-utf8.in.orig 2013-09-19 16:34:11.000000000 +0000 ++++ usr/lib/byobu/include/toggle-utf8.in +@@ -19,7 +19,7 @@ + + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX ++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + [ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" + diff --git a/misc/byobu/patches/patch-usr_share_byobu_tests_byobu-time-notifications.in b/misc/byobu/patches/patch-usr_share_byobu_tests_byobu-time-notifications.in new file mode 100644 index 00000000000..b0c47f1e39b --- /dev/null +++ b/misc/byobu/patches/patch-usr_share_byobu_tests_byobu-time-notifications.in @@ -0,0 +1,13 @@ +$NetBSD: patch-usr_share_byobu_tests_byobu-time-notifications.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $ + +--- usr/share/byobu/tests/byobu-time-notifications.in.orig 2013-08-28 03:50:01.000000000 +0000 ++++ usr/share/byobu/tests/byobu-time-notifications.in +@@ -21,7 +21,7 @@ + + PKG=byobu + RUNS=100 +-[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr" ++[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="@prefix@" + export BYOBU_PREFIX + + loop() { |