From a9c2d02a8416a617d21954820fed37dae0ea4d36 Mon Sep 17 00:00:00 2001 From: jmmv Date: Sat, 14 Jun 2003 11:22:40 +0000 Subject: Update to 0.1.3, based on patch provided by Juan RP in private mail: * Keygrabber now support keychains. * Dynamic menus, lets you execute a script and generate menus on the fly when they're viewed. * Basic titlerules that make you rewrite titles. * Unified config format for all actions. * Multiple actions per event/entry. * Workspace change by moving the mouse. --- wm/pekwm/Makefile | 27 ++++++++++++++--- wm/pekwm/PLIST | 74 +++++++++++++++++++++++++++++------------------ wm/pekwm/distinfo | 11 ++++--- wm/pekwm/patches/patch-aa | 20 ++++++------- wm/pekwm/patches/patch-ab | 10 +++++++ wm/pekwm/patches/patch-ac | 13 +++++++++ wm/pekwm/patches/patch-ad | 13 +++++++++ 7 files changed, 122 insertions(+), 46 deletions(-) create mode 100644 wm/pekwm/patches/patch-ab create mode 100644 wm/pekwm/patches/patch-ac create mode 100644 wm/pekwm/patches/patch-ad (limited to 'wm') diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index b6b6ba59e66..2c153aada47 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,18 +1,37 @@ -# $NetBSD: Makefile,v 1.2 2003/02/05 18:43:22 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.3 2003/06/14 11:22:40 jmmv Exp $ # -DISTNAME= pekwm-0.1.2 +DISTNAME= pekwm-0.1.3 CATEGORIES= wm -MASTER_SITES= http://pekwm.babblica.net/files/source/ +MASTER_SITES= http://pekwm.pekdon.net/files/source/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= jrp@hispabsd.org -HOMEPAGE= http://pekwm.babblica.net/ +HOMEPAGE= http://pekwm.org/ COMMENT= Window manager based on aewm++ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GMAKE= YES USE_X11= YES +USE_PERL5= run +USE_PKGINSTALL= YES +CONFIGURE_ARGS+= --enable-harbour +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} + +REPLACE_PERL= ${WRKSRC}/data/scripts/pekwm_themeset.pl \ + ${WRKSRC}/data/scripts/pekwm_ws_menu.pl + +PKG_SYSCONFSUBDIR= pekwm + +EGDIR= ${PREFIX}/share/examples/pekwm +CONF_FILES= +.for f in autoproperties config keys menu mouse start +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} +.endfor +.undef f + +.include "../../lang/perl5/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pekwm/PLIST b/wm/pekwm/PLIST index d68f2bc83d5..cfdde11d36c 100644 --- a/wm/pekwm/PLIST +++ b/wm/pekwm/PLIST @@ -1,35 +1,53 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/17 10:53:22 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/06/14 11:22:40 jmmv Exp $ bin/pekwm man/man1/pekwm.1 -share/pekwm/autoprops -share/pekwm/config -share/pekwm/keys -share/pekwm/menu -share/pekwm/mouse -share/pekwm/start -share/pekwm/themes/default/bottom.xpm -share/pekwm/themes/default/btn-close-fo.xpm -share/pekwm/themes/default/btn-close-pr.xpm -share/pekwm/themes/default/btn-close-un.xpm -share/pekwm/themes/default/btn-max-fo.xpm -share/pekwm/themes/default/btn-max-pr.xpm -share/pekwm/themes/default/btn-max-un.xpm -share/pekwm/themes/default/btn-min-fo.xpm -share/pekwm/themes/default/btn-min-pr.xpm -share/pekwm/themes/default/btn-min-un.xpm -share/pekwm/themes/default/harbour.xpm -share/pekwm/themes/default/left.xpm -share/pekwm/themes/default/right.xpm -share/pekwm/themes/default/separator-fo.xpm -share/pekwm/themes/default/separator-un.xpm -share/pekwm/themes/default/side-un.xpm -share/pekwm/themes/default/side.xpm +share/examples/pekwm/autoproperties +share/examples/pekwm/config +share/examples/pekwm/keys +share/examples/pekwm/menu +share/examples/pekwm/mouse +share/examples/pekwm/start +share/pekwm/scripts/pekwm_themeset.pl +share/pekwm/scripts/pekwm_ws_menu.pl +share/pekwm/themes/default/b-bottom-c.xpm +share/pekwm/themes/default/b-bottom-l.xpm +share/pekwm/themes/default/b-bottom-r.xpm +share/pekwm/themes/default/b-side-l.xpm +share/pekwm/themes/default/b-side-r.xpm +share/pekwm/themes/default/b-top-c.xpm +share/pekwm/themes/default/b-top-l.xpm +share/pekwm/themes/default/b-top-r.xpm +share/pekwm/themes/default/btn-b-left-fo.xpm +share/pekwm/themes/default/btn-b-left-pr.xpm +share/pekwm/themes/default/btn-b-left-un.xpm +share/pekwm/themes/default/btn-b-right-fo.xpm +share/pekwm/themes/default/btn-b-right-pr.xpm +share/pekwm/themes/default/btn-b-right-un.xpm +share/pekwm/themes/default/sep-fo.xpm +share/pekwm/themes/default/sep-un.xpm share/pekwm/themes/default/theme share/pekwm/themes/default/theme.in -share/pekwm/themes/default/top.xpm -share/pekwm/themes/default/win-focus.xpm -share/pekwm/themes/default/win-select.xpm -share/pekwm/themes/default/win-unfocus.xpm +share/pekwm/themes/default/win-fo-sel.xpm +share/pekwm/themes/default/win-fo.xpm +share/pekwm/themes/default/win-un-sel.xpm +share/pekwm/themes/default/win-un.xpm +share/pekwm/themes/minimal/bd-hrz.xpm +share/pekwm/themes/minimal/bd-vrt.xpm +share/pekwm/themes/minimal/fo-bd-c.xpm +share/pekwm/themes/minimal/fo-btn-cl.xpm +share/pekwm/themes/minimal/fo-btn-ic.xpm +share/pekwm/themes/minimal/fo-btn-ma.xpm +share/pekwm/themes/minimal/fo-win.xpm +share/pekwm/themes/minimal/harbour.xpm +share/pekwm/themes/minimal/se-win.xpm +share/pekwm/themes/minimal/theme +share/pekwm/themes/minimal/theme.in +share/pekwm/themes/minimal/un-bd-c.xpm +share/pekwm/themes/minimal/un-win.xpm +share/pekwm/themes/minimal/unse-win.xpm +@dirrm share/pekwm/themes/minimal @dirrm share/pekwm/themes/default @dirrm share/pekwm/themes +@dirrm share/pekwm/scripts @dirrm share/pekwm +@dirrm share/examples/pekwm diff --git a/wm/pekwm/distinfo b/wm/pekwm/distinfo index b0ae13e024c..2e878f4dec1 100644 --- a/wm/pekwm/distinfo +++ b/wm/pekwm/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/12/17 10:53:22 jmmv Exp $ +$NetBSD: distinfo,v 1.2 2003/06/14 11:22:40 jmmv Exp $ -SHA1 (pekwm-0.1.2.tar.gz) = f758bbb77d607cfb875f8bd9f12ce268ebd69ae0 -Size (pekwm-0.1.2.tar.gz) = 225163 bytes -SHA1 (patch-aa) = 0fd38beb72f79cce37c882e31a7029b7bd398f2c +SHA1 (pekwm-0.1.3.tar.bz2) = be56ab7e293e6ec0801b015e874d34774412ce28 +Size (pekwm-0.1.3.tar.bz2) = 1694563 bytes +SHA1 (patch-aa) = 02f320d8fa63840a32cc2bb7560323bc9a91b1ac +SHA1 (patch-ab) = 9067eb28df34833ce715df76be068d8ef5b8b53a +SHA1 (patch-ac) = ec40e2f7b1fb43283b9c3bb43102cca8c0a3950c +SHA1 (patch-ad) = 9e874b53a310fe92a5dfca337393a39b84d9c8c1 diff --git a/wm/pekwm/patches/patch-aa b/wm/pekwm/patches/patch-aa index 9b9c079ae1a..c67c86e9d49 100644 --- a/wm/pekwm/patches/patch-aa +++ b/wm/pekwm/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/12/17 10:53:23 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2003/06/14 11:22:40 jmmv Exp $ ---- src/Makefile.in.orig Mon Nov 18 20:18:53 2002 -+++ src/Makefile.in -@@ -20,7 +20,7 @@ CC = @CXX@ - BIN_MODE = 755 - DEFINES = -DPREFIX=\"$(prefix)\" -DDATADIR=\"$(DATADIR)\" - CXXFLAGS = @CXXFLAGS@ $(DEFINES) --LDFLAGS = @LIBS@ -+LDFLAGS = @LIBS@ @LDFLAGS@ +--- data/Makefile.in.orig 2003-06-05 21:12:14.000000000 +0200 ++++ data/Makefile.in +@@ -3,7 +3,7 @@ + prefix = @prefix@ + DATADIR = @datadir@/@PACKAGE@ +-SYSCONFDIR = @sysconfdir@/@PACKAGE@ ++SYSCONFDIR = $(prefix)/share/examples/@PACKAGE@ + DATA_MODE = 644 + INSTALL = @INSTALL@ - # Source Files diff --git a/wm/pekwm/patches/patch-ab b/wm/pekwm/patches/patch-ab new file mode 100644 index 00000000000..806074deda1 --- /dev/null +++ b/wm/pekwm/patches/patch-ab @@ -0,0 +1,10 @@ +$NetBSD: patch-ab,v 1.1 2003/06/14 11:22:40 jmmv Exp $ + +--- data/scripts/pekwm_ws_menu.pl.orig 2003-06-05 21:12:14.000000000 +0200 ++++ data/scripts/pekwm_ws_menu.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # + # Copyright © 2003 by the pekwm development team + # diff --git a/wm/pekwm/patches/patch-ac b/wm/pekwm/patches/patch-ac new file mode 100644 index 00000000000..77ea02cdd99 --- /dev/null +++ b/wm/pekwm/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2003/06/14 11:22:41 jmmv Exp $ + +--- data/themes/Makefile.in.orig 2003-06-14 12:42:00.000000000 +0200 ++++ data/themes/Makefile.in +@@ -24,7 +24,7 @@ install: all + mkdir -p $(DESTDIR)$(DATADIR) + for i in ${THEMES}; do \ + mkdir -p $(DESTDIR)$(DATADIR)/themes/$$i; \ +- ( cd $$i; tar -cf - . | ( cd $(DESTDIR)$(DATADIR)/themes/$$i; tar -xf - )); \ ++ ( cd $$i; tar -cf - . | ( cd $(DESTDIR)$(DATADIR)/themes/$$i; tar -xmf - )); \ + rm -rf $(DESTDIR)$(DATADIR)/themes/$$i/CVS; \ + done + diff --git a/wm/pekwm/patches/patch-ad b/wm/pekwm/patches/patch-ad new file mode 100644 index 00000000000..6fc740331f7 --- /dev/null +++ b/wm/pekwm/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2003/06/14 11:22:41 jmmv Exp $ + +--- src/Makefile.in.orig 2003-06-05 21:12:14.000000000 +0200 ++++ src/Makefile.in +@@ -12,7 +12,7 @@ bindir = @bindir@ + datadir = @datadir@ + mandir = @mandir@ + +-SYSCONFDIR = @sysconfdir@/@PACKAGE@ ++SYSCONFDIR = @sysconfdir@ + + pkgdatadir = $(datadir)/@PACKAGE@ + DATADIR = $(pkgdatadir) -- cgit v1.2.3