From 16df7a20086c42f229badc4cb86158bbadb245ba Mon Sep 17 00:00:00 2001 From: lebel Date: Mon, 22 Apr 2002 14:40:09 +0000 Subject: [PATCH] update x11/wmtheme to 1.3.2 --- x11/wmtheme/Makefile | 4 ++-- x11/wmtheme/distinfo | 6 +++--- x11/wmtheme/patches/patch-wmtheme | 16 ++++++++-------- x11/wmtheme/pkg/PLIST | 4 +--- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/x11/wmtheme/Makefile b/x11/wmtheme/Makefile index 6941796b3b9..3bb21dccc24 100644 --- a/x11/wmtheme/Makefile +++ b/x11/wmtheme/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2002/03/21 21:25:56 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/04/22 14:40:09 lebel Exp $ COMMENT= "window manager theme utility" -DISTNAME= wmtheme-1.3 +DISTNAME= wmtheme-1.3.2 CATEGORIES= x11 NEED_VERSION= 1.515 diff --git a/x11/wmtheme/distinfo b/x11/wmtheme/distinfo index 3d625a8e7da..f74f04d83bf 100644 --- a/x11/wmtheme/distinfo +++ b/x11/wmtheme/distinfo @@ -1,3 +1,3 @@ -MD5 (wmtheme-1.3.tar.gz) = 669967f7f1239e00d2e32dc853dcfc27 -RMD160 (wmtheme-1.3.tar.gz) = 32b3291dbe58a98393777691c43dee7887ea997b -SHA1 (wmtheme-1.3.tar.gz) = a4fd61526ac0a51c47453c86b36a985c4aeeab09 +MD5 (wmtheme-1.3.2.tar.gz) = b2ee65eb741fcc9318c0e181dd7fd68c +RMD160 (wmtheme-1.3.2.tar.gz) = 07d995837a3e756fa77734308a8df3898bdc514b +SHA1 (wmtheme-1.3.2.tar.gz) = 49cfd05bb57f9681698b24716a2ed063dbd7d33d diff --git a/x11/wmtheme/patches/patch-wmtheme b/x11/wmtheme/patches/patch-wmtheme index e29191c34b6..01e2ea3f8bc 100644 --- a/x11/wmtheme/patches/patch-wmtheme +++ b/x11/wmtheme/patches/patch-wmtheme @@ -1,7 +1,7 @@ -$OpenBSD: patch-wmtheme,v 1.2 2001/09/09 01:12:21 lebel Exp $ ---- wmtheme.orig Thu Sep 6 19:40:05 2001 -+++ wmtheme Sat Sep 8 21:04:15 2001 -@@ -1396,7 +1396,7 @@ sub screensize { +$OpenBSD: patch-wmtheme,v 1.3 2002/04/22 14:40:09 lebel Exp $ +--- wmtheme.orig Sat Dec 8 23:11:28 2001 ++++ wmtheme Mon Apr 22 10:36:42 2002 +@@ -1361,7 +1361,7 @@ sub screensize { my ($rows, $cols); $rows = ($sttyout =~ /\brows (\d+)/ and $1 > 4) ? $1 : 24; @@ -10,11 +10,11 @@ $OpenBSD: patch-wmtheme,v 1.2 2001/09/09 01:12:21 lebel Exp $ ($rows, $cols); } -@@ -1585,7 +1585,7 @@ sub getfiletypes { - $cleanups{getfiletypes} = $file_input; +@@ -1531,7 +1531,7 @@ sub getfiletypes { + # filename and a colon, and is padded with spaces such that the result + # always begins at the same column. - stowfile($file_input, join("\n", @files) . "\n"); -- my @types = split(/\n/, forktick("file -b -f \Q$file_input\E")); +- my @types = split(/\n/, forktick("file -f \Q$file_input\E")); + my @types = split(/\n/, forktick("file -f \Q$file_input\E | sed -e \Qs;^[^:]*: *;;g\E")); unlink $file_input or choke("can't remove temporary file $file_input: $!"); diff --git a/x11/wmtheme/pkg/PLIST b/x11/wmtheme/pkg/PLIST index 5ec0930ada4..9fddee95e7c 100644 --- a/x11/wmtheme/pkg/PLIST +++ b/x11/wmtheme/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2001/10/24 13:48:11 lebel Exp $ +@comment $OpenBSD: PLIST,v 1.3 2002/04/22 14:40:09 lebel Exp $ bin/apply-gtk-theme bin/astheme bin/bbtheme @@ -22,9 +22,7 @@ lib/wmtheme/oroborus.pl lib/wmtheme/sawfish.pl lib/wmtheme/wm_config.pl lib/wmtheme/wm_data.pl -lib/wmtheme/wm_download.pl lib/wmtheme/wm_fonts.pl -lib/wmtheme/wm_update.pl lib/wmtheme/wmaker.pl lib/wmtheme/xmms.pl man/man1/astheme.1.gz