Author: viper Date: 2006-05-22 17:45:58 +0200 (Mon, 22 May 2006) New Revision: 1431 Removed: crux-2.2/ports/opt/9base/ crux-2.2/ports/opt/wmii/wmii-2.5.2.patch Modified: crux-2.2/ports/opt/wmii/.footprint crux-2.2/ports/opt/wmii/.md5sum crux-2.2/ports/opt/wmii/Pkgfile crux-2.2/ports/opt/wmii/README Log: wmii: update to 3 9base: isn't necessary anymore Modified: crux-2.2/ports/opt/wmii/.footprint =================================================================== --- crux-2.2/ports/opt/wmii/.footprint 2006-05-22 15:45:31 UTC (rev 1430) +++ crux-2.2/ports/opt/wmii/.footprint 2006-05-22 15:45:58 UTC (rev 1431) @@ -1,28 +1,21 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/wmii --rwxr-xr-x root/root usr/bin/wmiibar --rwxr-xr-x root/root usr/bin/wmiifs --rwxr-xr-x root/root usr/bin/wmiikeys -rwxr-xr-x root/root usr/bin/wmiimenu --rwxr-xr-x root/root usr/bin/wmiiplumb +-rwxr-xr-x root/root usr/bin/wmiipsel -rwxr-xr-x root/root usr/bin/wmiir +-rwxr-xr-x root/root usr/bin/wmiisetsid -rwxr-xr-x root/root usr/bin/wmiiwarp -rwxr-xr-x root/root usr/bin/wmiiwm drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/wmii-2.5/ --rwxr-xr-x root/root usr/etc/wmii-2.5/extern --rwxr-xr-x root/root usr/etc/wmii-2.5/kmode --rwxr-xr-x root/root usr/etc/wmii-2.5/quit --rwxr-xr-x root/root usr/etc/wmii-2.5/status --rwxr-xr-x root/root usr/etc/wmii-2.5/welcome --rwxr-xr-x root/root usr/etc/wmii-2.5/wmiirc +drwxr-xr-x root/root usr/etc/wmii-3/ +-rwxr-xr-x root/root usr/etc/wmii-3/quit +-rwxr-xr-x root/root usr/etc/wmii-3/status +-rwxr-xr-x root/root usr/etc/wmii-3/welcome +-rwxr-xr-x root/root usr/etc/wmii-3/wmiirc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/wmii.1.gz --rw-r--r-- root/root usr/man/man1/wmiibar.1.gz --rw-r--r-- root/root usr/man/man1/wmiifs.1.gz --rw-r--r-- root/root usr/man/man1/wmiikeys.1.gz -rw-r--r-- root/root usr/man/man1/wmiimenu.1.gz -rw-r--r-- root/root usr/man/man1/wmiir.1.gz -rw-r--r-- root/root usr/man/man1/wmiiwm.1.gz Modified: crux-2.2/ports/opt/wmii/.md5sum =================================================================== --- crux-2.2/ports/opt/wmii/.md5sum 2006-05-22 15:45:31 UTC (rev 1430) +++ crux-2.2/ports/opt/wmii/.md5sum 2006-05-22 15:45:58 UTC (rev 1431) @@ -1,2 +1 @@ -dbff83c39d9c91417fd91751a5c7247b wmii-2.5.2.patch -61677e625be99732860e423b7074127f wmii-2.5.2.tar.gz +1caba809a6a7bc152a59712e0e0de551 wmii-3.tar.gz Modified: crux-2.2/ports/opt/wmii/Pkgfile =================================================================== --- crux-2.2/ports/opt/wmii/Pkgfile 2006-05-22 15:45:31 UTC (rev 1430) +++ crux-2.2/ports/opt/wmii/Pkgfile 2006-05-22 15:45:58 UTC (rev 1431) @@ -1,22 +1,17 @@ # Description: The next generation of WMI # URL: http://wmii.de/ # Maintainer: Simon Glo�ner, viper at hometux dot de -# Depends on: 9base name=wmii -version=2.5.2 +version=3 release=1 -source=(http://wmii.de/download/$name-$version.tar.gz $name-$version.patch) +source=(http://wmii.de/download/$name-$version.tar.gz) build() { cd $name-$version - # disable annoying mouse warping - patch -p1 < ../$name-$version.patch - sed -i 's|^PREFIX.*|PREFIX=/usr|' config.mk sed -i 's|^MANPREFIX.*|MANPREFIX=/usr/man|' config.mk - sed -i 's|^9PREFIX.*|9PREFIX=/usr/share/9base|' config.mk make DESTDIR=$PKG clean install Modified: crux-2.2/ports/opt/wmii/README =================================================================== --- crux-2.2/ports/opt/wmii/README 2006-05-22 15:45:31 UTC (rev 1430) +++ crux-2.2/ports/opt/wmii/README 2006-05-22 15:45:58 UTC (rev 1431) @@ -1,22 +1,17 @@ REQUIREMENTS - The wmii configuration scripts now rely on the 9base package which - contains ports of various Plan 9 standard tools, in particular the - rc shell. I've created a port of it. - PRE-INSTALL POST-INSTALL PRECAUTION - I've added a patch to stop wmii warping the mouse around. If you - like that feature just comment the patch out. + The developers of wmii have changed the configuration format again. + So wmii doesn't depend on base9 anymore. They switched back to the + old sh configuration format. Therefore you have to manually convert + your old configuration files (from 2.5) to use it in this new + version (3.0). The configuration paths also have been changed. - The developer of wmii changed the configuration format again. You - have to manually convert your old configuration to use it in this - new version. The configuration paths also have been changed. - - ~/.wmii-2.5 - /etc/wmii-2.5 + ~/.wmii-3 + /etc/wmii-3 Deleted: crux-2.2/ports/opt/wmii/wmii-2.5.2.patch =================================================================== --- crux-2.2/ports/opt/wmii/wmii-2.5.2.patch 2006-05-22 15:45:31 UTC (rev 1430) +++ crux-2.2/ports/opt/wmii/wmii-2.5.2.patch 2006-05-22 15:45:58 UTC (rev 1431) @@ -1,12 +0,0 @@ ---- wmii-2.5.2/cmd/wm/page.c 2006-01-27 22:09:37.000000000 +0100 -+++ wmii-2.5.2-new/cmd/wm/page.c 2006-04-18 23:04:07.000000000 +0200 -@@ -275,9 +275,6 @@ - XTranslateCoordinates(dpy, f->win, root, wex, wey, &ex, &ey, &dummy); - if (blitz_ispointinrect(ex, ey, r)) - return; -- XSelectInput(dpy, root, ROOT_MASK & ~EnterWindowMask); -- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, r->width / 2, r->height / 2); -- XSelectInput(dpy, root, ROOT_MASK); - } - - static void