diff options
| -rw-r--r-- | wm/ion/Makefile | 6 | ||||
| -rw-r--r-- | wm/ion/PLIST | 6 | ||||
| -rw-r--r-- | wm/ion/distinfo | 6 | ||||
| -rw-r--r-- | wm/ion/patches/patch-ae | 11 | ||||
| -rw-r--r-- | wm/ion/patches/patch-aj | 13 | ||||
| -rw-r--r-- | wm/ion/patches/patch-ak | 13 |
6 files changed, 42 insertions, 13 deletions
diff --git a/wm/ion/Makefile b/wm/ion/Makefile index 570251ca4c2..c173ae85c0e 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2005/02/04 13:58:32 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/02/05 00:00:11 cube Exp $ # DISTNAME= ion-2-20040729 PKGNAME= ${DISTNAME:S/-2-/-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= wm x11 MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/ion/dl/ @@ -13,8 +13,6 @@ COMMENT= Keyboard friendly tiling window manager PKG_INSTALLATION_TYPES= overwrite pkgviews -CONFLICTS+= pwm-[0-9]* - USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_X11= YES diff --git a/wm/ion/PLIST b/wm/ion/PLIST index 8821ee07510..25fbbef773a 100644 --- a/wm/ion/PLIST +++ b/wm/ion/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:56 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2005/02/05 00:00:11 cube Exp $ bin/ion -bin/pwm +bin/pwm2 lib/ion/de.la lib/ion/dock.la lib/ion/floatws.la @@ -14,7 +14,7 @@ lib/ion/menu.la lib/ion/query.la libexec/ion/ion-completefile man/man1/ion.1 -man/man1/pwm.1 +man/man1/pwm2.1 share/doc/ion/ChangeLog share/doc/ion/LICENSE share/doc/ion/README diff --git a/wm/ion/distinfo b/wm/ion/distinfo index 51fa39c4297..f8cdc27f3c7 100644 --- a/wm/ion/distinfo +++ b/wm/ion/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.14 2004/08/13 08:14:57 cube Exp $ +$NetBSD: distinfo,v 1.15 2005/02/05 00:00:11 cube Exp $ SHA1 (ion-2-20040729.tar.gz) = 92329a392de13dfb79ecd236eeb121a7045327e5 Size (ion-2-20040729.tar.gz) = 399367 bytes SHA1 (patch-ad) = 063d68427764a3cdde8ef52d798583d43a3f5dca -SHA1 (patch-ae) = 1f7e6a47280ea9d7ea1bae146ea2ec6e12aa69d6 +SHA1 (patch-ae) = 69581555a9805360f6c15f338420a16912c2966f SHA1 (patch-ah) = 2e123cf133811518de31453a11ba2a1a47df440f SHA1 (patch-ai) = 05d9748fdbd04f5af3e89cafb69e1d060641af83 +SHA1 (patch-aj) = 8bd079ca571f058a5fb2c2112215d442d92f0e5f +SHA1 (patch-ak) = a6236279a8ab91b9a9f0b24996825e590751f8a0 diff --git a/wm/ion/patches/patch-ae b/wm/ion/patches/patch-ae index 0b936a18333..fb0de6f2b16 100644 --- a/wm/ion/patches/patch-ae +++ b/wm/ion/patches/patch-ae @@ -1,10 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2004/02/23 13:40:21 cube Exp $ +$NetBSD: patch-ae,v 1.2 2005/02/05 00:00:11 cube Exp $ ---- pwm/Makefile.orig 2004-02-07 16:37:01.000000000 +0100 +--- pwm/Makefile.orig 2004-07-29 05:10:32.000000000 +0200 +++ pwm/Makefile -@@ -56,7 +56,7 @@ _install: +@@ -55,9 +55,9 @@ pwm: $(OBJS) $(EXT_OBJS) + + _install: $(INSTALLDIR) $(BINDIR) - $(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR) +- $(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR) ++ $(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)/pwm2 # $(STRIP) $(BINDIR)/pwm - $(INSTALLDIR) $(PWM_ETCDIR) + $(INSTALLDIR) $(EXDIR) diff --git a/wm/ion/patches/patch-aj b/wm/ion/patches/patch-aj new file mode 100644 index 00000000000..3f53fd191aa --- /dev/null +++ b/wm/ion/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2005/02/05 00:00:11 cube Exp $ + +--- man/Makefile.orig 2004-07-29 05:10:32.000000000 +0200 ++++ man/Makefile +@@ -22,7 +22,7 @@ include $(TOPDIR)/rules.mk + _install: + $(INSTALLDIR) $(MANDIR)/man1 + $(INSTALL) -m $(DATA_MODE) ion.1 $(MANDIR)/man1 +- $(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1 ++ $(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1/pwm2.1 + + # + # Awful hack that may not work on the user's system. This is rule is diff --git a/wm/ion/patches/patch-ak b/wm/ion/patches/patch-ak new file mode 100644 index 00000000000..c08ee786e00 --- /dev/null +++ b/wm/ion/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2005/02/05 00:00:11 cube Exp $ + +--- pwm/pwm-bindings.lua.orig 2003-12-29 21:26:52.000000000 +0100 ++++ pwm/pwm-bindings.lua +@@ -48,7 +48,7 @@ global_bindings{ + -- Display PWM manual page + local m=lookup_script("ion-man") + if m then +- exec_in(scr, m.." pwm") ++ exec_in(scr, m.." pwm2") + end + end), + kpress("F2", make_exec_fn("xterm")), |