From 7a3e0b913ec8e694bfc53c44d4662b4c11ca3ad6 Mon Sep 17 00:00:00 2001 From: tonio Date: Sat, 8 Apr 2006 15:41:20 +0000 Subject: Update wm/fluxbox to 0.9.15.1 Remove patch-a{b,d} as they are already applied upstream Main changelog entries: in 0.9.15.1: - Removed the green background on styles that are not using the new background option. - Bug fixes (compile errors, crash and placement config) in 0.9.15: * Added styleOverlay resource - session.styleOverlay: ~/.fluxbox/overlay * New theme item: background.* * Added new resize mode: Center * Resources changes for titlebar: - The titlebar is now configured by setting: * session.screen.titlebar.left * session.screen.titlebar.right * nls changes: added ko_KR, updated zh_CN, nb_NO * Many bug fixes --- wm/fluxbox/Makefile | 11 +++++++---- wm/fluxbox/PLIST | 8 +++++++- wm/fluxbox/distinfo | 10 ++++------ wm/fluxbox/patches/patch-ab | 12 ------------ wm/fluxbox/patches/patch-ad | 15 --------------- 5 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 wm/fluxbox/patches/patch-ab delete mode 100644 wm/fluxbox/patches/patch-ad (limited to 'wm') diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index 7f48c8158e2..0440209b2e7 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2006/04/08 15:41:20 tonio Exp $ # -DISTNAME= fluxbox-0.9.14 -PKGREVISION= 4 +DISTNAME= fluxbox-0.9.15.1 CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} EXTRACT_SUFX= .tar.bz2 @@ -30,7 +29,11 @@ SUBST_CLASSES+= cmds SUBST_STAGE.cmds= post-build SUBST_MESSAGE.cmds= "Fixing command names in data files." SUBST_SED.cmds= -e 's|bsetroot|fbsetroot|g' -SUBST_FILES.cmds= data/*/* +SUBST_FILES.cmds= data/README.style data/styles/Artwiz\ + data/styles/MerleyKay data/styles/Outcomes\ + data/styles/Rampage data/styles/Results\ + data/styles/Spiff + .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST index fe5e16321a1..295b1233c38 100644 --- a/wm/fluxbox/PLIST +++ b/wm/fluxbox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2005/09/27 12:49:04 tonio Exp $ +@comment $NetBSD: PLIST,v 1.12 2006/04/08 15:41:21 tonio Exp $ bin/fbrun bin/fbsetbg bin/fbsetroot @@ -28,7 +28,9 @@ share/fluxbox/nls/it_IT/fluxbox.cat share/fluxbox/nls/ja_JP/fluxbox.cat share/fluxbox/nls/ko_KR/fluxbox.cat share/fluxbox/nls/lv_LV/fluxbox.cat +share/fluxbox/nls/nb_NO/fluxbox.cat share/fluxbox/nls/nl_NL/fluxbox.cat +share/fluxbox/nls/no_NO/fluxbox.cat share/fluxbox/nls/pl_PL/fluxbox.cat share/fluxbox/nls/pt_BR/fluxbox.cat share/fluxbox/nls/pt_PT/fluxbox.cat @@ -38,6 +40,7 @@ share/fluxbox/nls/sv_SE/fluxbox.cat share/fluxbox/nls/tr_TR/fluxbox.cat share/fluxbox/nls/uk_UA/fluxbox.cat share/fluxbox/nls/vi_VN/fluxbox.cat +share/fluxbox/nls/zh_CN/fluxbox.cat share/fluxbox/styles/Artwiz share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm @@ -104,6 +107,7 @@ share/fluxbox/styles/qnx-photon @dirrm share/fluxbox/styles/BlueFlux/pixmaps @dirrm share/fluxbox/styles/BlueFlux @dirrm share/fluxbox/styles +@dirrm share/fluxbox/nls/zh_CN @dirrm share/fluxbox/nls/vi_VN @dirrm share/fluxbox/nls/uk_UA @dirrm share/fluxbox/nls/tr_TR @@ -113,7 +117,9 @@ share/fluxbox/styles/qnx-photon @dirrm share/fluxbox/nls/pt_PT @dirrm share/fluxbox/nls/pt_BR @dirrm share/fluxbox/nls/pl_PL +@dirrm share/fluxbox/nls/no_NO @dirrm share/fluxbox/nls/nl_NL +@dirrm share/fluxbox/nls/nb_NO @dirrm share/fluxbox/nls/lv_LV @dirrm share/fluxbox/nls/ko_KR @dirrm share/fluxbox/nls/ja_JP diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index 0bc603019cf..6815dbb2948 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.20 2005/10/20 19:01:10 tonio Exp $ +$NetBSD: distinfo,v 1.21 2006/04/08 15:41:21 tonio Exp $ -SHA1 (fluxbox-0.9.14.tar.bz2) = 6e9d6d42631bb92b2fcfa1b74476b4383af91c3b -RMD160 (fluxbox-0.9.14.tar.bz2) = 17cb299115164303972988471526a57bf0eeebde -Size (fluxbox-0.9.14.tar.bz2) = 671916 bytes +SHA1 (fluxbox-0.9.15.1.tar.bz2) = 94652432037203f1619ba8ed657339fb85b3c894 +RMD160 (fluxbox-0.9.15.1.tar.bz2) = aa9418de9ff700c14b21911f6de24503449e7f0f +Size (fluxbox-0.9.15.1.tar.bz2) = 685740 bytes SHA1 (patch-aa) = e93ce1d4100fe3899ff226fbf6d99fb2526babf4 -SHA1 (patch-ab) = 189f9d2b5bedd617c5ed2672fcb4d057f1a507bc SHA1 (patch-ac) = f180c8cc2878f73ca14fa48aea73e04ff599004b -SHA1 (patch-ad) = 8fe91a52ce87f3f35f986ad8afb136c5cfd660d5 SHA1 (patch-af) = 2e20d43536b348dc72696110d41d85a69f2f19c9 diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab deleted file mode 100644 index 205c77c59c7..00000000000 --- a/wm/fluxbox/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2005/10/20 19:01:11 tonio Exp $ - ---- nls/be_BY/Translation.m.orig 2005-08-31 22:06:09.000000000 +0200 -+++ nls/be_BY/Translation.m -@@ -203,7 +203,6 @@ $set 16 #Windowmenu - 9 Ïðûëÿï³öü - 10 Çàá³öü - --x - $set 17 #Workspace - - 1 Ïðàöî¢íàå ìåñöà %d diff --git a/wm/fluxbox/patches/patch-ad b/wm/fluxbox/patches/patch-ad deleted file mode 100644 index 5f6ed7375be..00000000000 --- a/wm/fluxbox/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2005/09/27 12:49:04 tonio Exp $ - ---- util/startfluxbox.in.orig 2005-07-20 13:01:49.000000000 +0200 -+++ util/startfluxbox.in -@@ -29,7 +29,9 @@ elif [ -r "$startup" ]; then - exec sh "$startup" - else - if [ ! -d ~/.fluxbox ]; then -- mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps} -+ mkdir -p ~/.fluxbox/backgrounds -+ mkdir -p ~/.fluxbox/styles -+ mkdir -p ~/.fluxbox/pixmaps - fi - if [ ! -r "$startup" ]; then - ( cat << EOF -- cgit v1.2.3