Hi,
This brings ion to the latest release. I was not sure that the changes
to the config files were necessary.
diff -urN ion/Makefile ion.new/Makefile
--- ion/Makefile Wed Feb 13 00:39:10 2008
+++ ion.new/Makefile Wed Feb 13 00:08:16 2008
@@ -2,9 +2,9 @@
COMMENT= light, keyboard friendly window manager
-V= 20070318
-DISTNAME= ion-3ds-${V}
-PKGNAME= ion-${V}p1
+V= 20080207
+DISTNAME= ion-3-${V}
+PKGNAME= ion-${V}
CATEGORIES= x11
HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/
diff -urN ion/distinfo ion.new/distinfo
--- ion/distinfo Wed Feb 13 00:39:10 2008
+++ ion.new/distinfo Wed Feb 13 00:08:40 2008
@@ -1,5 +1,5 @@
-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
+MD5 (ion-3-20080207.tar.gz) = o2c8KcNnEG5cSRmsM3Ju7A==
+RMD160 (ion-3-20080207.tar.gz) = Ek2Vkh8jZlhs2dI/PyRPJbOtJKk=
+SHA1 (ion-3-20080207.tar.gz) = b5maj2dEvXmSrqfSU/FkHwVDmFQ=
+SHA256 (ion-3-20080207.tar.gz) = jiz+Eax2IpDrbf2qDJGUf19e4VqIYMrzdp9SUIehhG8=
+SIZE (ion-3-20080207.tar.gz) = 653316
diff -urN ion/patches/patch-etc_cfg_ioncore_lua
ion.new/patches/patch-etc_cfg_ioncore_lua
--- ion/patches/patch-etc_cfg_ioncore_lua Wed Feb 13 00:39:10 2008
+++ ion.new/patches/patch-etc_cfg_ioncore_lua Thu Jan 1 01:00:00 1970
@@ -1,36 +0,0 @@
-$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.6 2007/03/28 19:33:04 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(_, _sub,
'mainmenu', 'Main menu:')"),
-- --kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu',
{big=true})"),
-+ --kpress(ALTMETA.."F12", "mod_query.query_menu(_, _sub,
'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."),
-@@ -139,10 +139,10 @@ defbindings("WMPlex.toplevel", {
- kpress(META.."T", "WRegion.set_tagged(_sub, 'toggle')", "_sub:non-nil"),
-
- bdoc("Query for manual page to be displayed."),
-- kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"),
-+ kpress(ALTMETA.."F1", "mod_query.query_man(_, '::man')"),
-
- bdoc("Show the Ion manual page."),
-- kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
-+ kpress(META.."F1", "ioncore.exec_on(_, '::man ion3')"),
-
- bdoc("Run a terminal emulator."),
- kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"),
-@@ -158,7 +158,7 @@ defbindings("WMPlex.toplevel", {
-
- bdoc("Query for file to edit."),
- kpress(ALTMETA.."F5",
-- "mod_query.query_editfile(_, 'run-mailcap --action=edit')"),
-+ "mod_query.query_editfile(_, ':vi')"),
-
- bdoc("Query for file to view."),
- kpress(ALTMETA.."F6",
diff -urN ion/patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua
ion.new/patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua
--- ion/patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua Wed
Feb 13 00:39:10 2008
+++ ion.new/patches/patch-mod_statusbar_ion-statusd_statusd_mail_lua Thu
Jan 1 01:00:00 1970
@@ -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 = {}
- }
-
diff -urN ion/patches/patch-system_mk ion.new/patches/patch-system_mk
--- ion/patches/patch-system_mk Wed Feb 13 00:39:10 2008
+++ ion.new/patches/patch-system_mk Wed Feb 13 00:19:29 2008
@@ -1,16 +1,16 @@
-$OpenBSD: patch-system_mk,v 1.8 2007/03/28 19:33:04 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
- ##
+$OpenBSD$
+--- system.mk.orig Tue Feb 5 17:42:06 2008
++++ system.mk Wed Feb 13 00:19:17 2008
+@@ -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,45 +30,55 @@
# 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
##
-@@ -74,7 +75,7 @@ LUAC=$(LUA_DIR)/bin/luac
- ## 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
-@@ -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.
--#HAS_SYSTEM_ASPRINTF=1
-+HAS_SYSTEM_ASPRINTF=1
+@@ -113,11 +114,11 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
+ #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
-
- # If you're on an archaic system (such as relatively recent *BSD releases)
-@@ -119,24 +120,24 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
- #DEFINES += -DCF_NO_LOCALE
-
- # On some other systems you may something like this:
+ # On some other systems you may need to explicitly link against libintl.
-#EXTRA_LIBS += -lintl
--#EXTRA_INCLUDES +=
+EXTRA_LIBS += -L$(LOCALBASE)/lib -lintl -liconv
+ # 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.
+-#EXTRA_INCLUDES += -I/opt/local/include
+EXTRA_INCLUDES += -I$(LOCALBASE)/include
##
- ## C compiler
+@@ -127,12 +128,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
+
+ # 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,15 +150,15 @@ EXTRA_LIBS += -lrt
+ ## C compiler.
##
-CC=gcc
@@ -83,10 +93,8 @@
+# -Wtrigraphs -Wformat -Wchar-subscripts \
+# -Wparentheses -pedantic -Wuninitialized
--CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
--LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS)
-+CFLAGS+= $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-+LDFLAGS+= $(EXTRA_LIBS) $(LIBS)
+-CFLAGS=-Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
++CFLAGS=$(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+ LDFLAGS=$(LIBS) $(EXTRA_LIBS)
EXPORT_DYNAMIC=-Xlinker --export-dynamic
- # The following options are mainly for development use and can be used
diff -urN ion/patches/patch-utils_ion-statusd_statusd_mail_lua
ion.new/patches/patch-utils_ion-statusd_statusd_mail_lua
--- ion/patches/patch-utils_ion-statusd_statusd_mail_lua Thu Jan 1
01:00:00 1970
+++ ion.new/patches/patch-utils_ion-statusd_statusd_mail_lua Wed Feb
13 00:33:57 2008
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- utils/ion-statusd/statusd_mail.lua.orig Wed Feb 13 00:33:16 2008
++++ utils/ion-statusd/statusd_mail.lua Wed Feb 13 00:33:33 2008
+@@ -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 = {}
+ }
+
diff -urN ion/pkg/PFRAG.shared ion.new/pkg/PFRAG.shared
--- ion/pkg/PFRAG.shared Wed Feb 13 00:39:10 2008
+++ ion.new/pkg/PFRAG.shared Wed Feb 13 00:20:26 2008
@@ -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
diff -urN ion/pkg/PLIST ion.new/pkg/PLIST
--- ion/pkg/PLIST Wed Feb 13 00:39:10 2008
+++ ion.new/pkg/PLIST Wed Feb 13 00:20:26 2008
@@ -14,11 +14,12 @@
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/man1/
@man man/cs/man1/ion3.1
@man man/cs/man1/pwm3.1
-man/de/
-man/de/man1/
[EMAIL PROTECTED] man/de/man1/ion3.1
[EMAIL PROTECTED] man/de/man1/pwm3.1
man/fi/
man/fi/man1/
@man man/fi/man1/ion3.1
@@ -67,26 +64,19 @@
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
--
Best Regards
Edd
http://students.dec.bournemouth.ac.uk/ebarrett
