Update jwm to 2.1.0. Changes from 2.0.1 (per http://joewing.net/programs/jwm/history.shtml ) JWM v2.1.0 <> 20110925 * Revision 502 * Fixed several window handling issues. * Fixed an issue with key bindings and modifiers. * Added some more key bindings. * Changed the way the "next" and "nextstacked" key bindings behave. * Merged some user-contributed patches. * Rounded window corners (Patriot). * Support for transparent menus, trays, and windows (Patriot). * New borders for buttons (Patriot). * User-replaceable window button masks (Patriot). * gxine fullscreen fix (Patriot). * Fix for windows loosing focus when switching desktops (Patriot). * More key bindings (Dougal). * Transparent group (Dougal). * Some code cleanups. * Added the ability to resize from the top of windows. * Added support for pager labels.diff -r1.18 -r1.19 pkgsrc/wm/jwm/Makefile
(tsutsui)
@@ -1,50 +1,50 @@ | @@ -1,50 +1,50 @@ | |||
1 | # $NetBSD: Makefile,v 1.18 2011/11/25 22:23:52 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2012/05/20 06:42:01 tsutsui Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= jwm-2.0.1 | 4 | DISTNAME= jwm-2.1.0 | |
5 | PKGREVISION= 5 | |||
6 | CATEGORIES= wm x11 | 5 | CATEGORIES= wm x11 | |
7 | MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ \ | 6 | MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ \ | |
8 | ${MASTER_SITE_SOURCEFORGE:=jwm/} | 7 | ${MASTER_SITE_SOURCEFORGE:=jwm/} | |
9 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
10 | 9 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://www.joewing.net/programs/jwm/ | 11 | HOMEPAGE= http://www.joewing.net/programs/jwm/ | |
13 | COMMENT= Lightweight window manager with virtual desktops | 12 | COMMENT= Lightweight window manager with virtual desktops | |
13 | LICENSE= gnu-gpl-v2 | |||
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | USE_TOOLS+= pkg-config | 17 | USE_TOOLS+= pkg-config | |
18 | 18 | |||
19 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes | |
20 | 20 | |||
21 | .include "../../mk/bsd.prefs.mk" | 21 | .include "../../mk/bsd.prefs.mk" | |
22 | 22 | |||
23 | .if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h) | 23 | .if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h) | |
24 | CONFIGURE_ARGS+= --enable-xinerama | 24 | CONFIGURE_ARGS+= --enable-xinerama | |
25 | # XXX maybe set some build variable about that | 25 | # XXX maybe set some build variable about that | |
26 | .endif | 26 | .endif | |
27 | 27 | |||
28 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | 28 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |
29 | 29 | |||
30 | SUBST_CLASSES+= egdir | 30 | SUBST_CLASSES+= egdir | |
31 | SUBST_STAGE.egdir= pre-configure | 31 | SUBST_STAGE.egdir= pre-configure | |
32 | SUBST_FILES.egdir= Makefile.in | 32 | SUBST_FILES.egdir= Makefile.in | |
33 | SUBST_SED.egdir= -e 's,@@EGDIR@@,${EGDIR},g' | 33 | SUBST_SED.egdir= -e 's,@@EGDIR@@,${EGDIR},g' | |
34 | 34 | |||
35 | PKG_SYSCONFSUBDIR= jwm | 35 | PKG_SYSCONFSUBDIR= jwm | |
36 | EGDIR= ${PREFIX}/share/examples/jwm | 36 | EGDIR= ${PREFIX}/share/examples/jwm | |
37 | CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc | 37 | CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc | |
38 | 38 | |||
39 | INSTALLATION_DIRS= bin | 39 | INSTALLATION_DIRS= bin | |
40 | 40 | |||
41 | .include "options.mk" | 41 | .include "options.mk" | |
42 | 42 | |||
43 | BUILDLINK_DEPMETHOD.libXt?= build | 43 | BUILDLINK_DEPMETHOD.libXt?= build | |
44 | 44 | |||
45 | .include "../../x11/libXft/buildlink3.mk" | 45 | .include "../../x11/libXft/buildlink3.mk" | |
46 | .include "../../x11/libXpm/buildlink3.mk" | 46 | .include "../../x11/libXpm/buildlink3.mk" | |
47 | .include "../../x11/libXinerama/buildlink3.mk" | 47 | .include "../../x11/libXinerama/buildlink3.mk" | |
48 | .include "../../x11/libXt/buildlink3.mk" | 48 | .include "../../x11/libXt/buildlink3.mk" | |
49 | .include "../../x11/xextproto/buildlink3.mk" | 49 | .include "../../x11/xextproto/buildlink3.mk" | |
50 | .include "../../mk/bsd.pkg.mk" | 50 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2009/07/07 19:39:55 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.6 2012/05/20 06:42:01 tsutsui Exp $ | |
2 | 2 | |||
3 | SHA1 (jwm-2.0.1.tar.bz2) = 209bc5e8c41f6a827d38a9b365405a2dc9bef082 | 3 | SHA1 (jwm-2.1.0.tar.bz2) = 5b7973d8b3621087485b6e14be23693e92f21628 | |
4 | RMD160 (jwm-2.0.1.tar.bz2) = 84d16886056e77abd65717852df1530cebb6817b | 4 | RMD160 (jwm-2.1.0.tar.bz2) = 1977e14b1acfadec759de3c227860b063d166be8 | |
5 | Size (jwm-2.0.1.tar.bz2) = 248607 bytes | 5 | Size (jwm-2.1.0.tar.bz2) = 163590 bytes | |
6 | SHA1 (patch-aa) = b4ab344c6cc3079ad5b8d9badcf57995c3dca20f | 6 | SHA1 (patch-aa) = 35d60f56211d7ca6b116e89feb5c45447083aa9f | |
7 | SHA1 (patch-ab) = e8684d4e7245d86f4d24e769db407d2ff304f90b | 7 | SHA1 (patch-ab) = e8684d4e7245d86f4d24e769db407d2ff304f90b |
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2009/07/07 19:39:56 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2012/05/20 06:42:01 tsutsui Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2005-11-21 04:02:12.000000000 +0000 | 3 | --- Makefile.in.orig 2011-09-25 22:28:02.000000000 +0000 | |
4 | +++ Makefile.in | 4 | +++ Makefile.in | |
5 | @@ -1,5 +1,5 @@ | 5 | @@ -1,5 +1,5 @@ | |
6 | 6 | |||
7 | -SYSCONF = @SYSCONF@ | 7 | -SYSCONF = @SYSCONF@ | |
8 | +SYSCONF = @@EGDIR@@ | 8 | +SYSCONF = @@EGDIR@@ | |
9 | MANDIR = @MANDIR@ | 9 | MANDIR = @MANDIR@ | |
10 | VERSION = @VERSION@ | 10 | VERSION ?= @VERSION@ | |
11 | 11 | |||
12 | @@ -8,10 +8,10 @@ all: | 12 | @@ -8,10 +8,10 @@ all: | |
13 | 13 | |||
14 | install: all | 14 | install: all | |
15 | cd src ; $(MAKE) install ; cd .. | 15 | cd src ; $(MAKE) install ; cd .. | |
16 | - install -d $(SYSCONF) | 16 | - install -d $(SYSCONF) | |
17 | - install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc | 17 | - install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc | |
18 | - install -d $(MANDIR)/man1 | 18 | - install -d $(MANDIR)/man1 | |
19 | - install -m 644 jwm.1 $(MANDIR)/man1/jwm.1 | 19 | - install -m 644 jwm.1 $(MANDIR)/man1/jwm.1 | |
20 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(SYSCONF) | 20 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(SYSCONF) | |
21 | + ${BSD_INSTALL_DATA} example.jwmrc ${DESTDIR}$(SYSCONF)/system.jwmrc | 21 | + ${BSD_INSTALL_DATA} example.jwmrc ${DESTDIR}$(SYSCONF)/system.jwmrc | |
22 | + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1 | 22 | + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1 | |
23 | + ${BSD_INSTALL_MAN} jwm.1 ${DESTDIR}$(MANDIR)/man1/jwm.1 | 23 | + ${BSD_INSTALL_MAN} jwm.1 ${DESTDIR}$(MANDIR)/man1/jwm.1 | |
24 | 24 | |||
25 | depend: | 25 | depend: | |
26 | cd src ; $(MAKE) depend | 26 | cd src ; $(MAKE) depend |