Updated wm/windowlab to 1.32.

Lots of changes and bugs were fixed, see changelog for more info.

5 files changed, 66 insertions, 40 deletions

diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 55d9b512f0f..5ce82f103e0 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/09/04 06:05:20 xtraeme Exp $
 #
 
-DISTNAME=	windowlab-1.12
-PKGREVISION=	1
+DISTNAME=	windowlab-1.32
 CATEGORIES=	wm
 MASTER_SITES=	http://www.nickgravgaard.com/windowlab/
 EXTRACT_SUFX=	.tar
@@ -11,18 +10,22 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.nickgravgaard.com/windowlab/
 COMMENT=	Small and simple window manager
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_PKGINSTALL=	YES
 USE_TOOLS+=	gmake pkg-config
 
-PKG_SYSCONFSUBDIR=	windowlab
-
 EGDIR=		${PREFIX}/share/examples/windowlab
-CONF_FILES=	${EGDIR}/menurc.default ${PKG_SYSCONFDIR}/menurc
+CONF_FILES=	${EGDIR}/windowlab.menurc ${PKG_SYSCONFDIR}/windowlab.menurc
+
+INSTALLATION_DIRS=	share/examples/windowlab
+
+post-extract:
+	@${CHMOD} -R +x ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/menurc.sample ${EGDIR}/menurc.default
+	${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR}
 
 .include "../../fonts/Xft2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowlab/PLIST b/wm/windowlab/PLIST
index 944a2eef60f..918bfe972ac 100644
--- a/wm/windowlab/PLIST
+++ b/wm/windowlab/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/09/04 06:05:20 xtraeme Exp $
 bin/windowlab
 man/man1/windowlab.1
-share/examples/windowlab/menurc.default
+share/examples/windowlab/windowlab.menurc
 @dirrm share/examples/windowlab
diff --git a/wm/windowlab/distinfo b/wm/windowlab/distinfo
index 8b9e3bc09c6..6c23e89e744 100644
--- a/wm/windowlab/distinfo
+++ b/wm/windowlab/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/09/04 06:05:20 xtraeme Exp $
 
-SHA1 (windowlab-1.12.tar) = d42a249d1d51ed316a41f6cb74bc94a279d06abb
-RMD160 (windowlab-1.12.tar) = a1e88dbbf53b722c56decff632c3ab64f248d14d
-Size (windowlab-1.12.tar) = 143360 bytes
-SHA1 (patch-aa) = 4170cdb47715139e4f84ce90ae132bcaf52c91e1
+SHA1 (windowlab-1.32.tar) = 3927f214a0411d725aa14afc4f881d9bbda9ed81
+RMD160 (windowlab-1.32.tar) = ad192bf1a7ceddaf6ac078cebfafaeb582248923
+Size (windowlab-1.32.tar) = 163840 bytes
+SHA1 (patch-aa) = 028b6297d880e293845e01a20ee58d6a4db808f1
+SHA1 (patch-ab) = 3a631fadc8a9a15a1175c41bf0d6ce394578b9fd
diff --git a/wm/windowlab/patches/patch-aa b/wm/windowlab/patches/patch-aa
index 4700f93425c..62a4d67b3ec 100644
--- a/wm/windowlab/patches/patch-aa
+++ b/wm/windowlab/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $
 
---- Makefile.orig	2003-04-19 14:19:28.000000000 +0200
-+++ Makefile	2003-05-16 01:55:05.000000000 +0200
+--- Makefile.orig	2005-09-04 07:44:29.000000000 +0200
++++ Makefile	2005-09-04 07:47:12.000000000 +0200
 @@ -6,7 +6,7 @@
  
  # Information about the location of the menurc file
  ifndef MENURC
--MENURC = /etc/X11/windowlab/menurc
-+MENURC = ${PKG_SYSCONFDIR}/menurc
+-MENURC = /etc/X11/windowlab/windowlab.menurc
++MENURC = ${PKG_SYSCONFDIR}/windowlab.menurc
  endif
  DEFINES += -DDEF_MENURC="\"$(MENURC)\""
  
-@@ -15,27 +15,26 @@
+@@ -15,28 +15,28 @@
  
  # Uncomment to add freetype support (requires XFree86 4.0.2 or later)
- # This needs -lXext above, even if you have disabled shape support.
+ # This needs -lXext above, even if you have disabled shape support
 -#DEFINES += -DXFT
 -#EXTRA_INC += `pkg-config --cflags xft`
 -#EXTRA_LIBS += `pkg-config --libs xft`
@@ -25,35 +25,37 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $
  # Uncomment for debugging info (abandon all hope, ye who enter here)
  #DEFINES += -DDEBUG
  
- # This should be set to the location of the X installation you want to
- # compile against.
+ # Set this to the location of the X installation you want to compile against
 -XROOT = /usr/X11R6
 +XROOT = ${PREFIX}
  
  # --------------------------------------------------------------------
  
--CC       = gcc
--CFLAGS   = -g -O2 -Wall
-+#CC       = gcc
-+CFLAGS   += -g -O2 -Wall
+-CC = gcc
++#CC = gcc
+ ifndef CFLAGS
+ CFLAGS = -g -O2 -Wall -W
+ endif
  
- BINDIR   = $(DESTDIR)$(XROOT)/bin
- MANDIR   = $(DESTDIR)$(XROOT)/man/man1
--CFGDIR   = $(DESTDIR)/etc/X11/windowlab
+ BINDIR = $(DESTDIR)$(XROOT)/bin
+ MANDIR = $(DESTDIR)$(XROOT)/man/man1
+-CFGDIR = $(DESTDIR)/etc/X11/windowlab
++#CFGDIR = $(DESTDIR)/etc/X11/windowlab
  INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
--LDPATH   = -L$(XROOT)/lib
-+LDPATH   = ${LDFLAGS}
- LIBS     = -lX11 $(EXTRA_LIBS)
+-LDPATH = -L$(XROOT)/lib
++LDPATH = ${LDFLAGS}
+ LIBS = -lX11 $(EXTRA_LIBS)
  
- PROG     = windowlab
-@@ -52,10 +51,8 @@
+ PROG = windowlab
+@@ -53,9 +53,10 @@
  	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
  
  install: all
--	install -s $(PROG) $(BINDIR)
--	install -m 644 $(MANPAGE) $(MANDIR)
--	gzip -9vf $(MANDIR)/$(MANPAGE)
--	mkdir -p $(CFGDIR) && cp menurc.sample $(CFGDIR)/menurc
+-	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
+-	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vf $(MANDIR)/$(MANPAGE)
+-	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
++	${BSD_INSTALL_PROGRAM_DIR} $(BINDIR)
++	${BSD_INSTALL_MAN_DIR} $(MANDIR)
 +	${BSD_INSTALL_PROGRAM} $(PROG) $(BINDIR)
 +	${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR)/windowlab.1
  
diff --git a/wm/windowlab/patches/patch-ab b/wm/windowlab/patches/patch-ab
new file mode 100644
index 00000000000..56297b6540e
--- /dev/null
+++ b/wm/windowlab/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2005/09/04 06:05:20 xtraeme Exp $
+
+--- menufile.c.orig	2005-09-04 07:57:21.000000000 +0200
++++ menufile.c	2005-09-04 07:57:40.000000000 +0200
+@@ -44,6 +44,7 @@
+ #endif
+ 	if ((menufile = fopen(menurcpath, "r")) == NULL)
+ 	{
++#ifdef __linux__
+ 		// get location of the executable
+ 		if (readlink("/proc/self/exe", menurcpath, PATH_MAX) == -1)
+ 		{
+@@ -51,6 +52,7 @@
+ 			menurcpath[0] = '.';
+ 			menurcpath[1] = '\0';
+ 		}
++#endif
+ 		*(strrchr(menurcpath, '/')) = '\0';
+ 		*(strrchr(menurcpath, '/')) = '\0';
+ 		strncat(menurcpath, "/etc/windowlab.menurc", PATH_MAX);