diff options
author | ben <ben@pkgsrc.org> | 2005-04-07 13:40:49 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2005-04-07 13:40:49 +0000 |
commit | 6e2d1a71ebce8225be18ccfcd8427ea45214080d (patch) | |
tree | 1d90bf1b85bdbc5e90a02f9c29df09152f16374c /wm | |
parent | 05ca5e8b049fedaaddde420cfcd3c3989f996176 (diff) | |
download | pkgsrc-6e2d1a71ebce8225be18ccfcd8427ea45214080d.tar.gz |
Update to matchbox 0.9.3, and convert to using PKG_SYSCONFDIR.
Very many bug fixes since 0.8.4. Change direction of default cursor.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/matchbox/Makefile | 36 | ||||
-rw-r--r-- | wm/matchbox/PLIST | 44 | ||||
-rw-r--r-- | wm/matchbox/distinfo | 9 | ||||
-rw-r--r-- | wm/matchbox/patches/patch-aa | 16 |
4 files changed, 43 insertions, 62 deletions
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile index 04f6af84bca..da3c09a02c1 100644 --- a/wm/matchbox/Makefile +++ b/wm/matchbox/Makefile @@ -1,20 +1,30 @@ -# $NetBSD: Makefile,v 1.15 2004/10/05 10:30:35 agc Exp $ +# $NetBSD: Makefile,v 1.16 2005/04/07 13:40:49 ben Exp $ # -DISTNAME= matchbox-window-manager-0.8.4 -PKGNAME= matchbox-0.8.4 -PKGREVISION= 1 -CATEGORIES= wm x11 -MASTER_SITES= http://matchbox.handhelds.org/sources/matchbox-window-manager/0.8/ +DISTNAME= matchbox-window-manager-0.9.3 +PKGNAME= matchbox-0.9.3 +CATEGORIES= wm x11 +MASTER_SITES= http://matchbox.handhelds.org/sources/matchbox-window-manager/0..9/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://matchbox.handhelds.org/ -COMMENT= Window manager designed for computers with small displays +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://matchbox.handhelds.org/ +COMMENT= Window manager designed for computers with small displays -USE_BUILDLINK3= yes -USE_X11= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes +USE_BUILDLINK3= yes +USE_X11= yes +USE_LIBTOOL= yes +USE_PKGINSTALL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} + +PKG_SYSCONFSUBDIR= matchbox +EGDIR= ${PREFIX}/share/examples/matchbox +CONF_FILES= ${EGDIR}/kbdconfig ${PKG_SYSCONFDIR}/kbdconfig + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/matchbox + ${MV} ${PKG_SYSCONFDIR}/kbdconfig \ + ${PREFIX}/share/examples/matchbox/ .include "../../devel/libmatchbox/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/wm/matchbox/PLIST b/wm/matchbox/PLIST index 2b7f53337f7..5ec985c5e37 100644 --- a/wm/matchbox/PLIST +++ b/wm/matchbox/PLIST @@ -1,8 +1,17 @@ -@comment $NetBSD: PLIST,v 1.4 2004/09/30 11:36:33 agc Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/04/07 13:40:49 ben Exp $ bin/matchbox-remote bin/matchbox-window-manager -share/matchbox/kbdconfig +share/examples/matchbox/kbdconfig share/matchbox/mbnoapp.xpm +share/themes/Default/matchbox/acceptbutton.xpm +share/themes/Default/matchbox/closebutton.xpm +share/themes/Default/matchbox/menubutton.xpm +share/themes/Default/matchbox/theme.desktop +share/themes/Default/matchbox/theme.xml +share/themes/MBOpus/matchbox/closebutton.png +share/themes/MBOpus/matchbox/panelbg.png +share/themes/MBOpus/matchbox/theme.desktop +share/themes/MBOpus/matchbox/theme.xml share/themes/blondie/matchbox/accept.png share/themes/blondie/matchbox/close-small.png share/themes/blondie/matchbox/close.png @@ -25,32 +34,11 @@ share/themes/blondie/matchbox/theme.xml share/themes/blondie/matchbox/titleleft.png share/themes/blondie/matchbox/titleright.png share/themes/blondie/matchbox/titlestrip.png -share/themes/bluebox/matchbox/buttclosedown.xpm -share/themes/bluebox/matchbox/buttcloseup.xpm -share/themes/bluebox/matchbox/buttmenudown.xpm -share/themes/bluebox/matchbox/buttmenuup.xpm -share/themes/bluebox/matchbox/buttsmallclosedown.xpm -share/themes/bluebox/matchbox/buttsmallcloseup.xpm -share/themes/bluebox/matchbox/buttsmallmaxdown.xpm -share/themes/bluebox/matchbox/buttsmallmaxup.xpm -share/themes/bluebox/matchbox/buttsmallmindown.xpm -share/themes/bluebox/matchbox/buttsmallminup.xpm -share/themes/bluebox/matchbox/theme.desktop -share/themes/bluebox/matchbox/theme.xml -share/themes/bluebox/matchbox/titlebg.xpm -share/themes/bluebox/matchbox/titleleft.xpm -share/themes/bluebox/matchbox/titleright.xpm -share/themes/borillo/matchbox/blank.png -share/themes/borillo/matchbox/close.png -share/themes/borillo/matchbox/minimise.png -share/themes/borillo/matchbox/next.png -share/themes/borillo/matchbox/prev.png -share/themes/borillo/matchbox/theme.desktop -share/themes/borillo/matchbox/theme.xml -@dirrm share/themes/borillo/matchbox -@dirrm share/themes/borillo -@dirrm share/themes/bluebox/matchbox -@dirrm share/themes/bluebox @dirrm share/themes/blondie/matchbox @dirrm share/themes/blondie +@dirrm share/themes/MBOpus/matchbox +@dirrm share/themes/MBOpus +@dirrm share/themes/Default/matchbox +@dirrm share/themes/Default @dirrm share/matchbox +@dirrm etc/matchbox diff --git a/wm/matchbox/distinfo b/wm/matchbox/distinfo index 2968522a929..205106b87f2 100644 --- a/wm/matchbox/distinfo +++ b/wm/matchbox/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2005/03/16 12:37:26 rillig Exp $ +$NetBSD: distinfo,v 1.9 2005/04/07 13:40:49 ben Exp $ -SHA1 (matchbox-window-manager-0.8.4.tar.gz) = c9fd75cd01bd9800fcd1c962fa0294e5b4482a2f -RMD160 (matchbox-window-manager-0.8.4.tar.gz) = 855938b4bfe4f7c3e808ffb25acf27b14e282ab0 -Size (matchbox-window-manager-0.8.4.tar.gz) = 217677 bytes -SHA1 (patch-aa) = 41299f1704521b2dc205c3bd82912949570c5649 +SHA1 (matchbox-window-manager-0.9.3.tar.gz) = 5861a3f9b034a3bfcc3443e0374d9cbd25a029b0 +RMD160 (matchbox-window-manager-0.9.3.tar.gz) = a1ba297585dbb49c2830dd1f7d0e7d7dd2f3ea4b +Size (matchbox-window-manager-0.9.3.tar.gz) = 230218 bytes diff --git a/wm/matchbox/patches/patch-aa b/wm/matchbox/patches/patch-aa deleted file mode 100644 index 746bc0f1980..00000000000 --- a/wm/matchbox/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2005/03/16 12:37:26 rillig Exp $ - -The second semicolon belongs to an <expr> in C, and so there are -declarations and statements intermixed. gcc-2.95.3 cannot handle this. - ---- src/wm.c.orig Thu Sep 23 19:06:18 2004 -+++ src/wm.c Wed Mar 16 02:24:36 2005 -@@ -1541,7 +1541,7 @@ Client* - wm_make_new_client(Wm *w, Window win) - { - Window trans_win; -- Atom realType, *value = NULL;; -+ Atom realType, *value = NULL; - unsigned long n, extra, val[1]; - int format, status; - Client *c = NULL, *t = NULL, *old_main_client = NULL; |