Update to wmii 3.1, based on pkgsrc-wip/wmii-3. Changes since 2.5.x are

massive, see the homepage for more information.  Take MAINTAINERship.

3 files changed, 33 insertions, 54 deletions

diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index ef82dbb10b0..65d83b2e2fb 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,40 +1,28 @@
-# $NetBSD: Makefile,v 1.12 2007/01/13 02:30:41 obache Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/15 11:39:10 ghen Exp $
 #
 
-DISTNAME=	wmii-2.5.2
-PKGREVISION=	1
-CATEGORIES=	wm x11
-MASTER_SITES=	http://suckless.org/download/
+DISTNAME=		wmii-3.1
+CATEGORIES=		wm
+MASTER_SITES=		http://suckless.org/download/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://wmii.suckless.org/
-COMMENT=	Modular and keyboard-friendly window manager
-
-DEPENDS+=		9base-[0-9]*:../../sysutils/9base
+MAINTAINER=		ghen@NetBSD.org
+HOMEPAGE=		http://wmii.suckless.org/
+COMMENT=		Modular and keyboard-friendly window manager
 
 NO_CONFIGURE=		yes
 
-CFLAGS.SunOS+=		-D__EXTENSIONS__
-
-SUBST_CLASSES+=		vars pfx
-SUBST_STAGE.vars=	post-patch
-SUBST_FILES.vars=	cmd/wm/wmii rc/* cmd/wm/wmii.1
-SUBST_SED.vars=		-e 's|CONFPREFIX|${PREFIX}/share/examples|g'
-SUBST_SED.vars+=	-e 's|9PREFIX|${PREFIX}|g'
+BUILD_DEFS+=		PKG_SYSCONFBASE
 
-SUBST_STAGE.pfx = post-patch
-SUBST_FILES.pfx = config.mk
-SUBST_SED.pfx = -e s,/usr/local,${PREFIX},g
-SUBST_SED.pfx+= -e 's|/usr/X11R6|${X11BASE}|g'
-SUBST_SED.pfx+= -e 's|-L$${X11LIB}|${X11_LDFLAGS}|g'
-SUBST_SED.pfx+= -e 's|CFLAGS = -O0 -g -Wall|CFLAGS+=|g'
-SUBST_SED.pfx+= -e 's|-g||g'
-SUBST_SED.pfx+= -e 's|/9||g'
-SUBST_SED.pfx+= -e 's|cc|${CC}|g'
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-patch
+SUBST_FILES.path=	cmd/wm/wmii rc/wmiirc cmd/wm/wmii.1
+SUBST_SED.path+=	-e 's|CONFPREFIX|${PKG_SYSCONFBASE}|g'
 
 PKG_SYSCONFSUBDIR=	wmii-3
-EGDIR=			${PREFIX}/share/examples/wmii-3
-EGFILES=		extern kmode quit status welcome wmirc
+EGDIR=			${PREFIX}/share/examples/${PKG_SYSCONFSUBDIR}
+EGFILES=		quit status welcome wmiirc
+CONF_FILES_MODE=	0755
+
 .for f in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
diff --git a/wm/wmii/PLIST b/wm/wmii/PLIST
index 9c641fc2c5d..3f1449819a1 100644
--- a/wm/wmii/PLIST
+++ b/wm/wmii/PLIST
@@ -1,27 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2006/10/12 13:16:02 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/01/15 11:39:10 ghen Exp $
 bin/wmii
-bin/wmiibar
-bin/wmiifs
-bin/wmiikeys
 bin/wmiimenu
-bin/wmiiplumb
+bin/wmiipsel
 bin/wmiir
+bin/wmiisetsid
 bin/wmiiwarp
 bin/wmiiwm
-etc/wmii-2.5/extern
-etc/wmii-2.5/kmode
-etc/wmii-2.5/quit
-etc/wmii-2.5/status
-etc/wmii-2.5/welcome
-etc/wmii-2.5/wmiirc
-share/man/man1/wmii.1
-share/man/man1/wmiibar.1
-share/man/man1/wmiifs.1
-share/man/man1/wmiikeys.1
-share/man/man1/wmiimenu.1
-share/man/man1/wmiir.1
-share/man/man1/wmiiwm.1
-@dirrm share/man/man1
-@exec ${MKDIR} %D/etc/wmii-3
-@dirrm etc/wmii-3
-@dirrm etc/wmii-2.5
+man/man1/wmii.1
+man/man1/wmiimenu.1
+man/man1/wmiir.1
+man/man1/wmiiwm.1
+share/examples/wmii-3/quit
+share/examples/wmii-3/status
+share/examples/wmii-3/welcome
+share/examples/wmii-3/wmiirc
+@dirrm share/examples/wmii-3
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index 832892d3d4a..5d89745a242 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/10/12 13:16:02 obache Exp $
+$NetBSD: distinfo,v 1.5 2007/01/15 11:39:10 ghen Exp $
 
-SHA1 (wmii-2.5.2.tar.gz) = 39cc2fb372fbf2e4a9f95dd948a4cd0190c7c2e6
-RMD160 (wmii-2.5.2.tar.gz) = c9c80e69b03f6c1b15de09ef57db7b85ca821698
-Size (wmii-2.5.2.tar.gz) = 71101 bytes
+SHA1 (wmii-3.1.tar.gz) = 363b52207d2505d5921adbcda98136ee240a673d
+RMD160 (wmii-3.1.tar.gz) = c5abaa0982b036b8dafa224751b80d8265c19f59
+Size (wmii-3.1.tar.gz) = 60935 bytes
+SHA1 (patch-aa) = ad3d271229b869e25f74bda2d819ba7fac55c278