From 454c43752ebbfc4ff3e7b144cc6f17cc18ef578c Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 8 Nov 2007 19:40:05 +0000
Subject: Update to 4.6:

4.6
This release contains sanitized aspect ratio handling, a simplified
tagging concept, an improved tiling algorithm, and several code
cleanups.

4.4
This release provides a totally new layout plugin structure and a
lot of code polishing.

4.3
This release contains certain major bugfixes, especially regarding
banning/unbanning client windows.

4.1
The status bar can now be toggled on the fly.  Several bugs were
fixed and a lot of code polishing was undertaken.
---
 wm/dwm/Makefile         |  4 ++--
 wm/dwm/distinfo         | 10 +++++-----
 wm/dwm/patches/patch-aa | 22 +++++++++++-----------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'wm')

diff --git a/wm/dwm/Makefile b/wm/dwm/Makefile
index 00a2c5a113c..23a34b447b1 100644
--- a/wm/dwm/Makefile
+++ b/wm/dwm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2007/05/11 21:39:35 tonio Exp $
+# $NetBSD: Makefile,v 1.3 2007/11/08 19:40:05 wiz Exp $
 
-DISTNAME=	dwm-4.0
+DISTNAME=	dwm-4.6
 CATEGORIES=	wm
 MASTER_SITES=	http://suckless.org/download/
 
diff --git a/wm/dwm/distinfo b/wm/dwm/distinfo
index ae31aea4af7..cd07c052283 100644
--- a/wm/dwm/distinfo
+++ b/wm/dwm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/05/11 21:39:35 tonio Exp $
+$NetBSD: distinfo,v 1.3 2007/11/08 19:40:06 wiz Exp $
 
-SHA1 (dwm-4.0.tar.gz) = 2d5e50764b8926d72c9d89e46ec465bbc20dfb5c
-RMD160 (dwm-4.0.tar.gz) = 69573532c7274bb79e226830c74c1d47a5416318
-Size (dwm-4.0.tar.gz) = 18072 bytes
-SHA1 (patch-aa) = 79a3a1843ce347f3f0152065c7e391cd71bc4795
+SHA1 (dwm-4.6.tar.gz) = 7bc6c6347cf9047907a7016e87a0c0f2b56bcd17
+RMD160 (dwm-4.6.tar.gz) = d7bb9efcf90e8fef757ab4125e190c50769d7e10
+Size (dwm-4.6.tar.gz) = 17558 bytes
+SHA1 (patch-aa) = d88179de8f75bb1e5e6bfb1de2a36a2897bffae3
diff --git a/wm/dwm/patches/patch-aa b/wm/dwm/patches/patch-aa
index f8a93dceed1..254d251c8a0 100644
--- a/wm/dwm/patches/patch-aa
+++ b/wm/dwm/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/13 09:08:07 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2007/11/08 19:40:06 wiz Exp $
 
---- config.mk.orig	2007-04-02 11:11:37.000000000 +0200
-+++ config.mk	2007-04-13 04:30:19.000000000 +0200
-@@ -4,19 +4,18 @@
+--- config.mk.orig	2007-10-25 18:24:37.000000000 +0000
++++ config.mk
+@@ -4,19 +4,18 @@ VERSION = 4.6
  # Customize below to fit your system
  
  # paths
 -PREFIX = /usr/local
 -MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX = ${PREFIX}/${PKGMANDDIR}
++MANPREFIX = ${PREFIX}/${PKGMANDIR}
  
 -X11INC = /usr/X11R6/include
 -X11LIB = /usr/X11R6/lib
@@ -18,17 +18,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/04/13 09:08:07 xtraeme Exp $
  # includes and libs
  INCS = -I. -I/usr/include -I${X11INC}
 -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-+LIBS = -lc -lX11
++LIBS = -lc -L${X11LIB} ${COMPILER_RPATH_FLAG}${X11LIB} -lX11
  
  # flags
 -CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
--LDFLAGS = ${LIBS}
-+CFLAGS += -DVERSION=\"${VERSION}\"
+-LDFLAGS = -s ${LIBS}
++CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
 +LDFLAGS += ${LIBS}
- #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
+ CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+ LDFLAGS = -g ${LIBS}
  
-@@ -26,4 +25,4 @@
+@@ -26,4 +25,4 @@ LDFLAGS = -g ${LIBS}
  #CFLAGS += -xtarget=ultra
  
  # compiler and linker
-- 
cgit v1.2.3