- Update to version 2.3.2

- Use option helpers for options dependencies

PR:		203247
Submitted by:	tkato432@yahoo.com

5 files changed, 14 insertions, 23 deletions

diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 5a9ebaa1893f..d7cad53bbb63 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jwm
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://joewing.net/programs/jwm/releases/
+MASTER_SITES=	http://joewing.net/projects/jwm/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Joe's Window Manager
@@ -42,31 +42,21 @@ 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.options.mk>
-
-.if ${PORT_OPTIONS:MXFT} && empty(PORT_OPTIONS:MXRENDER)
-IGNORE=		the XFT support requires XRENDER
-.endif
-
-.if ${PORT_OPTIONS:MXMU} && empty(PORT_OPTIONS:MXEXT)
-IGNORE=		the XMU support requires XEXT
-.endif
-
-.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MXEXT)
-IGNORE=		the XPM support requires XEXT
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if !empty(ICONV_LIB)
diff --git a/x11-wm/jwm/distinfo b/x11-wm/jwm/distinfo
index cafa8e0192b1..da44b493f3a9 100644
--- a/x11-wm/jwm/distinfo
+++ b/x11-wm/jwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jwm-2.3.1.tar.xz) = 869ff5099841d8a2aba1539a82c670fe4082efc87ddb12bbd409f566cc50e953
-SIZE (jwm-2.3.1.tar.xz) = 305736
+SHA256 (jwm-2.3.2.tar.xz) = 92a3e66ceb847aac9fa09a24b16c93194f6c52e398f5a88f228b4986ea972c53
+SIZE (jwm-2.3.2.tar.xz) = 325648
diff --git a/x11-wm/jwm/files/patch-example.jwmrc b/x11-wm/jwm/files/patch-example.jwmrc
index 6d3d1439df53..2ef712e6e7f9 100644
--- a/x11-wm/jwm/files/patch-example.jwmrc
+++ b/x11-wm/jwm/files/patch-example.jwmrc
@@ -1,6 +1,6 @@
---- example.jwmrc.orig
+--- example.jwmrc.orig	2015-09-13 18:02:54 UTC
 +++ example.jwmrc
-@@ -4,7 +4,8 @@
+@@ -3,7 +3,8 @@
  
      <!-- The root menu. -->
      <RootMenu onroot="12">
@@ -10,7 +10,7 @@
          <Menu icon="folder.png" label="Applications">
              <Program icon="music.png" label="Audacious">audacious</Program>
              <Program icon="calculator.png" label="Calculator">xcalc</Program>
-@@ -120,7 +121,10 @@
+@@ -111,7 +112,10 @@
           for icons in multiple paths.
        -->
      <IconPath>
diff --git a/x11-wm/jwm/pkg-descr b/x11-wm/jwm/pkg-descr
index ee10476739f5..a78b3931d4ab 100644
--- a/x11-wm/jwm/pkg-descr
+++ b/x11-wm/jwm/pkg-descr
@@ -3,4 +3,4 @@ and uses only Xlib at a minimum, though additional libraries are
 supported for extended functionality and features. JWM supports MWM and
 Extended Window Manager Hints (EWMH).
 
-WWW: http://joewing.net/programs/jwm/
+WWW: http://joewing.net/projects/jwm/
diff --git a/x11-wm/jwm/pkg-plist b/x11-wm/jwm/pkg-plist
index c370b672449e..f0fd2c77834a 100644
--- a/x11-wm/jwm/pkg-plist
+++ b/x11-wm/jwm/pkg-plist
@@ -4,8 +4,9 @@ man/man1/jwm.1.gz
 %%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-PT/LC_MESSAGES/jwm.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/jwm.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/jwm.mo