From 4e0b174c35dcc43d13392ef8a62ecf39d5240323 Mon Sep 17 00:00:00 2001 From: salo Date: Sun, 1 Jun 2003 16:16:59 +0000 Subject: Updated to 20030528 snapshot. Thanks to Jon Olsson for notification. Changes: - take over maintainership - whitespace - DESCR has 80 columns - simplify 1.0.20030528: ============= - License model changed to Artistic/GPL dual license. - Fixed lockup when a window's title ends in its only colon (and spaces) but even just the three dots and instance number are too long to fit in the tab. - Applied an (old) tab_switch_and_raise patch. - Some #includes added. - Phantom-window fix. - Allow windows to move themselves - Phantom dockapp fix - "dock" configuration option changes: "hidden" option, direction 1/0 replaced with "vertical" option. - Added 'gotodir' function (move to frame in given direction). - Makefile/path setting changes - Built-in 'ws_menu' and 'movetows_menu'. - Added keybindings to the man page. - Added 'PWM manual' entry in the default root menu. - Don't kill client on close if it does not support WM_DELETE_WINDOW. - Titles were not drawn correctly when toggling decorations on if a window was closed when the associated frame was in undecorated state. - Don't change active window visual indication when displaying a 'contextual menu'. - Added 'goto_previous'. - Windows with same name are numbered now - Added pack_move - Changed the order to which window in a frame to go when the current is destroyed - Added "detach" function - Added attach/detach to window menu - Added WM_COLORMAP_WINDOWS support --- wm/pwm/DESCR | 28 ++++++++-------- wm/pwm/Makefile | 19 +++++------ wm/pwm/PLIST | 4 +-- wm/pwm/distinfo | 19 +++++------ wm/pwm/patches/patch-aa | 85 +++++++++++++++++++++++-------------------------- wm/pwm/patches/patch-ab | 12 ------- wm/pwm/patches/patch-ac | 8 ++--- wm/pwm/patches/patch-ad | 13 -------- wm/pwm/patches/patch-ae | 13 -------- wm/pwm/patches/patch-af | 31 +++++++++++++++--- wm/pwm/patches/patch-ag | 36 +++++++++++++-------- wm/pwm/patches/patch-ah | 20 ++++-------- 12 files changed, 131 insertions(+), 157 deletions(-) delete mode 100644 wm/pwm/patches/patch-ab delete mode 100644 wm/pwm/patches/patch-ad delete mode 100644 wm/pwm/patches/patch-ae (limited to 'wm') diff --git a/wm/pwm/DESCR b/wm/pwm/DESCR index c8b71268ee6..a9bf7495753 100644 --- a/wm/pwm/DESCR +++ b/wm/pwm/DESCR @@ -1,17 +1,15 @@ -PWM is a rather lightweight window manager. It has the unique feature -that multiple client windows can be attached to the same frame. This -feature helps keep windows, especially the numerous xterms, organized. +PWM is a rather lightweight window manager. It has the unique feature that +multiple client windows can be attached to the same frame. This feature helps +keep windows, especially the numerous xterms, organized. -Being a lightweight window manager with emphasis on usability, PWM -does not have all the features that one might expect from a window -manager. Those features are simply unnecessary. PWM does not provide -pixmapped themes or other bloated eye candies but has a clean and -simple look inspired by BeOS and Motif. There are no icons and frames -cannot be iconified, only "shaded". Only one pointer focus mode is -supported: sloppy. PWM does not even have titlebar buttons and may -not be the easiest window manager to get into; most good things are -not. +Being a lightweight window manager with emphasis on usability, PWM does not +have all the features that one might expect from a window manager. Those +features are simply unnecessary. PWM does not provide pixmapped themes or +other bloated eye candies but has a clean and simple look inspired by BeOS +and Motif. There are no icons and frames cannot be iconified, only "shaded". +Only one pointer focus mode is supported: sloppy. PWM does not even have +titlebar buttons and may not be the easiest window manager to get into; most +good things are not. -PWM has workspaces, menus and Window Maker dockapp support. It has -pretty good keyboard support and almost all of the functionality is -configurable. +PWM has workspaces, menus and Window Maker dockapp support. It has pretty +good keyboard support and almost all of the functionality is configurable. diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index 21c1594dee4..283c4dd2b48 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:23 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2003/06/01 16:16:59 salo Exp $ # -DISTNAME= pwm-1.0 +DISTNAME= pwm-20030528 +PKGNAME= ${DISTNAME:S/-/-1.0./} CATEGORIES= wm x11 -MASTER_SITES= http://www.students.tut.fi/~tuomov/dl/ +MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/dl/ -MAINTAINER= packages@netbsd.org +MAINTAINER= salo@netbsd.org HOMEPAGE= http://www.students.tut.fi/~tuomov/pwm/ COMMENT= Window manager that frames multiple client windows in a single frame @@ -13,11 +14,14 @@ USE_BUILDLINK2= YES USE_PKGINSTALL= YES USE_X11= YES USE_GMAKE= YES -MAKE_ENV+= SYSCONFDIR="${PKG_SYSCONFDIR}" + +CFLAGS+= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\" PKG_SYSCONFSUBDIR= pwm + EGDIR= ${PREFIX}/share/examples/pwm -CONF_FILES= ${EGDIR}/pwm.conf ${PKG_SYSCONFDIR}/pwm.conf +CONF_FILES= ${EGDIR}/pwm.conf.default ${PKG_SYSCONFDIR}/pwm.conf + SUPPS= buttons-default.conf SUPPS+= keys-default.conf SUPPS+= menus-default.conf @@ -28,7 +32,4 @@ SUPPORT_FILES= # empty SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor -post-install: - ${RM} -f ${EGDIR}/sample.conf - .include "../../mk/bsd.pkg.mk" diff --git a/wm/pwm/PLIST b/wm/pwm/PLIST index 95735c707be..f489e98560f 100644 --- a/wm/pwm/PLIST +++ b/wm/pwm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/31 04:07:59 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/06/01 16:16:59 salo Exp $ bin/pwm man/man1/pwm.1 share/doc/pwm/config.txt @@ -8,6 +8,6 @@ share/examples/pwm/keys-default.conf share/examples/pwm/look-beoslike.conf share/examples/pwm/look-brownsteel.conf share/examples/pwm/menus-default.conf -share/examples/pwm/pwm.conf +share/examples/pwm/pwm.conf.default @dirrm share/examples/pwm @dirrm share/doc/pwm diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo index 188cb9cf0b8..868eb3e1b58 100644 --- a/wm/pwm/distinfo +++ b/wm/pwm/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.9 2002/08/25 21:51:36 jlam Exp $ +$NetBSD: distinfo,v 1.10 2003/06/01 16:16:59 salo Exp $ -SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7 -Size (pwm-1.0.tar.gz) = 93239 bytes -SHA1 (patch-aa) = 60491df1f6b259d49958a0be8d5fa32b36e71683 -SHA1 (patch-ab) = 85eeaa8284e82f170e47dba9beb4aec741933463 -SHA1 (patch-ac) = 53b2d849539a533ba03ad18ec2f1831177a8c892 -SHA1 (patch-ad) = ce5e61f7c4011366708b4a7f0b7f2f575def1867 -SHA1 (patch-ae) = 66aab44974a3076fdf72cdbf7b32c9281ff6b04b -SHA1 (patch-af) = 58d7a96776487f0356120775084fc7d616187fde -SHA1 (patch-ag) = c2f75054ac2d1daffb5ab40a8f4448d72e5bc5ea -SHA1 (patch-ah) = a2ad468be06120abf44790e237aba8c003e61557 +SHA1 (pwm-20030528.tar.gz) = 36445864c5a2e19c35d7eb49ca5572651f4588d2 +Size (pwm-20030528.tar.gz) = 151869 bytes +SHA1 (patch-aa) = 51351dfdd1e250dc02023789c06a49fba3f8cf50 +SHA1 (patch-ac) = 793f1348e45a6ee3e21b5fa5ff02b00d1dd48ef1 +SHA1 (patch-af) = 1f302ae3b78c436bd5170dea55e77e8e00f789d0 +SHA1 (patch-ag) = a3cdb027bcec59df87c55d5324b7ffc910aad3d2 +SHA1 (patch-ah) = 5b049879a10fc189538a465ee27277d59f8cab5e diff --git a/wm/pwm/patches/patch-aa b/wm/pwm/patches/patch-aa index 3f4646a4903..91658416ea0 100644 --- a/wm/pwm/patches/patch-aa +++ b/wm/pwm/patches/patch-aa @@ -1,52 +1,45 @@ -$NetBSD: patch-aa,v 1.4 2002/01/31 04:08:00 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2003/06/01 16:17:00 salo Exp $ ---- Makefile.orig Sat Jul 1 11:48:50 2000 -+++ Makefile -@@ -10,9 +10,9 @@ - SUBDIRS=libtu - LIBS += -L./libtu -ltu -lm $(X11_LIBS) -lX11 - INCLUDES += -I./libtu/include $(X11_INCLUDES) --DEFINES += -DPREFIX=\"$(PREFIX)\" -+DEFINES += -DSYSCONFDIR=\"$(SYSCONFDIR)\" - CFLAGS += $(XOPEN_SOURCE) --TO_REALCLEAN += pwm.1x -+TO_REALCLEAN += pwm.1 - - OBJS= main.o draw.o font.o frame.o event.o clientwin.o thing.o \ - property.o pointer.o key.o moveres.o cursor.o function.o \ -@@ -21,9 +21,9 @@ - binding.o winlist.o mwmhints.o signal.o winprops.o - - BINDIR=$(PREFIX)/bin --ETCDIR=$(PREFIX)/etc -+ETCDIR=$(PREFIX)/share/examples - MANDIR=$(PREFIX)/man/man1 --DOCDIR=$(PREFIX)/doc -+DOCDIR=$(PREFIX)/share/doc - - TARGETS=pwm - -@@ -33,11 +33,11 @@ - - ###################################### - --pwm: $(OBJS) pwm.1x -+pwm: $(OBJS) pwm.1 +--- Makefile.orig 2003-05-28 23:58:16.000000000 +0200 ++++ Makefile 2003-06-01 17:56:52.000000000 +0200 +@@ -32,32 +32,16 @@ $(CC) $(OBJS) $(LDFLAGS) -o $@ --pwm.1x: pwm.1x.in + pwm.1x: pwm.1x.in - sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x -+pwm.1: pwm.1x.in -+ sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1 ++ sed -e 's#PREFIX#$(PREFIX)#g' -e 's#PKG_SYSCONFDIR#$(PKG_SYSCONFDIR)#g' pwm.1x.in > pwm.1x _install: - $(INSTALL) -d $(BINDIR) -@@ -45,7 +45,7 @@ - $(STRIP) $(BINDIR)/pwm - - $(INSTALL) -d $(MANDIR) -- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR) -+ $(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR) - - $(INSTALL) -d $(DOCDIR) - $(INSTALL) -d $(DOCDIR)/pwm +- $(INSTALLDIR) $(BINDIR) +- $(INSTALL) -m $(BIN_MODE) pwm $(BINDIR) +- $(STRIP) $(BINDIR)/pwm +- +- $(INSTALLDIR) $(MANDIR)/man1 +- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR)/man1 +- +- $(INSTALLDIR) $(DOCDIR) +- $(INSTALLDIR) $(DOCDIR)/pwm +- $(INSTALL) -m $(DATA_MODE) config.txt $(DOCDIR)/pwm +- $(INSTALL) -m $(DATA_MODE) LICENSE $(DOCDIR)/pwm +- +- $(INSTALLDIR) $(ETCDIR) +- $(INSTALLDIR) $(ETCDIR)/pwm +- for i in etc/pwm/*.conf; do \ +- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/pwm; \ +- done +- @ if test -f $(ETCDIR)/pwm/pwm.conf ; then \ +- echo "$(ETCDIR)/pwm/pwm.conf already exists. Not installing one."; \ +- else \ +- echo "Installing sample configuration file $(ETCDIR)/pwm/pwm.conf"; \ +- $(INSTALL) -m $(DATA_MODE) etc/pwm/sample.conf $(ETCDIR)/pwm/pwm.conf; \ +- fi ++ $(BSD_INSTALL_PROGRAM) pwm $(BINDIR) ++ $(BSD_INSTALL_MAN) pwm.1x $(MANDIR)/man1/pwm.1 ++ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)/pwm ++ $(BSD_INSTALL_DATA) config.txt LICENSE $(DOCDIR)/pwm ++ $(BSD_INSTALL_DATA_DIR) $(ETCDIR)/pwm ++ $(BSD_INSTALL_DATA) etc/pwm/*-*.conf $(ETCDIR)/pwm ++ $(BSD_INSTALL_DATA) etc/pwm/sample.conf $(ETCDIR)/pwm/pwm.conf.default + + + # Disclaimer: I don't have either Gnome or KDE. diff --git a/wm/pwm/patches/patch-ab b/wm/pwm/patches/patch-ab deleted file mode 100644 index ddf55741906..00000000000 --- a/wm/pwm/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/08/21 08:17:40 abs Exp $ - ---- event.c.orig Sat Jul 1 12:37:50 2000 -+++ event.c -@@ -6,6 +6,7 @@ - */ - - #include -+#include - #include - #include - diff --git a/wm/pwm/patches/patch-ac b/wm/pwm/patches/patch-ac index 14e726cc26a..dd05d60921a 100644 --- a/wm/pwm/patches/patch-ac +++ b/wm/pwm/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2001/08/21 08:17:40 abs Exp $ +$NetBSD: patch-ac,v 1.4 2003/06/01 16:17:01 salo Exp $ ---- libtu/numparser2.h.orig Mon Aug 20 22:19:29 2001 -+++ libtu/numparser2.h -@@ -27,7 +27,7 @@ +--- libtu/numparser2.h.orig 2003-05-28 23:48:15.000000000 +0200 ++++ libtu/numparser2.h 2003-06-01 17:30:54.000000000 +0200 +@@ -29,7 +29,7 @@ static int npnum_mulbase_add(NPNum *num, long base, long v) { diff --git a/wm/pwm/patches/patch-ad b/wm/pwm/patches/patch-ad deleted file mode 100644 index bd6133119b7..00000000000 --- a/wm/pwm/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2001/08/21 08:17:40 abs Exp $ - ---- libtu/tester.c.orig Mon Aug 20 22:05:33 2001 -+++ libtu/tester.c -@@ -18,7 +18,7 @@ - - libtu_init(argv[0]); - -- if(!(tokz=tokz_open_file(stdin))) -+ if(!(tokz=tokz_open_file(stdin, NULL))) - return EXIT_FAILURE; - - while(tokz_get_token(tokz, &tok)){ diff --git a/wm/pwm/patches/patch-ae b/wm/pwm/patches/patch-ae deleted file mode 100644 index ef17f59946b..00000000000 --- a/wm/pwm/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/08/21 08:17:40 abs Exp $ - ---- libtu/tester2.c.orig Mon Aug 20 22:07:00 2001 -+++ libtu/tester2.c -@@ -59,7 +59,7 @@ - - int main(int argc, char *argv[]) - { -- libtu_init_argv0(argv[0], NULL); -+ libtu_init(argv[0]); - parse_config_file(stdin, opts, TOKZ_ERROR_TOLERANT); - - return EXIT_SUCCESS; diff --git a/wm/pwm/patches/patch-af b/wm/pwm/patches/patch-af index eff7c92b11c..6cabc3379b6 100644 --- a/wm/pwm/patches/patch-af +++ b/wm/pwm/patches/patch-af @@ -1,10 +1,31 @@ -$NetBSD: patch-af,v 1.1 2001/08/21 08:17:41 abs Exp $ +$NetBSD: patch-af,v 1.2 2003/06/01 16:17:02 salo Exp $ ---- pwm.1x.in.orig Sat Jul 1 14:11:03 2000 -+++ pwm.1x.in -@@ -48,7 +48,7 @@ +--- pwm.1x.in.orig 2003-05-28 23:55:08.000000000 +0200 ++++ pwm.1x.in 2003-06-01 17:42:00.000000000 +0200 +@@ -168,16 +168,16 @@ + + .SH FILES + .TP +-.B /usr/local/etc/pwm/pwm.conf ++.B PKG_SYSCONFDIR/pwm.conf + System default configuration file + .TP +-.B /usr/local/etc/pwm/look-*.conf ++.B PKG_SYSCONFDIR/look-*.conf + Color scheme configuration files + .TP +-.B /usr/local/etc/pwm/keys-*.conf ++.B PKG_SYSCONFDIR/keys-*.conf + Key binding configuration files + .TP +-.B /usr/local/etc/pwm/buttons-*.conf ++.B PKG_SYSCONFDIR/buttons-*.conf + Pointer (mouse) button binding configuration files + .TP + .B ~/.pwm/pwm.conf +@@ -186,7 +186,7 @@ .SH SEE ALSO - The PWM home page, http://www.students.tut.fi/~tuomov/pwm/ + The PWM home page, http://iki.fi/tuomov/pwm/ .PP -.BR PREFIX/doc/pwm/config.txt +.BR PREFIX/share/doc/pwm/config.txt diff --git a/wm/pwm/patches/patch-ag b/wm/pwm/patches/patch-ag index 5bec063fb62..17ef16cb45e 100644 --- a/wm/pwm/patches/patch-ag +++ b/wm/pwm/patches/patch-ag @@ -1,26 +1,34 @@ -$NetBSD: patch-ag,v 1.3 2002/08/25 21:51:36 jlam Exp $ +$NetBSD: patch-ag,v 1.4 2003/06/01 16:17:02 salo Exp $ ---- system.mk.orig Sat Jul 1 12:37:50 2000 -+++ system.mk -@@ -7,7 +7,7 @@ - ## Installation directory prefix +--- system.mk.orig 2000-12-28 15:08:05.000000000 +0100 ++++ system.mk 2003-06-01 17:34:51.000000000 +0200 +@@ -7,13 +7,13 @@ + ## Installation paths ## -PREFIX=/usr/local +#PREFIX=/usr/local - #EXTRA_INCLUDES = -I$(PREFIX)/include - #EXTRA_LIBS = -L$(PREFIX)/lib -@@ -17,7 +17,7 @@ + # No need to modify these usually + BINDIR=$(PREFIX)/bin +-ETCDIR=$(PREFIX)/etc ++ETCDIR=$(PREFIX)/share/examples + MANDIR=$(PREFIX)/man +-DOCDIR=$(PREFIX)/doc ++DOCDIR=$(PREFIX)/share/doc + # Not used + INCDIR=$(PREFIX)/include + LIBDIR=$(PREFIX)/lib +@@ -23,7 +23,7 @@ ## X libraries, includes and options ## -X11_PREFIX=/usr/X11R6 -+X11_PREFIX=${X11BASE} ++X11_PREFIX=$(X11BASE) # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -31,7 +31,7 @@ +@@ -40,7 +40,7 @@ ## C compiler ## @@ -29,14 +37,14 @@ $NetBSD: patch-ag,v 1.3 2002/08/25 21:51:36 jlam 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 -@@ -57,8 +57,8 @@ - -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized \ - -Wparentheses -pedantic-errors +@@ -67,8 +67,8 @@ + -Wparentheses -pedantic-errors -Wuninitialized + -CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -LDFLAGS=-g $(LIBS) $(EXTRA_LIBS) +CFLAGS+=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -+LDFLAGS+=$(LIBS) ++LDFLAGS+=-g $(LIBS) $(EXTRA_LIBS) ## diff --git a/wm/pwm/patches/patch-ah b/wm/pwm/patches/patch-ah index 3606496f115..68438cf2acc 100644 --- a/wm/pwm/patches/patch-ah +++ b/wm/pwm/patches/patch-ah @@ -1,19 +1,13 @@ -$NetBSD: patch-ah,v 1.1 2002/01/31 04:08:00 jlam Exp $ +$NetBSD: patch-ah,v 1.2 2003/06/01 16:17:02 salo Exp $ ---- config.h.orig Sat Jun 3 18:12:54 2000 -+++ config.h -@@ -60,11 +60,11 @@ - #define PWM_VERSION "" +--- config.h.orig 2003-05-28 23:55:08.000000000 +0200 ++++ config.h 2003-06-01 17:44:22.000000000 +0200 +@@ -79,7 +79,7 @@ + #define ETCDIR "/etc" #endif --#ifndef PREFIX --#define PREFIX "" -+#ifndef SYSCONFDIR -+#define SYSCONFDIR "/etc/pwm" - #endif - --#define CF_SYS_CONFIG_LOCATION PREFIX"/etc/pwm/" -+#define CF_SYS_CONFIG_LOCATION SYSCONFDIR"/" +-#define CF_SYS_CONFIG_LOCATION ETCDIR"/pwm/" ++#define CF_SYS_CONFIG_LOCATION PKG_SYSCONFDIR"/pwm/" #define CF_GLOBAL_CFGFILE CF_SYS_CONFIG_LOCATION"pwm.conf" #define CF_USER_CONFIG_LOCATION ".pwm/" #define CF_USER_CFGFILE CF_USER_CONFIG_LOCATION"pwm.conf" -- cgit v1.2.3