From 2e9ed2ff69f903bf60592bad94cd9bbbe59d4d3e Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sat, 8 Apr 2006 13:42:42 +0000 Subject: Update to 0.1.4. This release contains major feature enhancements compared to the previous version (0.1.3), configuration and theme files are not compatible. --- wm/pekwm/Makefile | 18 ++++++++++-------- wm/pekwm/PLIST | 41 ++++------------------------------------- wm/pekwm/distinfo | 13 +++++-------- wm/pekwm/patches/patch-aa | 22 +++++++++++----------- wm/pekwm/patches/patch-ab | 10 ---------- wm/pekwm/patches/patch-ac | 13 ------------- wm/pekwm/patches/patch-ad | 13 ------------- 7 files changed, 30 insertions(+), 100 deletions(-) delete mode 100644 wm/pekwm/patches/patch-ab delete mode 100644 wm/pekwm/patches/patch-ac delete mode 100644 wm/pekwm/patches/patch-ad (limited to 'wm/pekwm') diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index df74f365793..6a9c8650ba8 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.19 2006/02/05 23:11:14 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/04/08 13:42:42 xtraeme Exp $ # -DISTNAME= pekwm-0.1.3 -PKGREVISION= 2 +DISTNAME= pekwm-0.1.4 CATEGORIES= wm -MASTER_SITES= http://pekwm.pekdon.net/files/source/ +MASTER_SITES= http://pekwm.org/files/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= xtraeme@NetBSD.org -HOMEPAGE= http://pekwm.org/ +HOMEPAGE= http://www.pekwm.org/ COMMENT= Window manager based on aewm++ GNU_CONFIGURE= YES @@ -21,8 +20,7 @@ USE_LANGUAGES+= c++ CONFIGURE_ARGS+= --enable-xinerama .endif -CONFIGURE_ARGS+= --enable-harbour -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q:S/\/pekwm//} REPLACE_PERL= data/scripts/pekwm_themeset.pl \ data/scripts/pekwm_ws_menu.pl @@ -31,9 +29,13 @@ PKG_SYSCONFSUBDIR= pekwm EGDIR= ${PREFIX}/share/examples/pekwm CONF_FILES= -.for f in autoproperties config keys menu mouse start +.for f in autoproperties config keys menu mouse start vars CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pekwm/PLIST b/wm/pekwm/PLIST index cfdde11d36c..07b671bf0d4 100644 --- a/wm/pekwm/PLIST +++ b/wm/pekwm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/06/14 11:22:40 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/04/08 13:42:42 xtraeme Exp $ bin/pekwm man/man1/pekwm.1 share/examples/pekwm/autoproperties @@ -7,45 +7,12 @@ share/examples/pekwm/keys share/examples/pekwm/menu share/examples/pekwm/mouse share/examples/pekwm/start +share/examples/pekwm/vars share/pekwm/scripts/pekwm_themeset.pl +share/pekwm/scripts/pekwm_themeset.sh +share/pekwm/scripts/pekwm_window_info.sh 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/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 diff --git a/wm/pekwm/distinfo b/wm/pekwm/distinfo index 929ab56b0f1..25accdef62d 100644 --- a/wm/pekwm/distinfo +++ b/wm/pekwm/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 18:43:55 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/04/08 13:42:42 xtraeme Exp $ -SHA1 (pekwm-0.1.3.tar.bz2) = be56ab7e293e6ec0801b015e874d34774412ce28 -RMD160 (pekwm-0.1.3.tar.bz2) = 7324bf53e9bb18cd7f74c7be6675da84c910fc58 -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 +SHA1 (pekwm-0.1.4.tar.bz2) = 6f67cca318729b66fdb5df46ed0555a23949c89b +RMD160 (pekwm-0.1.4.tar.bz2) = 15b268e55d7b4719aaa8b819efa72c39491753d7 +Size (pekwm-0.1.4.tar.bz2) = 263546 bytes +SHA1 (patch-aa) = ad738c2447e3eb1501f54eef35a0f920f40dcc7e diff --git a/wm/pekwm/patches/patch-aa b/wm/pekwm/patches/patch-aa index c67c86e9d49..5ad45b80a75 100644 --- a/wm/pekwm/patches/patch-aa +++ b/wm/pekwm/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2003/06/14 11:22:40 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2006/04/08 13:42:42 xtraeme Exp $ ---- 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@ +--- data/Makefile.in.orig 2006-04-08 10:36:12.000000000 +0200 ++++ data/Makefile.in 2006-04-08 10:36:45.000000000 +0200 +@@ -148,7 +148,7 @@ + SUBDIRS = themes scripts + CLEANFILES = config menu + EXTRA_DIST = autoproperties config.in keys menu.in mouse start vars +-cfgdatadir = $(sysconfdir)/pekwm ++cfgdatadir = $(prefix)/share/examples/@PACKAGE@ + cfgdata_DATA = autoproperties config keys menu mouse start vars + all: all-recursive diff --git a/wm/pekwm/patches/patch-ab b/wm/pekwm/patches/patch-ab deleted file mode 100644 index 806074deda1..00000000000 --- a/wm/pekwm/patches/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ -$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 deleted file mode 100644 index 77ea02cdd99..00000000000 --- a/wm/pekwm/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 6fc740331f7..00000000000 --- a/wm/pekwm/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$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