From 1c677ffb49f7cca2a306d5363f5a578c870b56d6 Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Tue, 15 Dec 2015 14:47:21 +0000
Subject: - Update to 2.3.4

PR:		205227
Submitted by:	Ports Fury
Approved by:	mat (mentor)
Differential Revision:	D4580
---
 x11-wm/jwm/Makefile                  | 9 +++++++--
 x11-wm/jwm/distinfo                  | 4 ++--
 x11-wm/jwm/files/patch-example.jwmrc | 2 +-
 x11-wm/jwm/pkg-plist                 | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index d7cad53bbb63..0ff7458995d1 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jwm
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://joewing.net/projects/jwm/releases/
 
@@ -20,7 +20,7 @@ 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
@@ -63,12 +63,17 @@ XRENDER_CONFIGURE_ENABLE=xrender
 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
diff --git a/x11-wm/jwm/distinfo b/x11-wm/jwm/distinfo
index da44b493f3a9..f32d7cee9918 100644
--- a/x11-wm/jwm/distinfo
+++ b/x11-wm/jwm/distinfo
@@ -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
diff --git a/x11-wm/jwm/files/patch-example.jwmrc b/x11-wm/jwm/files/patch-example.jwmrc
index 2ef712e6e7f9..68f47f15e63b 100644
--- a/x11-wm/jwm/files/patch-example.jwmrc
+++ b/x11-wm/jwm/files/patch-example.jwmrc
@@ -14,7 +14,7 @@
           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
diff --git a/x11-wm/jwm/pkg-plist b/x11-wm/jwm/pkg-plist
index f0fd2c77834a..2db664302bca 100644
--- a/x11-wm/jwm/pkg-plist
+++ b/x11-wm/jwm/pkg-plist
@@ -10,3 +10,5 @@ man/man1/jwm.1.gz
 %%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
-- 
cgit