Hi,
ion3 has been abandoned by its upstream developer. It has been forked
on github and is now named notion. Here's a diff for upgrading to the
latest version of notion and changing the ports name to notion, which
is required by a special license clause in original ion3. ok?
Christopher
diff -Nru ion/Makefile notion/Makefile
--- ion/MakefileMon Mar 28 19:47:27 2016
+++ notion/Makefile Mon Apr 18 12:53:46 2016
@@ -1,31 +1,36 @@
# $OpenBSD: Makefile,v 1.63 2016/03/27 20:53:15 naddy Exp $
-COMMENT= light, keyboard friendly window manager
+COMMENT = static tiling, tabbing and floating window manager
-V= 20090110
-DISTNAME= ion-3-${V}
-PKGNAME= ion-${V}
-CATEGORIES=x11
-REVISION= 2
+CATEGORIES = x11
-HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/
-MASTER_SITES= http://tuomov.iki.fi/software/dl/
+GH_TAGNAME = 3-2015061300
+GH_ACCOUNT =raboof
+GH_PROJECT =notion
+DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
+PKGNAME = ${GH_PROJECT}-${GH_TAGNAME:S/-/./}
+HOMEPAGE = http://notion.sourceforge.net/
+
# LGPL
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= ICE X11 m c SM Xext ${MODLUA_WANTLIB}
-
-MODULES= devel/gettext \
+MODULES = devel/gettext \
lang/lua
-MODLUA_SA= Yes
-LIB_DEPENDS= ${MODLUA_LIB_DEPENDS}
+WANTLIB = ICE m c SM X11 Xext Xinerama Xrandr ${MODLUA_WANTLIB}
-USE_GMAKE= Yes
-NO_TEST= Yes
+#MODLUA_SA = Yes
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/system.mk
+LIB_DEPENDS = ${MODLUA_LIB_DEPENDS}
+RUN_DEPENDS = ${MODLUA_RUN_DEPENDS}
+
+MAKE_ENV = LUA_VERSION=$(MODLUA_VERSION:S/.//)
+FAKE_FLAGS = PREFIX=$(PREFIX)
+
+USE_GMAKE =Yes
+
+#pre-configure:
+# ${SUBST_CMD} ${WRKSRC}/system-autodetect.mk
.include
diff -Nru ion/distinfo notion/distinfo
--- ion/distinfoMon Apr 29 14:40:49 2013
+++ notion/distinfo Wed Mar 30 10:40:28 2016
@@ -1,2 +1,2 @@
-SHA256 (ion-3-20090110.tar.gz) = 2vbEPmfsR3+idKV9fSAFnddvZszi7T6dtwalklTRc9o=
-SIZE (ion-3-20090110.tar.gz) = 643971
+SHA256 (notion-3-2015061300.tar.gz) =
PJ2fNan7DRfCY7dv4o96GkoFt9YUBUVSTMHv/ZjFwwU=
+SIZE (notion-3-2015061300.tar.gz) = 797057
diff -Nru ion/patches/patch-etc_cfg_ioncore_lua
notion/patches/patch-etc_cfg_ioncore_lua
--- ion/patches/patch-etc_cfg_ioncore_lua Mon Apr 29 14:40:49 2013
+++ notion/patches/patch-etc_cfg_ioncore_luaThu Jan 1 01:00:00 1970
@@ -1,36 +0,0 @@
-$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.8 2013/04/29 12:40:49 gonzalo Exp $
etc/cfg_ioncore.lua.orig Fri Jan 9 20:19:49 2009
-+++ etc/cfg_ioncore.luaMon Apr 8 11:20:13 2013
-@@ -65,8 +65,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."),
-@@ -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."),
--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')"),
-@@ -156,7 +156,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 -Nru ion/patches/patch-etc_cfg_notioncore_lua
notion/patches/patch-etc_cfg_notioncore_lua
--- ion/patches/patch-etc_cfg_notioncore_luaThu Jan 1 01:00:00 1970
+++ notion/patches/patch-etc_cfg_notioncore_lua Mon Apr 18 12:57:39 2016
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- etc/cfg_notioncore.lua.origSat Jun 13 16:37:26 2015
etc/cfg_notioncore.lua Wed Apr 13 23:25:21 2016
+@@ -146,10 +146,10 @@ defbindings("WMPlex.toplevel", {
+ kpress(META.."L", "notioncore.exec_on(_,
notioncore.lookup_script('notion-lock'))"),
+
+ 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 Notion manual page."),
+-kpress(META.."F1", "ioncore.exec_on(_, ':man notion')")
