Hi,
Update for Ion to 20090110:
* Apply FRAME_SHADED_TOGGLE hack in WFrame.maximize_vert
for correct unshaded size hints to rqgeom handlers.
* A few strings were missing translation wrapper
* Shouldn't open queries in frame if message box is open.
* WMPlex focus code fixes/improvements.
* Unsqueeze fixes
* ioncore_warn_nolog uses usual warn if not in OPMODE_INIT.
And another bugs.
Test are welcome.
Ok? Comments?
Cheers.-
--
Sending from my iFart...
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/ion/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile 11 Mar 2013 11:46:13 -0000 1.58
+++ Makefile 8 Apr 2013 15:11:03 -0000
@@ -2,14 +2,13 @@
COMMENT= light, keyboard friendly window manager
-V= 20070318
-DISTNAME= ion-3ds-${V}
+V= 20090110
+DISTNAME= ion-3-${V}
PKGNAME= ion-${V}
-REVISION= 5
CATEGORIES= x11
HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/
-MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/dl/
+MASTER_SITES= http://tuomov.iki.fi/software/dl/
# LGPL
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/ion/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 5 Apr 2007 17:36:22 -0000 1.25
+++ distinfo 8 Apr 2013 15:11:03 -0000
@@ -1,5 +1,2 @@
-MD5 (ion-3ds-20070318.tar.gz) = 8CJkq37MmQws0yL1el6KTQ==
-RMD160 (ion-3ds-20070318.tar.gz) = p8ybrqNiSw7YQP3IL8XbKsEBjZo=
-SHA1 (ion-3ds-20070318.tar.gz) = 81Khx/b0ZUeBQdU4sqTD8+gaTzA=
-SHA256 (ion-3ds-20070318.tar.gz) = cS2gJ/sSd09n2TPZWpVFLZilZYYX/FUVARynm2A1JYo=
-SIZE (ion-3ds-20070318.tar.gz) = 657282
+SHA256 (ion-3-20090110.tar.gz) = 2vbEPmfsR3+idKV9fSAFnddvZszi7T6dtwalklTRc9o=
+SIZE (ion-3-20090110.tar.gz) = 643971
Index: patches/patch-etc_cfg_ioncore_lua
===================================================================
RCS file: /cvs/ports/x11/ion/patches/patch-etc_cfg_ioncore_lua,v
retrieving revision 1.7
diff -u -p -r1.7 patch-etc_cfg_ioncore_lua
--- patches/patch-etc_cfg_ioncore_lua 10 Jul 2012 15:22:45 -0000 1.7
+++ patches/patch-etc_cfg_ioncore_lua 8 Apr 2013 15:11:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.7 2012/07/10 15:22:45 jasper Exp $
---- etc/cfg_ioncore.lua.orig Sun Mar 18 21:31:41 2007
-+++ etc/cfg_ioncore.lua Mon Jul 9 11:20:13 2012
+--- etc/cfg_ioncore.lua.orig Fri Jan 9 20:19:49 2009
++++ etc/cfg_ioncore.lua Mon Apr 8 11:20:13 2013
@@ -65,8 +65,8 @@ defbindings("WScreen", {
kpress(META.."F9", "ioncore.create_ws(_)"),
@@ -12,7 +12,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.
mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"),
bdoc("Display the window list menu."),
-@@ -147,10 +147,10 @@ defbindings("WMPlex.toplevel", {
+@@ -137,10 +137,10 @@ defbindings("WMPlex.toplevel", {
kpress(META.."T", "WRegion.set_tagged(_sub, 'toggle')", "_sub:non-nil"),
bdoc("Query for manual page to be displayed."),
@@ -25,7 +25,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.
bdoc("Run a terminal emulator."),
kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"),
-@@ -166,7 +166,7 @@ defbindings("WMPlex.toplevel", {
+@@ -156,7 +156,7 @@ defbindings("WMPlex.toplevel", {
bdoc("Query for file to edit."),
kpress(ALTMETA.."F5",
Index: patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua
===================================================================
RCS file: patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua
diff -N patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua
--- patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua 8 Jun 2005
12:45:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-mod_statusbar_ion-statusd_statusd_mail_lua,v 1.2 2005/06/08
12:45:55 pedro Exp $
---- mod_statusbar/ion-statusd/statusd_mail.lua.orig Tue Jun 7 10:06:02 2005
-+++ mod_statusbar/ion-statusd/statusd_mail.lua Wed Jun 8 09:11:13 2005
-@@ -15,7 +15,7 @@ local mon = "mail"
- local defaults={
- update_interval=10*1000,
- retry_interval=60*10*1000,
-- mbox = os.getenv("MAIL"),
-+ mbox = os.getenv("MAIL") or "/var/mail/" .. os.getenv("USER"),
- files = {}
- }
-
Index: patches/patch-system_mk
===================================================================
RCS file: /cvs/ports/x11/ion/patches/patch-system_mk,v
retrieving revision 1.9
diff -u -p -r1.9 patch-system_mk
--- patches/patch-system_mk 10 Jul 2012 15:22:45 -0000 1.9
+++ patches/patch-system_mk 8 Apr 2013 15:11:03 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-system_mk,v 1.9 2012/07/10 15:22:45 jasper Exp $
---- system.mk.orig Sun Mar 18 21:32:12 2007
-+++ system.mk Mon Jul 9 11:22:36 2012
-@@ -7,7 +7,7 @@
- ## Installation paths
- ##
+--- system.mk.orig Fri Jan 9 20:20:27 2009
++++ system.mk Mon Apr 8 11:47:30 2013
+@@ -8,7 +8,7 @@
+ # Installation path prefix. Unless you know what you're doing, the default
+ # of /usr/local is likely the correct choice.
-PREFIX=/usr/local
+#PREFIX=/usr/local
# Unless you are creating a package conforming to some OS's standards, you
# probably do not want to modify the following directories:
-@@ -15,15 +15,16 @@ PREFIX=/usr/local
+@@ -16,15 +16,16 @@ PREFIX=/usr/local
# Main binaries
BINDIR=$(PREFIX)/bin
# Configuration .lua files
@@ -30,16 +30,16 @@ $OpenBSD: patch-system_mk,v 1.9 2012/07/
# Nothing at the moment
LIBDIR=$(PREFIX)/lib
# Modules
-@@ -47,7 +48,7 @@ LOCALEDIR=$(PREFIX)/share/locale
- #PRELOAD_MODULES=1
+@@ -53,7 +54,7 @@ LOCALEDIR=$(PREFIX)/share/locale
- # Flags to link with libdl.
+ # Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
+ # setting (for e.g. Lua, when not instructed by pkg-config).
-DL_LIBS=-ldl
+#DL_LIBS=-ldl
##
-@@ -57,24 +58,24 @@ DL_LIBS=-ldl
+@@ -63,17 +64,17 @@ DL_LIBS=-ldl
# If you have installed Lua 5.1 from the official tarball without changing
# paths, this should do it.
LUA_DIR=/usr/local
@@ -56,8 +56,8 @@ $OpenBSD: patch-system_mk,v 1.9 2012/07/
# what you want.
-#LUA_LIBS=`pkg-config --libs lua5.1`
-#LUA_INCLUDES=`pkg-config --cflags lua5.1`
--#LUA=`which lua5.1`
--#LUAC=`which luac5.1`
+-#LUA=/usr/bin/lua5.1
+-#LUAC=/usr/bin/luac5.1
+LUA_LIBS=`pkg-config --libs lua51`
+LUA_INCLUDES=`pkg-config --cflags lua51`
+LUA=`which lua51`
@@ -65,35 +65,42 @@ $OpenBSD: patch-system_mk,v 1.9 2012/07/
##
- ## X libraries, includes and options
+@@ -81,7 +82,7 @@ LUAC=$(LUA_DIR)/bin/luac
##
+ # Paths
-X11_PREFIX=/usr/X11R6
+X11_PREFIX=$(X11BASE)
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
-@@ -104,7 +105,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
- # 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.
--#HAS_SYSTEM_ASPRINTF=1
-+HAS_SYSTEM_ASPRINTF=1
+@@ -114,6 +115,9 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
- # If you're on an archaic system (such as relatively recent *BSD releases)
- # without even dummy multibyte/widechar and localisation support, you may
-@@ -112,24 +113,24 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
- #DEFINES += -DCF_NO_LOCALE
-
- # On some other systems you may something like this:
--#EXTRA_LIBS += -lintl
--#EXTRA_INCLUDES +=
+ # On some other systems you may need to explicitly link against libintl.
+ #EXTRA_LIBS += -lintl
+EXTRA_LIBS += -L$(LOCALBASE)/lib -lintl -liconv
+EXTRA_INCLUDES += -I$(LOCALBASE)/include -I/usr/local/include/lua-5.1
++
+ # You may also need to give the location of its headers. The following
+ # should work on Mac OS X (which needs the above option as well) with
+ # macports.
+@@ -127,12 +131,12 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
+ # You may uncomment this if you know that your system C libary provides
+ # asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
+ # defined, an implementation provided in libtu/sprintf_2.2/ is used.
+-#HAS_SYSTEM_ASPRINTF=1
++HAS_SYSTEM_ASPRINTF=1
-
- ##
- ## C compiler
+ # The following setting is needed with GNU libc for clock_gettime and the
+ # monotonic clock. Other systems may not need it, or may not provide a
+ # monotonic clock at all (which Ion can live with, and usually detect).
+-EXTRA_LIBS += -lrt
++#EXTRA_LIBS += -lrt
+
+ # Cygwin needs this.
+ #DEFINES += -DCF_NO_GETLOADAVG
+@@ -149,16 +153,16 @@ EXTRA_LIBS += -lrt
+ ## C compiler.
##
-CC=gcc
@@ -108,8 +115,8 @@ $OpenBSD: patch-system_mk,v 1.9 2012/07/
+# -Wtrigraphs -Wformat -Wchar-subscripts \
+# -Wparentheses -pedantic -Wuninitialized
--CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
--LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS)
+-CFLAGS=-Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+-LDFLAGS=$(LIBS) $(EXTRA_LIBS)
+CFLAGS+= $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
+LDFLAGS+= $(EXTRA_LIBS) $(LIBS)
EXPORT_DYNAMIC=-Xlinker --export-dynamic
Index: patches/patch-utils_ion-statusd_statusd_mail_lua
===================================================================
RCS file: patches/patch-utils_ion-statusd_statusd_mail_lua
diff -N patches/patch-utils_ion-statusd_statusd_mail_lua
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-utils_ion-statusd_statusd_mail_lua 8 Apr 2013 15:11:03
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- utils/ion-statusd/statusd_mail.lua.orig Mon Apr 8 11:59:40 2013
++++ utils/ion-statusd/statusd_mail.lua Mon Apr 8 12:00:34 2013
+@@ -12,7 +12,7 @@ local mon = "mail"
+ local defaults={
+ update_interval=10*1000,
+ retry_interval=60*10*1000,
+- mbox = os.getenv("MAIL"),
++ mbox = os.getenv("MAIL") or "/var/mail/" .. os.getenv("USER"),
+ files = {}
+ }
+
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/x11/ion/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.shared
--- pkg/PFRAG.shared 20 Oct 2006 17:36:13 -0000 1.3
+++ pkg/PFRAG.shared 8 Apr 2013 15:11:03 -0000
@@ -2,7 +2,6 @@
lib/ion3/mod/de.so
lib/ion3/mod/mod_dock.so
lib/ion3/mod/mod_menu.so
-lib/ion3/mod/mod_mgmtmode.so
lib/ion3/mod/mod_query.so
lib/ion3/mod/mod_sm.so
lib/ion3/mod/mod_sp.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/ion/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 28 Mar 2007 19:33:04 -0000 1.20
+++ pkg/PLIST 8 Apr 2013 15:11:03 -0000
@@ -1,11 +1,11 @@
@comment $OpenBSD: PLIST,v 1.20 2007/03/28 19:33:04 pedro Exp $
%%SHARED%%
-bin/ion3
-bin/pwm3
+@bin bin/ion3
+@bin bin/pwm3
lib/ion3/
lib/ion3/bin/
-lib/ion3/bin/ion-completefile
-lib/ion3/bin/ion-statusd
+@bin lib/ion3/bin/ion-completefile
+@bin lib/ion3/bin/ion-statusd
lib/ion3/lc/
lib/ion3/lc/de.lc
lib/ion3/lc/ioncore_bindings.lc
@@ -14,11 +14,12 @@ lib/ion3/lc/ioncore_ext.lc
lib/ion3/lc/ioncore_luaext.lc
lib/ion3/lc/ioncore_menudb.lc
lib/ion3/lc/ioncore_misc.lc
+lib/ion3/lc/ioncore_quasiact.lc
+lib/ion3/lc/ioncore_tabnum.lc
lib/ion3/lc/ioncore_wd.lc
lib/ion3/lc/ioncore_winprops.lc
lib/ion3/lc/mod_dock.lc
lib/ion3/lc/mod_menu.lc
-lib/ion3/lc/mod_mgmtmode.lc
lib/ion3/lc/mod_query.lc
lib/ion3/lc/mod_query_chdir.lc
lib/ion3/lc/mod_sm.lc
@@ -33,10 +34,6 @@ man/cs/
man/cs/man1/
@man man/cs/man1/ion3.1
@man man/cs/man1/pwm3.1
-man/de/
-man/de/man1/
-@man man/de/man1/ion3.1
-@man man/de/man1/pwm3.1
man/fi/
man/fi/man1/
@man man/fi/man1/ion3.1
@@ -67,26 +64,19 @@ share/examples/ion3/look_clean.lua
share/examples/ion3/look_cleanios.lua
share/examples/ion3/look_cleanviolet.lua
share/examples/ion3/look_dusky.lua
+share/examples/ion3/look_greenlight.lua
share/examples/ion3/look_greyviolet.lua
share/examples/ion3/look_ios.lua
share/examples/ion3/look_newviolet.lua
share/examples/ion3/look_simpleblue.lua
share/examples/ion3/lookcommon_clean.lua
-share/examples/ion3/lookcommon_clean_frame.lua
-share/examples/ion3/lookcommon_clean_stdisp.lua
-share/examples/ion3/lookcommon_clean_tab.lua
share/examples/ion3/lookcommon_emboss.lua
-share/examples/ion3/lookcommon_emboss_frame.lua
-share/examples/ion3/lookcommon_emboss_stdisp.lua
-share/examples/ion3/lookcommon_emboss_tab.lua
share/ion3/
share/ion3/ion-completeman
share/ion3/ion-runinxterm
share/ion3/welcome.cs.txt
-share/ion3/welcome.de.txt
share/ion3/welcome.fi.txt
share/ion3/welcome.txt
share/locale/cs/LC_MESSAGES/ion3.mo
-share/locale/de/LC_MESSAGES/ion3.mo
share/locale/fi/LC_MESSAGES/ion3.mo
-share/locale/ru/LC_MESSAGES/ion3.mo
+share/locale/fr/LC_MESSAGES/ion3.mo
