merge with newest weechat from ports