Index: head/x11-wm/jwm/Makefile
===================================================================
--- head/x11-wm/jwm/Makefile	(revision 403780)
+++ head/x11-wm/jwm/Makefile	(revision 403781)
@@ -1,76 +1,81 @@
 # Created by: Babak Farrokhi <babak@farrokhi.net>
 # $FreeBSD$
 
 PORTNAME=	jwm
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://joewing.net/projects/jwm/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Joe's Window Manager
 
 LICENSE=	GPLv2
 
 USES=		iconv pkgconfig tar:xz
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		CAIRO DEBUG FRIBIDI JPEG NLS PNG SVG XEXT XFT \
 			XINERAMA XMU XPM XRENDER
-OPTIONS_DEFAULT=	JPEG NLS PNG FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER
+OPTIONS_DEFAULT=	FRIBIDI JPEG PNG XEXT XFT XINERAMA XMU XPM XRENDER
 OPTIONS_SUB=		yes
 
 CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_ENABLE=	cairo
 DEBUG_CONFIGURE_ENABLE=	debug
 FRIBIDI_DESC=		Unicode Bidirectional Algorithm support
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=fribidi
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 PNG_CONFIGURE_ENABLE=	png
 SVG_USE=		GNOME=librsvg2
 SVG_CONFIGURE_ENABLE=	rsvg
 XEXT_DESC=		X11 Shape Extension support
 XEXT_USE=		XORG=xext
 XEXT_CONFIGURE_ENABLE=	shape
 XFT_USE=		XORG=xft
 XFT_CONFIGURE_ENABLE=	xft
 XFT_IMPLIES=		XRENDER
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_ENABLE=xinerama
 XINERAMA_IMPLIES=	XEXT
 XMU_DESC=		X11 Miscellaneous Utilities support
 XMU_USE=		XORG=xmu
 XMU_CONFIGURE_ENABLE=	xmu
 XMU_IMPLIES=		XEXT
 XPM_USE=		XORG=xpm
 XPM_CONFIGURE_ENABLE=	xpm
 XPM_IMPLIES=		XEXT
 XRENDER_DESC=		X11 Render Extension support
 XRENDER_USE=		XORG=xrender
 XRENDER_CONFIGURE_ENABLE=xrender
 
 .include <bsd.port.pre.mk>
 
 .if !empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes
 .endif
 
+post-extract:
+	@${LN} -sf pt-br.po ${WRKSRC}/po/pt_BR.po
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc
 	@${REINPLACE_CMD} -e \
 		's|install -m 644|@INSTALL_DATA@| ; \
 		 s|jwmrc$$|jwmrc.sample|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|pt-br|pt_BR|' ${WRKSRC}/po/LINGUAS
 	@${REINPLACE_CMD} -e \
 		'/EXE/s|install|@INSTALL_PROGRAM@| ; \
 		 /strip/s|^|#|' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.post.mk>
Index: head/x11-wm/jwm/distinfo
===================================================================
--- head/x11-wm/jwm/distinfo	(revision 403780)
+++ head/x11-wm/jwm/distinfo	(revision 403781)
@@ -1,2 +1,2 @@
-SHA256 (jwm-2.3.2.tar.xz) = 92a3e66ceb847aac9fa09a24b16c93194f6c52e398f5a88f228b4986ea972c53
-SIZE (jwm-2.3.2.tar.xz) = 325648
+SHA256 (jwm-2.3.4.tar.xz) = 249867d2e21fab27f69d4f64b5c8acba5ddc540030e31e450c20ed4b647a06ee
+SIZE (jwm-2.3.4.tar.xz) = 332140
Index: head/x11-wm/jwm/files/patch-example.jwmrc
===================================================================
--- head/x11-wm/jwm/files/patch-example.jwmrc	(revision 403780)
+++ head/x11-wm/jwm/files/patch-example.jwmrc	(revision 403781)
@@ -1,24 +1,24 @@
 --- example.jwmrc.orig	2015-09-13 18:02:54 UTC
 +++ example.jwmrc
 @@ -3,7 +3,8 @@
  
      <!-- The root menu. -->
      <RootMenu onroot="12">
 -        <Program icon="terminal.png" label="Terminal">xterm</Program>
 +        <Program icon="rxvt.png" label="Terminal">rxvt</Program>
 +        <Program icon="xterm.png" label="Terminal">xterm</Program>
          <Menu icon="folder.png" label="Applications">
              <Program icon="music.png" label="Audacious">audacious</Program>
              <Program icon="calculator.png" label="Calculator">xcalc</Program>
 @@ -111,7 +112,10 @@
           for icons in multiple paths.
        -->
      <IconPath>
--        /usr/share/icons/wm-icons/32x32-gant
+-        /usr/share/icons/wm-icons/32x32-aquafusion
 +        $HOME/.icons
 +        %%PREFIX%%/share/icons
 +        %%PREFIX%%/share/pixmaps
 +        %%PREFIX%%/lib/X11/icons
      </IconPath>
  
      <!-- Virtual Desktops -->
Index: head/x11-wm/jwm/pkg-plist
===================================================================
--- head/x11-wm/jwm/pkg-plist	(revision 403780)
+++ head/x11-wm/jwm/pkg-plist	(revision 403781)
@@ -1,12 +1,14 @@
 bin/jwm
 man/man1/jwm.1.gz
 @sample etc/system.jwmrc.sample
 %%NLS%%share/locale/de/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/es/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/jwm.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/jwm.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/jwm.mo