From 3e8ac8d07f7a5aeaab1e43aefedb52de4e929362 Mon Sep 17 00:00:00 2001 From: salo Date: Fri, 2 Jun 2006 11:21:28 +0000 Subject: Updated to 20060517 snapshot. Changes: - add my theme file, - delint. 20060517: - Applied a crash patch to thing.c by Ben Stern. --- wm/pwm/Makefile | 13 ++++++++----- wm/pwm/PLIST | 3 ++- wm/pwm/distinfo | 10 +++++----- wm/pwm/files/look-cdelike.conf | 42 ++++++++++++++++++++++++++++++++++++++++++ wm/pwm/patches/patch-ag | 17 ++++++++--------- 5 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 wm/pwm/files/look-cdelike.conf (limited to 'wm/pwm') diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index 5073d8f8052..72ffc3f767a 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2006/03/31 00:29:16 salo Exp $ +# $NetBSD: Makefile,v 1.26 2006/06/02 11:21:28 salo Exp $ # -DISTNAME= pwm-20030617 +DISTNAME= pwm-20060517 PKGNAME= ${DISTNAME:S/-/-1.0./} -PKGREVISION= 2 CATEGORIES= wm x11 MASTER_SITES= http://modeemi.fi/~tuomov/pwm/dl/ @@ -29,9 +28,13 @@ CONFS+= keys-default.conf CONFS+= menus-default.conf CONFS+= look-beoslike.conf CONFS+= look-brownsteel.conf -.for FILE in ${CONFS} -CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} +CONFS+= look-cdelike.conf +.for f in ${CONFS} +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor +post-install: + ${INSTALL_DATA} ${FILESDIR}/look-cdelike.conf ${EGDIR} + .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pwm/PLIST b/wm/pwm/PLIST index 8ccc7e9c15e..c8949d073c2 100644 --- a/wm/pwm/PLIST +++ b/wm/pwm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/08/22 11:48:35 salo Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/06/02 11:21:28 salo Exp $ bin/pwm man/man1/pwm.1 share/doc/pwm/LICENSE @@ -7,6 +7,7 @@ share/examples/pwm/buttons-default.conf share/examples/pwm/keys-default.conf share/examples/pwm/look-beoslike.conf share/examples/pwm/look-brownsteel.conf +share/examples/pwm/look-cdelike.conf share/examples/pwm/menus-default.conf share/examples/pwm/pwm.conf.default @dirrm share/examples/pwm diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo index 6f7b72c4a31..2b182d3b802 100644 --- a/wm/pwm/distinfo +++ b/wm/pwm/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2005/02/23 18:43:55 wiz Exp $ +$NetBSD: distinfo,v 1.17 2006/06/02 11:21:28 salo Exp $ -SHA1 (pwm-20030617.tar.gz) = 89e6e862746a65ad9a482ac22a1cfa4771736902 -RMD160 (pwm-20030617.tar.gz) = 841c0971b2d36b7921b5da60ee7563e669a419fa -Size (pwm-20030617.tar.gz) = 152149 bytes +SHA1 (pwm-20060517.tar.gz) = d69dd232e07c20a053d1eec92355ee5134a422b3 +RMD160 (pwm-20060517.tar.gz) = a2df30c1a4b68b569b5c9e3ec3a8c4ff003714ab +Size (pwm-20060517.tar.gz) = 153106 bytes SHA1 (patch-aa) = 7566f850cc680017c388269316d7dec1296e1684 SHA1 (patch-ac) = 793f1348e45a6ee3e21b5fa5ff02b00d1dd48ef1 SHA1 (patch-af) = 1f302ae3b78c436bd5170dea55e77e8e00f789d0 -SHA1 (patch-ag) = b920b78cfc4cc460a5d23e1d446fe296a15ab670 +SHA1 (patch-ag) = ed5df2ddc4b4061c66f7599ac1f787a5d78dd778 SHA1 (patch-ah) = 146a957d385cfc70322ffd2c2ddf10238e2960bc diff --git a/wm/pwm/files/look-cdelike.conf b/wm/pwm/files/look-cdelike.conf new file mode 100644 index 00000000000..a8cfc83af92 --- /dev/null +++ b/wm/pwm/files/look-cdelike.conf @@ -0,0 +1,42 @@ +# $NetBSD: look-cdelike.conf,v 1.1 2006/06/02 11:21:29 salo Exp $ +# +# (Solaris) CDE-like color scheme for PWM +# + +font "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*" +menu_font "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*" + +# border width, bevel width +border_w 4, 1 + +# bar min width, bar max width q, tab min width +bar_w 150, 0.95, 150 + +# Used colors: +# +# #adb5c6 (173 / 181 / 198) - base grey +# #b54a7b (181 / 74 / 123) - base selected violet +# #9494a5 (148 / 148 / 165) - base unselected grey +# +# #dedee7 (222 / 222 / 231) - light outline grey +# #5a636b ( 90 / 99 / 107) - dark outline grey +# #deadc6 (222 / 173 / 198) - light selected violet +# #522139 ( 82 / 33 / 57) - dark selected violet +# +# #000000 - black +# #ffffff - white +# +# Recommended: +# +# xsetroot -solid \#666677 +# +# highlight, shadow, background, foreground +act_tab_colors "#dedee7", "#5a636b", "#adb5c6", "#000000" +act_tab_sel_colors "#deadc6", "#522139", "#b54a7b", "#ffffff" +act_base_colors "#dedee7", "#5a636b", "#adb5c6", "#000000" +act_sel_colors "#b54a7b", "#b54a7b", "#b54a7b", "#ffffff" + +tab_colors "#dedee7", "#5a636b", "#adb5c6", "#000000" +tab_sel_colors "#dedee7", "#5a636b", "#9494a5", "#000000" +base_colors "#dedee7", "#5a636b", "#adb5c6", "#000000" +sel_colors "#b54a7b", "#b54a7b", "#b54a7b", "#ffffff" diff --git a/wm/pwm/patches/patch-ag b/wm/pwm/patches/patch-ag index f95fee48c94..c74de999a49 100644 --- a/wm/pwm/patches/patch-ag +++ b/wm/pwm/patches/patch-ag @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ +$NetBSD: patch-ag,v 1.7 2006/06/02 11:21:29 salo Exp $ ---- system.mk.orig Thu Dec 28 15:08:05 2000 -+++ system.mk Thu Jul 10 21:30:50 2003 +--- system.mk.orig 2006-05-17 08:50:33.000000000 +0200 ++++ system.mk 2006-06-02 12:55:38.000000000 +0200 @@ -7,13 +7,13 @@ ## Installation paths ## @@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ # Not used INCDIR=$(PREFIX)/include LIBDIR=$(PREFIX)/lib -@@ -23,7 +23,7 @@ +@@ -23,7 +23,7 @@ LIBDIR=$(PREFIX)/lib ## X libraries, includes and options ## @@ -28,7 +28,7 @@ $NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ X11_DEFINES= ## C compiler ## @@ -37,7 +37,7 @@ $NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary, # they're mainly for development use. So, if they cause trouble (not -@@ -49,7 +49,7 @@ +@@ -49,26 +49,26 @@ CC=gcc # libtu/ uses POSIX_SOURCE @@ -46,7 +46,6 @@ $NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ # and . (ion) XOPEN_SOURCE. # There is variation among systems what should be used and how they interpret -@@ -56,19 +56,19 @@ # it so it is perhaps better not using anything at all. # Most systems @@ -60,8 +59,8 @@ $NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ -WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ +#WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ -Wtrigraphs -Wformat -Wchar-subscripts \ - -Wparentheses -pedantic-errors -Wuninitialized - + -Wparentheses -Wuninitialized + # -pedantic-errors -CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -LDFLAGS=-g $(LIBS) $(EXTRA_LIBS) -- cgit v1.2.3