3 files changed, 67 insertions, 29 deletions

diff --git a/sysutils/wemux/Makefile b/sysutils/wemux/Makefile
index 8cd450f04c18..ce0398b31ce1 100644
--- a/sysutils/wemux/Makefile
+++ b/sysutils/wemux/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wemux
-PORTVERSION=	2.2.0
+PORTVERSION=	3.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.c-s.li/ports/
 
@@ -17,8 +17,8 @@ RUN_DEPENDS=	tmux:${PORTSDIR}/sysutils/tmux \
 NO_BUILD=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	zolrath
-GH_TAGNAME=	dfd964792a859ebc24b4210c53c9a0ceb9bb29e6
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-dfd9647
+GH_TAGNAME=	971f8c375263f9dd8853f676e3331782c4fbdfdc
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-971f8c3
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${PORTNAME}
diff --git a/sysutils/wemux/distinfo b/sysutils/wemux/distinfo
index 8bd606770598..c037d4c0b318 100644
--- a/sysutils/wemux/distinfo
+++ b/sysutils/wemux/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wemux-2.2.0.tar.gz) = 9940cd5e83c3623aebdb53dc129bb3578df409f3744827f3737b474f9d6a19dd
-SIZE (wemux-2.2.0.tar.gz) = 9851
+SHA256 (wemux-3.2.0.tar.gz) = 97378d4a40d6f230b5a77fbd29b100fca8f249d32a90fedd45b9a5ae3de3e47e
+SIZE (wemux-3.2.0.tar.gz) = 13359
diff --git a/sysutils/wemux/files/patch-wemux b/sysutils/wemux/files/patch-wemux
index d4844ec12be1..ec2f5fed3650 100644
--- a/sysutils/wemux/files/patch-wemux
+++ b/sysutils/wemux/files/patch-wemux
@@ -1,40 +1,78 @@
---- wemux.orig	2012-03-29 02:17:10.000000000 +0200
-+++ wemux	2013-10-06 14:54:20.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!%%PREFIX%%/bin/bash
- # wemux by Matt Furden @zolrath
- # version 2.2.0
- #
-@@ -7,8 +7,9 @@
- # or pairing, which will allow them to edit your file (shared cursor) or work
+--- wemux.orig	2014-03-13 23:47:09.000000000 +0100
++++ wemux	2014-03-13 23:49:01.000000000 +0100
+@@ -9,8 +9,8 @@
  # in another window (separate cursors) in the hosts tmux session.
  #
--# To set a user as host add their username to the host_list in /etc/wemux.conf
--# Other configuations options are also located in /etc/wemux.conf
-+# To set a user as host add their username to the host_list in
-+# %%PREFIX%%/etc/wemux.conf
+ # To set a user as host add their username to the host_list in the configuration
+-# file located at /usr/local/etc/wemux.conf
+-# Other configuations options are also located in /usr/local/etc/wemux.conf
++# file located at %%PREFIX%%/etc/wemux.conf
 +# Other configuations options are also located in %%PREFIX%%/etc/wemux.conf
  #
- # For environments with multiple hosts running their own independent sessions
- # on the same machine wemux can join different sessions with the wemux join
-@@ -42,7 +43,7 @@
- version="2.2.0"
+ # For environments with multiple hosts running their own independent servers
+ # on the same machine wemux can join different servers with the wemux join
+@@ -46,7 +46,7 @@
+ version="3.2.0"
  
  # Setup and Configuration Files.
--# Default settings, modify them in the /etc/wemux.conf file:
+-# Default settings, modify them in the /usr/local/etc/wemux.conf file:
 +# Default settings, modify them in the %%PREFIX%%/etc/wemux.conf file:
- host_list=(root)
+ host_list=(change_this_in_wemux_conf)
  socket_prefix="/tmp/wemux"
  options="-u"
-@@ -60,8 +61,8 @@
+@@ -66,8 +66,8 @@
  # Set $EDITOR default to vi if not configured on host machine.
  editor=${EDITOR:="vi"}
  
--# Load configuration options from /etc/wemux.conf
--[ -f /etc/wemux.conf ] && . /etc/wemux.conf
+-# Load configuration options from /usr/local/etc/wemux.conf
+-[ -f /usr/local/etc/wemux.conf ] && . /usr/local/etc/wemux.conf
 +# Load configuration options from %%PREFIX%%/etc/wemux.conf
 +[ -f %%PREFIX%%/etc/wemux.conf ] && . %%PREFIX%%/etc/wemux.conf
  
- # Sanitize session name, replace spaces and underscores with dashes.
+ # Sanitize server name, replace spaces and underscores with dashes.
  # Remove all non alpha-numeric characters, convert to lowercase.
+@@ -317,7 +317,7 @@
+ }
+ 
+ # Announce when user attaches/detaches from server.
+-# Can be disabled by changing announce_attach to false in /usr/local/etc/wemux.conf
++# Can be disabled by changing announce_attach to false in %%PREFIX%%/etc/wemux.conf
+ # The first argument specifies the mode the user is attaching in for the message
+ # All additional arguments get wrapped in the attach/detach messages.
+ announce_connection() {
+@@ -331,7 +331,7 @@
+ }
+ 
+ # Announces when a user joins/changes their server.
+-# Can be disabled by changing announce_server_change to false in /usr/local/etc/wemux.conf
++# Can be disabled by changing announce_server_change to false in %%PREFIX%%/etc/wemux.conf
+ # Change server name for server, or display server name if no argument is given.
+ change_server() {
+   if [ "$allow_server_change" == "true" ]; then
+@@ -373,7 +373,7 @@
+   echo "To check for a newer version visit: http://www.github.com/zolrath/wemux"
+ }
+ 
+-# Host mode, used when user is listed in the host_list array in /usr/local/etc/wemux.conf
++# Host mode, used when user is listed in the host_list array in %%PREFIX%%/etc/wemux.conf
+ host_mode() {
+   # Start the server if it doesn't exist, otherwise reattach.
+   start_server() {
+@@ -503,7 +503,7 @@
+       status_users)   status_users;;
+       display_users)  display_users;;
+       version|v)      display_version;;
+-      conf*|c)        $editor /usr/local/etc/wemux.conf;;
++      conf*|c)        $editor %%PREFIX%%/etc/wemux.conf;;
+       *)              if ! $wemux "$@"; then
+                         echo "To see a list of wemux commands enter 'wemux help'"
+                         exit 127
+@@ -512,7 +512,7 @@
+   fi
+ }
+ 
+-# Client Mode, used when user is NOT listed in the host_list in /usr/local/etc/wemux.conf
++# Client Mode, used when user is NOT listed in the host_list in %%PREFIX%%/etc/wemux.conf
+ client_mode() {
+   # Mirror mode, allows the user to view wemux server in read only mode.
+   mirror_mode() {