Fix linkage. Match config files with samples. Revoke unmaintainmentship.

Bump revision.

4 files changed, 34 insertions, 8 deletions

diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
index 0b9ddebe6ce..592bd0b30b9 100644
--- a/wm/ion3-devel/Makefile
+++ b/wm/ion3-devel/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2006/09/02 12:07:52 rpaulo Exp $
+# $NetBSD: Makefile,v 1.17 2006/09/20 13:25:25 joerg Exp $
 #
 
 DISTNAME=	ion-3ds-20060524
 PKGNAME=	${DISTNAME:S/-3ds-/3-/}
+PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://iki.fi/tuomov/dl/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://iki.fi/~tuomov/ion/
 COMMENT=	Keyboard friendly tiling window manager
 
@@ -20,11 +21,10 @@ CONFIGURE_ENV+=		PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
 
 PKG_SYSCONFSUBDIR=	ion3
 EGDIR=			${PREFIX}/share/examples/ion3
-EGFILES=		cfg_bindings.lua cfg_dock.lua cfg_floatws.lua	\
-			cfg_ion.lua cfg_ionws.lua cfg_kludges.lua	\
-			cfg_menu.lua cfg_menus.lua cfg_panews.lua	\
-			cfg_pwm.lua cfg_pwm_bindings.lua		\
-			cfg_pwm_menus.lua cfg_query.lua cfg_sp.lua	\
+EGFILES=		cfg_dock.lua cfg_floatws.lua cfg_ion.lua	\
+			cfg_ioncore.lua cfg_ionws.lua cfg_kludges.lua	\
+			cfg_menu.lua cfg_modules.lua cfg_panews.lua	\
+			cfg_pwm.lua cfg_query.lua cfg_sp.lua		\
 			cfg_statusbar.lua				\
 			dock-draw.lua look.lua look_brownsteel.lua	\
 			look_clean.lua look_cleanios.lua		\
diff --git a/wm/ion3-devel/distinfo b/wm/ion3-devel/distinfo
index e949e2342bc..df6b50e1cfe 100644
--- a/wm/ion3-devel/distinfo
+++ b/wm/ion3-devel/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.5 2006/08/14 22:42:04 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/09/20 13:25:25 joerg Exp $
 
 SHA1 (ion-3ds-20060524.tar.gz) = 65b6bb55205e9c16f02438e3586876416222999e
 RMD160 (ion-3ds-20060524.tar.gz) = 97a86785437fce3ba91e8edfbd412e199415f545
 Size (ion-3ds-20060524.tar.gz) = 620416 bytes
+SHA1 (patch-aa) = 2d818efecf435904ac61dd6396d841db438dc2bf
+SHA1 (patch-ab) = 80a2649065db9e8a6ac59c6d7bf589175b63332c
 SHA1 (patch-ac) = 7f10320ad611bcc92c7db37e475e086be7e14074
 SHA1 (patch-ad) = 75883f474d16cda265c58784ad60c61a5eed98c7
 SHA1 (patch-ae) = 763c5b24fa8f4ba3c6f09d547714a95e87a864ac
diff --git a/wm/ion3-devel/patches/patch-aa b/wm/ion3-devel/patches/patch-aa
new file mode 100644
index 00000000000..6107a91adc0
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2006/09/20 13:25:25 joerg Exp $
+
+--- mod_ionws/Makefile.orig	2006-09-20 13:50:46.000000000 +0200
++++ mod_ionws/Makefile
+@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+ 
+ INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I..
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
++LIBS += $(LIBTU_LIBS)
+ 
+ SOURCES=main.c ionws.c placement.c split.c split-stdisp.c \
+ 	splitfloat.c panehandle.c
diff --git a/wm/ion3-devel/patches/patch-ab b/wm/ion3-devel/patches/patch-ab
new file mode 100644
index 00000000000..cdc21a1a24c
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2006/09/20 13:25:25 joerg Exp $
+
+--- mod_statusbar/Makefile.orig	2006-09-20 13:50:29.000000000 +0200
++++ mod_statusbar/Makefile
+@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+ 
+ INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I..
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
++LIBS += $(LIBTU_LIBS)
+ 
+ SOURCES = main.c statusbar.c draw.c
+