10 files changed, 403 insertions, 0 deletions
diff --git a/wm/ion-devel/DESCR b/wm/ion-devel/DESCR
new file mode 100644
index 00000000000..0653e86618f
--- /dev/null
+++ b/wm/ion-devel/DESCR
@@ -0,0 +1,3 @@
+Ion is a window manager dividing the screen into frames rather than having
+overlapping windows, much like the windows in Emacs.  Navigation between
+clients can be done solely using the keyboard without need for a mouse.
diff --git a/wm/ion-devel/Makefile b/wm/ion-devel/Makefile
new file mode 100644
index 00000000000..44bdaa3e3e4
--- /dev/null
+++ b/wm/ion-devel/Makefile
@@ -0,0 +1,62 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 23:03:19 cube Exp $
+#
+
+DISTNAME=	ion-devel-20031211
+PKGNAME=	${DISTNAME:S/-devel//}
+CATEGORIES=	wm x11
+MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
+
+MAINTAINER=	cube@NetBSD.org
+HOMEPAGE=	http://iki.fi/~tuomov/ion/
+COMMENT=	Keyboard friendly tiling window manager
+
+BUILDLINK_DEPENDS.ltdl=	libtool-base>=1.4.20010614nb19
+BUILDLINK_DEPENDS.lua=	lua>=5.0.1
+
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+USE_X11=	YES
+USE_GMAKE=	YES
+
+PKG_SYSCONFSUBDIR=	ion
+EGDIR=			${PREFIX}/share/examples/ion
+EGFILES=		floatws.lua ion-bindings.lua ion-menus.lua	\
+			ion.lua ionws.lua kludges.lua			\
+			look-clean.lua look-cleanios.lua		\
+			look-cleanviolet.lua look-dusky.lua		\
+			look-greyviolet.lua look-ios.lua		\
+			look-simpleblue.lua look-wheat2.lua menu.lua	\
+			query.lua draw.lua pwm.lua
+.for f in ${EGFILES}
+CONF_FILES+=		${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
+
+ION_INCLUDE_DIR=	${PREFIX}/include/ion
+
+post-patch:
+	${SED} -e s,@@PREFIX@@,${PREFIX}, -e s,@@X11BASE@@,${X11BASE},	\
+	    -e s,@@LUADIR@@,${BUILDLINK_PREFIX.lua},			\
+	    -e s,@@LIBTOOL@@,${BUILDLINK_PREFIX.ltdl}/bin/libtool,	\
+	    ${WRKSRC}/system.mk > ${WRKSRC}/system.mk.tmp
+	${MV} ${WRKSRC}/system.mk.tmp ${WRKSRC}/system.mk
+
+post-install:
+	${INSTALL_DATA_DIR} ${ION_INCLUDE_DIR}
+	${INSTALL_DATA_DIR} ${ION_INCLUDE_DIR}/ioncore
+	${INSTALL_DATA_DIR} ${ION_INCLUDE_DIR}/libtu
+	${INSTALL_DATA_DIR} ${ION_INCLUDE_DIR}/luaextl
+	${INSTALL_DATA} ${WRKSRC}/config.h ${ION_INCLUDE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/version.h ${ION_INCLUDE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/mkexports.lua ${ION_INCLUDE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/rules.mk ${ION_INCLUDE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/system.mk ${ION_INCLUDE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/system-inc.mk ${ION_INCLUDE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/ioncore/*.h ${ION_INCLUDE_DIR}/ioncore
+	${INSTALL_DATA} ${WRKSRC}/libtu/include/libtu/*.h ${ION_INCLUDE_DIR}/libtu
+	${INSTALL_DATA} ${WRKSRC}/luaextl/luaextl.h ${ION_INCLUDE_DIR}/luaextl/
+
+.include "../../lang/lua/buildlink2.mk"
+.include "../../devel/libtool/buildlink2.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/ion-devel/PLIST b/wm/ion-devel/PLIST
new file mode 100644
index 00000000000..f2cfe3c23a1
--- /dev/null
+++ b/wm/ion-devel/PLIST
@@ -0,0 +1,145 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+bin/ion
+bin/pwm
+include/ion/config.h
+include/ion/ioncore/activity.h
+include/ion/ioncore/attach.h
+include/ion/ioncore/binding.h
+include/ion/ioncore/bindmaps.h
+include/ion/ioncore/clientwin.h
+include/ion/ioncore/colormap.h
+include/ion/ioncore/common.h
+include/ion/ioncore/conf-bindings.h
+include/ion/ioncore/conf.h
+include/ion/ioncore/cursor.h
+include/ion/ioncore/defer.h
+include/ion/ioncore/errorlog.h
+include/ion/ioncore/event.h
+include/ion/ioncore/eventh.h
+include/ion/ioncore/exec.h
+include/ion/ioncore/extl.h
+include/ion/ioncore/extlconv.h
+include/ion/ioncore/focus.h
+include/ion/ioncore/fullscreen.h
+include/ion/ioncore/genframe-pointer.h
+include/ion/ioncore/genframe.h
+include/ion/ioncore/genframep.h
+include/ion/ioncore/genws.h
+include/ion/ioncore/global.h
+include/ion/ioncore/gr.h
+include/ion/ioncore/grab.h
+include/ion/ioncore/hooks.h
+include/ion/ioncore/infowin.h
+include/ion/ioncore/ioncore.h
+include/ion/ioncore/key.h
+include/ion/ioncore/manage.h
+include/ion/ioncore/minmax.h
+include/ion/ioncore/modules.h
+include/ion/ioncore/mplex.h
+include/ion/ioncore/mwmhints.h
+include/ion/ioncore/names.h
+include/ion/ioncore/netwm.h
+include/ion/ioncore/obj.h
+include/ion/ioncore/objlist.h
+include/ion/ioncore/objp.h
+include/ion/ioncore/pointer.h
+include/ion/ioncore/property.h
+include/ion/ioncore/readconfig.h
+include/ion/ioncore/readfds.h
+include/ion/ioncore/regbind.h
+include/ion/ioncore/reginfo.h
+include/ion/ioncore/region.h
+include/ion/ioncore/resize.h
+include/ion/ioncore/rootwin.h
+include/ion/ioncore/saveload.h
+include/ion/ioncore/screen.h
+include/ion/ioncore/selection.h
+include/ion/ioncore/signal.h
+include/ion/ioncore/sizehint.h
+include/ion/ioncore/stacking.h
+include/ion/ioncore/strings.h
+include/ion/ioncore/symlist.h
+include/ion/ioncore/tags.h
+include/ion/ioncore/window.h
+include/ion/ioncore/xic.h
+include/ion/libtu/dlist.h
+include/ion/libtu/map.h
+include/ion/libtu/misc.h
+include/ion/libtu/optparser.h
+include/ion/libtu/output.h
+include/ion/libtu/parser.h
+include/ion/libtu/tokenizer.h
+include/ion/libtu/types.h
+include/ion/libtu/util.h
+include/ion/luaextl/luaextl.h
+include/ion/mkexports.lua
+include/ion/rules.mk
+include/ion/system.mk
+include/ion/system-inc.mk
+include/ion/version.h
+lib/ion/de.a
+lib/ion/de.la
+lib/ion/de.so
+lib/ion/floatws.a
+lib/ion/floatws.la
+lib/ion/floatws.so
+lib/ion/ion-completefile
+lib/ion/ionws.a
+lib/ion/ionws.la
+lib/ion/ionws.so
+lib/ion/menu.a
+lib/ion/menu.la
+lib/ion/menu.so
+lib/ion/query.a
+lib/ion/query.la
+lib/ion/query.so
+man/man1/ion.1
+man/man1/pwm.1
+share/doc/ion/ChangeLog
+share/doc/ion/LICENSE
+share/doc/ion/README
+share/examples/ion/draw.lua
+share/examples/ion/floatws.lua
+share/examples/ion/ion-bindings.lua
+share/examples/ion/ion-menus.lua
+share/examples/ion/ion.lua
+share/examples/ion/ionws.lua
+share/examples/ion/kludges.lua
+share/examples/ion/look-brownsteel.lua
+share/examples/ion/look-clean.lua
+share/examples/ion/look-cleanios.lua
+share/examples/ion/look-cleanviolet.lua
+share/examples/ion/look-dusky.lua
+share/examples/ion/look-greyviolet.lua
+share/examples/ion/look-ios.lua
+share/examples/ion/look-simpleblue.lua
+share/examples/ion/look-wheat2.lua
+share/examples/ion/menu.lua
+share/examples/ion/pwm.lua
+share/examples/ion/query.lua
+share/ion/delib.lc
+share/ion/delib.lua
+share/ion/ion-edit
+share/ion/ion-man
+share/ion/ion-runinxterm
+share/ion/ion-ssh
+share/ion/ion-view
+share/ion/ioncore-efbb.lc
+share/ion/ioncore-efbb.lua
+share/ion/ioncorelib-mplexfns.lc
+share/ion/ioncorelib-mplexfns.lua
+share/ion/ioncorelib.lc
+share/ion/ioncorelib.lua
+share/ion/menulib.lc
+share/ion/menulib.lua
+share/ion/querylib.lc
+share/ion/querylib.lua
+share/ion/welcome_message.txt
+@dirrm include/ion/ioncore
+@dirrm include/ion/libtu
+@dirrm include/ion/luaextl
+@dirrm include/ion
+@dirrm lib/ion
+@dirrm share/doc/ion
+@dirrm share/examples/ion
+@dirrm share/ion
diff --git a/wm/ion-devel/buildlink2.mk b/wm/ion-devel/buildlink2.mk
new file mode 100644
index 00000000000..75a00cd8f56
--- /dev/null
+++ b/wm/ion-devel/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+
+.if !defined(ION_BUILDLINK2_MK)
+ION_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		ion
+BUILDLINK_DEPENDS.ion?=		ion>=20031211
+BUILDLINK_PKGSRCDIR.ion?=	../../wip/ion-devel
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ion=ion
+BUILDLINK_PREFIX.ion_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ion=		include/ion/*.h
+BUILDLINK_FILES.ion+=		include/ion/mkexports.lua
+BUILDLINK_FILES.ion+=		include/ion/*.mk
+BUILDLINK_FILES.ion+=		include/ion/ioncore/*.h
+BUILDLINK_FILES.ion+=		include/ion/libtu/*.h
+BUILDLINK_FILES.ion+=		include/ion/luaextl/*.h
+
+BUILDLINK_TARGETS+=		ion-buildlink
+
+ion-buildlink: _BUILDLINK_USE
+
+.endif	# ION_BUILDLINK2_MK
diff --git a/wm/ion-devel/distinfo b/wm/ion-devel/distinfo
new file mode 100644
index 00000000000..71683e7962b
--- /dev/null
+++ b/wm/ion-devel/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/01/09 23:03:19 cube Exp $
+
+SHA1 (ion-devel-20031211.tar.gz) = ced31be7a6d31006455b1210c045faaf4b747d98
+Size (ion-devel-20031211.tar.gz) = 313355 bytes
+SHA1 (patch-aa) = 7a1284b4151f05d3fa98d07d1bffb05db8428a79
+SHA1 (patch-ab) = b63395c877957621d76f57fa42e710241d5903c0
+SHA1 (patch-ac) = 7739e037122fb98c5e70575350a634e084a48b8b
+SHA1 (patch-ad) = f54cfff3e250116b417cb0d3bd9329d9d0ea5405
+SHA1 (patch-ae) = f3c1a38ba162964a173cbe37559e54fc687e8134
diff --git a/wm/ion-devel/patches/patch-aa b/wm/ion-devel/patches/patch-aa
new file mode 100644
index 00000000000..e229f3ab3db
--- /dev/null
+++ b/wm/ion-devel/patches/patch-aa
@@ -0,0 +1,90 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+
+--- system.mk.orig	2003-12-11 18:16:16.000000000 +0100
++++ system.mk
+@@ -7,7 +7,7 @@
+ ## Installation paths
+ ##
+ 
+-PREFIX=/usr/local
++PREFIX=/usr/pkg
+ 
+ # Unless you are creating a package conforming to some OS's standards, you
+ # probably do not want to modify the following directories:
+@@ -16,12 +16,14 @@ PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
+ # Configuration .lua files
+ ETCDIR=$(PREFIX)/etc/ion
++# Installation of configuration files
++EXDIR=$(PREFIX)/share/examples/ion
+ # Some .lua files and ion-* shell scripts
+ SHAREDIR=$(PREFIX)/share/ion
+ # Manual pages
+ MANDIR=$(PREFIX)/man
+ # Some documents
+-DOCDIR=$(PREFIX)/doc/ion
++DOCDIR=$(PREFIX)/share/doc/ion
+ # Nothing at the moment
+ INCDIR=$(PREFIX)/include/ion
+ # Nothing at the moment
+@@ -40,7 +42,7 @@ EXTRABINDIR=$(LIBDIR)/ion
+ # libtool because even more-recent-than-libtool-1.4.3 releases of those
+ # OSes only have an _ancient_ 1.3.x libtool that _will_ _not_ _work even
+ # though a lot of libltdl-using apps require 1.4.3. 
+-LIBTOOL=libtool
++LIBTOOL=/usr/pkg/bin/libtool
+ 
+ # Settings for compiling and linking to ltdl
+ LTDL_INCLUDES=
+@@ -68,8 +70,8 @@ LTDL_LIBS=-lltdl
+ 
+ # If you have installed Lua 5.0 from the official tarball without changing
+ # paths, this so do it.
+-LUA_DIR=/usr/local
+-LUA_LIBS = -L$(LUA_DIR)/lib -R$(LUA_DIR)/lib -llua -llualib
++LUA_DIR=/usr/pkg
++LUA_LIBS = -L$(LUA_DIR)/lib -R$(LUA_DIR)/lib -llua -llualib -R$(LUA_DIR)/lib
+ LUA_INCLUDES = -I$(LUA_DIR)/include
+ LUA=$(LUA_DIR)/bin/lua
+ LUAC=$(LUA_DIR)/bin/luac
+@@ -91,7 +93,7 @@ X11_PREFIX=/usr/X11R6
+ # SunOS/Solaris
+ #X11_PREFIX=/usr/openwin
+ 
+-X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
++X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext -R$(X11_PREFIX)/lib
+ X11_INCLUDES=-I$(X11_PREFIX)/include
+ 
+ # Change commenting to disable Xinerama support
+@@ -123,7 +125,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
+ ## C compiler
+ ##
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
+ # they're mainly for development use. So, if they cause trouble (not
+@@ -153,8 +155,8 @@ WARN=	-W -Wimplicit -Wreturn-type -Wswit
+ # following should optimize function calls to Lua a little.
+ #C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
+ 
+-CFLAGS=-g -Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+-LDFLAGS=-g -Os $(LIBS) $(EXTRA_LIBS)
++CFLAGS+=-g $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
++LDFLAGS+=-g $(LIBS) $(EXTRA_LIBS)
+ 
+ 
+ ##
+@@ -180,9 +182,9 @@ RANLIB=ranlib
+ ##
+ 
+ # Should work almost everywhere
+-INSTALL=install
++#INSTALL=install
+ # On a system with pure BSD install, -c might be preferred
+-#INSTALL=install -c
++INSTALL=install -c
+ 
+ INSTALLDIR=mkdir -p
+ 
diff --git a/wm/ion-devel/patches/patch-ab b/wm/ion-devel/patches/patch-ab
new file mode 100644
index 00000000000..6072e36deba
--- /dev/null
+++ b/wm/ion-devel/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+
+--- ioncore/event.c.orig	2003-03-09 12:17:40.000000000 +0100
++++ ioncore/event.c
+@@ -15,6 +15,7 @@
+ #include "readfds.h"
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+ 
diff --git a/wm/ion-devel/patches/patch-ac b/wm/ion-devel/patches/patch-ac
new file mode 100644
index 00000000000..3c2c134ec64
--- /dev/null
+++ b/wm/ion-devel/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+
+--- ioncore/readconfig.c.orig	2003-12-06 12:44:30.000000000 +0100
++++ ioncore/readconfig.c
+@@ -87,7 +87,24 @@ bool ioncore_add_scriptdir(const char *d
+ 
+ bool ioncore_add_moduledir(const char *dir)
+ {
+-	return (lt_dlinsertsearchdir(lt_dlgetsearchpath(), dir)==0);
++	const char *oldpath;
++	char *newpath;
++	bool ret;
++
++	oldpath=lt_dlgetsearchpath();
++	if(oldpath==NULL){
++		return (lt_dlsetsearchpath(dir)==0);
++	}else{
++		libtu_asprintf(&newpath, "%s:%s", dir, oldpath);
++		if(newpath==NULL){
++			warn_err();
++			return FALSE;
++		}else{
++			ret=(lt_dlsetsearchpath(newpath)==0);
++			free(newpath);
++			return ret;
++		}
++	}
+ }
+ 
+ 
diff --git a/wm/ion-devel/patches/patch-ad b/wm/ion-devel/patches/patch-ad
new file mode 100644
index 00000000000..81d8d890d40
--- /dev/null
+++ b/wm/ion-devel/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+
+--- etc/Makefile.orig	2003-12-11 18:16:16.000000000 +0100
++++ etc/Makefile
+@@ -22,8 +22,9 @@ include $(TOPDIR)/rules.mk
+ 
+ _install:
+ 	$(INSTALLDIR) $(ETCDIR)
++	$(INSTALLDIR) $(EXDIR)
+ 	for i in $(ETC); do \
+-		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
++		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
+ 	done
+-	rm -f $(ETCDIR)/draw.lua
+-	ln -s look-cleanviolet.lua $(ETCDIR)/draw.lua
++	rm -f $(EXDIR)/draw.lua
++	ln -s look-cleanviolet.lua $(EXDIR)/draw.lua
diff --git a/wm/ion-devel/patches/patch-ae b/wm/ion-devel/patches/patch-ae
new file mode 100644
index 00000000000..7a833e4cfd1
--- /dev/null
+++ b/wm/ion-devel/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/01/09 23:03:20 cube Exp $
+
+--- pwm/Makefile.orig	2003-12-11 18:16:16.000000000 +0100
++++ pwm/Makefile
+@@ -57,5 +57,5 @@ _install:
+ 	$(INSTALLDIR) $(BINDIR)
+ 	$(INSTALL) -m $(BIN_MODE) pwm $(BINDIR)
+ 	# $(STRIP) $(BINDIR)/pwm
+-	$(INSTALLDIR) $(PWM_ETCDIR)
+-	$(INSTALL) -m $(DATA_MODE) pwm.lua $(PWM_ETCDIR)
++	$(INSTALLDIR) $(EXDIR)
++	$(INSTALL) -m $(DATA_MODE) pwm.lua $(EXDIR)