From 3d2b45f4bb7564caa959f353f189a06a87ae5876 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Tue, 17 Jun 2008 00:00:30 +0000
Subject: 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.
---
 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(-)
 delete mode 100644 wm/jwm/patches/patch-ab

(limited to 'wm/jwm')

diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index 17404fda776..137a85824d8 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -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 --git a/wm/jwm/distinfo b/wm/jwm/distinfo
index 7051a76e08a..1882abfcad4 100644
--- a/wm/jwm/distinfo
+++ b/wm/jwm/distinfo
@@ -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 --git a/wm/jwm/options.mk b/wm/jwm/options.mk
index a01beda043e..3407d3cbcd9 100644
--- a/wm/jwm/options.mk
+++ b/wm/jwm/options.mk
@@ -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 @@ PKG_SUGGESTED_OPTIONS=	png
 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 --git a/wm/jwm/patches/patch-ab b/wm/jwm/patches/patch-ab
deleted file mode 100644
index ab5091198a7..00000000000
--- a/wm/jwm/patches/patch-ab
+++ /dev/null
@@ -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
-- 
cgit v1.2.3