[pkgsrc/trunk]: pkgsrc/wm/jwm Upgrade wm/jwm to 2.0.1, plus add fribidi and j...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/496adc9ddd29
branches:  trunk
changeset: 543419:496adc9ddd29
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Jun 17 00:00:30 2008 +0000

description:
Upgrade wm/jwm to 2.0.1, plus add fribidi and jpeg options (default on)
# JWM v2.0 <> 20070624

    * New look.
    * Background support on a per-desktop basis.
    * Veritcal/horizontal maximization support.
    * Added the ability to move windows with the pager.
    * Many bug fixes.

# JWM v2.0.1 <> 20070704

    * Fix a file descriptor leak when JPEG is enabled.
    * Give swallow windows time to map when restarting.

diffstat:

 wm/jwm/Makefile         |   6 +++---
 wm/jwm/distinfo         |   9 ++++-----
 wm/jwm/options.mk       |  16 +++++++++++-----
 wm/jwm/patches/patch-ab |  12 ------------
 4 files changed, 18 insertions(+), 25 deletions(-)

diffs (81 lines):

diff -r 0fe07da32235 -r 496adc9ddd29 wm/jwm/Makefile
--- a/wm/jwm/Makefile   Mon Jun 16 20:18:20 2008 +0000
+++ b/wm/jwm/Makefile   Tue Jun 17 00:00:30 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/01/17 02:21:09 obache Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/17 00:00:30 abs Exp $
 #
 
-DISTNAME=              jwm-1.8
+DISTNAME=              jwm-2.0.1
 CATEGORIES=            wm x11
-MASTER_SITES=          http://www.joewing.net/programs/jwm/ \
+MASTER_SITES=          http://www.joewing.net/programs/jwm/releases/ \
                        ${MASTER_SITE_SOURCEFORGE:=jwm/}
 EXTRACT_SUFX=          .tar.bz2
 
diff -r 0fe07da32235 -r 496adc9ddd29 wm/jwm/distinfo
--- a/wm/jwm/distinfo   Mon Jun 16 20:18:20 2008 +0000
+++ b/wm/jwm/distinfo   Tue Jun 17 00:00:30 2008 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/01/05 16:56:54 abs Exp $
+$NetBSD: distinfo,v 1.4 2008/06/17 00:00:30 abs Exp $
 
-SHA1 (jwm-1.8.tar.bz2) = 71852287b1478d24ee6bb08afcbbf45b74709fa5
-RMD160 (jwm-1.8.tar.bz2) = baef433c7f6ec9c8e9dafdd8fcc3d8c19790030e
-Size (jwm-1.8.tar.bz2) = 145922 bytes
+SHA1 (jwm-2.0.1.tar.bz2) = 209bc5e8c41f6a827d38a9b365405a2dc9bef082
+RMD160 (jwm-2.0.1.tar.bz2) = 84d16886056e77abd65717852df1530cebb6817b
+Size (jwm-2.0.1.tar.bz2) = 248607 bytes
 SHA1 (patch-aa) = ac33481d7e4d081960977a05f87c698865d19c63
-SHA1 (patch-ab) = 37dde771f21eb0ae63af01ecd53f2f201dd1c6fc
diff -r 0fe07da32235 -r 496adc9ddd29 wm/jwm/options.mk
--- a/wm/jwm/options.mk Mon Jun 16 20:18:20 2008 +0000
+++ b/wm/jwm/options.mk Tue Jun 17 00:00:30 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:18 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2008/06/17 00:00:30 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.jwm
-PKG_SUPPORTED_OPTIONS= debug png
-PKG_SUGGESTED_OPTIONS= png
+PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png
+PKG_SUGGESTED_OPTIONS= fribidi jpeg png
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,10 +10,16 @@
 CONFIGURE_ARGS+=       --enable-debug
 .endif
 
+.if !empty(PKG_OPTIONS:Mfribidi)
+.include "../../converters/fribidi/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mjpeg)
+.include "../../graphics/jpeg/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mpng)
 .include "../../graphics/png/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-png
 .endif
-
-# TODO: fribidi
diff -r 0fe07da32235 -r 496adc9ddd29 wm/jwm/patches/patch-ab
--- a/wm/jwm/patches/patch-ab   Mon Jun 16 20:18:20 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/08/04 01:08:21 reed Exp $
-
---- jwm.1.in.orig      2005-09-23 03:48:27.000000000 +0200
-+++ jwm.1.in
-@@ -1,7 +1,6 @@
- ./"
- ./" groff -man -Tascii jwm.1
- ./"
--
- .TH jwm 1 "@DATE@" "v@VERSION@"
- .SH NAME
- JWM - Joe's Window Manager