diff --git a/x11/ion/Makefile b/x11/ion/Makefile index 4377cfe64d9..807bea4a9e9 100644 --- a/x11/ion/Makefile +++ b/x11/ion/Makefile @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile,v 1.43 2006/12/02 18:12:50 pedro Exp $ +# $OpenBSD: Makefile,v 1.44 2006/12/24 11:01:55 pedro Exp $ COMMENT= "light, keyboard friendly window manager" -V= 20061029 +V= 20061223 DISTNAME= ion-3ds-${V} -PKGNAME= ion-${V}p0 +PKGNAME= ion-${V} CATEGORIES= x11 HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/ MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/dl/ -MAINTAINER= Dmitri Alenitchev +MAINTAINER= Pedro Martelletto # LGPL PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/ion/distinfo b/x11/ion/distinfo index 3622ae9f3c6..6efc694ae8f 100644 --- a/x11/ion/distinfo +++ b/x11/ion/distinfo @@ -1,4 +1,4 @@ -MD5 (ion-3ds-20061029.tar.gz) = 245d045a3524adf9586625e0a50717dc -RMD160 (ion-3ds-20061029.tar.gz) = 5ccd89605f2c615a4f4e0667739221058384600a -SHA1 (ion-3ds-20061029.tar.gz) = a491d1aa3346a20c5e0d28ec587d17956921e012 -SIZE (ion-3ds-20061029.tar.gz) = 646591 +MD5 (ion-3ds-20061223.tar.gz) = 861887705546ddb5f240f10dbdab5098 +RMD160 (ion-3ds-20061223.tar.gz) = dc61a012354a30f1a83b8b0970b8c09724ea4c9c +SHA1 (ion-3ds-20061223.tar.gz) = 8bccf120ce27b26feb67a916ba61748e85e69733 +SIZE (ion-3ds-20061223.tar.gz) = 649463 diff --git a/x11/ion/patches/patch-etc_cfg_ioncore_lua b/x11/ion/patches/patch-etc_cfg_ioncore_lua index b2c9f4819f0..02642b1a3e5 100644 --- a/x11/ion/patches/patch-etc_cfg_ioncore_lua +++ b/x11/ion/patches/patch-etc_cfg_ioncore_lua @@ -1,20 +1,20 @@ -$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.4 2006/10/20 17:36:13 pedro Exp $ ---- etc/cfg_ioncore.lua.orig Sun Oct 15 15:30:57 2006 -+++ etc/cfg_ioncore.lua Sun Oct 15 15:34:02 2006 +$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.5 2006/12/24 11:01:55 pedro Exp $ +--- etc/cfg_ioncore.lua.orig Sun Dec 24 08:45:26 2006 ++++ etc/cfg_ioncore.lua Sun Dec 24 08:48:23 2006 @@ -63,8 +63,8 @@ defbindings("WScreen", { kpress(META.."F9", "ioncore.create_ws(_)"), bdoc("Display the main menu."), -- kpress(ALTMETA.."F12", "mod_query.query_menu(_, 'mainmenu', 'Main menu: ')"), +- kpress(ALTMETA.."F12", "mod_query.query_menu(_, 'mainmenu', 'Main menu:')"), - --kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', {big=true})"), -+ --kpress(ALTMETA.."F12", "mod_query.query_menu(_, 'mainmenu', 'Main menu: ')"), ++ --kpress(ALTMETA.."F12", "mod_query.query_menu(_, 'mainmenu', 'Main menu:')"), + kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', {big=true})"), mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"), bdoc("Display the window list menu."), -@@ -136,10 +136,10 @@ defbindings("WMPlex", { +@@ -139,10 +139,10 @@ defbindings("WMPlex.toplevel", { + kpress(META.."T", "WRegion.set_tagged(_sub, 'toggle')", "_sub:non-nil"), - defbindings("WMPlex.toplevel", { bdoc("Query for manual page to be displayed."), - kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"), + kpress(ALTMETA.."F1", "mod_query.query_man(_, '::man')"), @@ -25,7 +25,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.4 2006/10/20 17:36:13 pedro Exp $ bdoc("Run a terminal emulator."), kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"), -@@ -155,7 +155,7 @@ defbindings("WMPlex.toplevel", { +@@ -158,7 +158,7 @@ defbindings("WMPlex.toplevel", { bdoc("Query for file to edit."), kpress(ALTMETA.."F5", @@ -34,7 +34,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.4 2006/10/20 17:36:13 pedro Exp $ bdoc("Query for file to view."), kpress(ALTMETA.."F6", -@@ -332,12 +332,7 @@ defmenu("mainmenu", { +@@ -335,12 +335,7 @@ defmenu("mainmenu", { -- Application menu defmenu("appmenu", { menuentry("XTerm", "ioncore.exec_on(_, 'xterm')"), @@ -44,14 +44,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.4 2006/10/20 17:36:13 pedro Exp $ - menuentry("Links", "ioncore.exec_on(_, ':links')"), - menuentry("Konqueror", "ioncore.exec_on(_, 'konqueror')"), - menuentry("Dillo", "ioncore.exec_on(_, 'dillo')"), -+ menuentry("Firefox", "ioncore.exec_on(_, 'firefox')"), ++ menuentry("Firefox", "ioncore.exec_on(_, 'firefox')"), menuentry("Run...", "mod_query.query_exec(_)"), }) -@@ -372,4 +367,4 @@ defctxmenu("WScreen", "Screen", { - menuentry("Close workspace","WRegion.rqclose(_sub)"), - }) - -- -\ No newline at end of file -+ diff --git a/x11/ion/patches/patch-system_mk b/x11/ion/patches/patch-system_mk index bfd0ca518f8..6c49a6e1663 100644 --- a/x11/ion/patches/patch-system_mk +++ b/x11/ion/patches/patch-system_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-system_mk,v 1.6 2005/12/04 16:26:20 pedro Exp $ ---- system.mk.orig Sat Oct 29 10:33:25 2005 -+++ system.mk Fri Dec 2 21:06:08 2005 +$OpenBSD: patch-system_mk,v 1.7 2006/12/24 11:01:55 pedro Exp $ +--- system.mk.orig Sat Dec 23 13:00:13 2006 ++++ system.mk Sun Dec 24 08:45:16 2006 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -48,7 +48,7 @@ $OpenBSD: patch-system_mk,v 1.6 2005/12/04 16:26:20 pedro Exp $ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -88,7 +89,7 @@ XINERAMA_LIBS=-lXinerama +@@ -91,7 +92,7 @@ DEFINES += -DCF_XINERAMA # XFree86 libraries up to 4.3.0 have a bug that will cause Ion to segfault # if Opera is used when i18n support is enabled. The following setting # should work around that situation. @@ -56,8 +56,8 @@ $OpenBSD: patch-system_mk,v 1.6 2005/12/04 16:26:20 pedro Exp $ +#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND # Use the Xutf8 routines (XFree86 extension) instead of Xmb routines in - # an UTF8 locale given the -i18n command line option? -@@ -107,7 +108,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR + # an UTF8 locale. +@@ -110,7 +111,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR # asprintf and vasprintf in the c library. (gnu libc has.) # If HAS_SYSTEM_ASPRINTF is not defined, an implementation # in sprintf_2.2/ is used. @@ -66,7 +66,7 @@ $OpenBSD: patch-system_mk,v 1.6 2005/12/04 16:26:20 pedro Exp $ # If you're on an archaic system (such as relatively recent *BSD releases) -@@ -116,24 +117,24 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR +@@ -119,24 +120,24 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR #DEFINES += -DCF_NO_LOCALE # On some other systems you may something like this: