4 files changed, 29 insertions, 22 deletions

diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index e5d209d2e68b..9d981f6756fe 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dwm
-PORTVERSION=	3.2.2
+PORTVERSION=	3.4
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://suckless.org/download/ \
+MASTER_SITES=	http://www.suckless.org/download/ \
 		http://schot.a-eskwadraat.nl/files/
 
 MAINTAINER=	schot@a-eskwadraat.nl
@@ -16,17 +16,22 @@ COMMENT=	A dynamic, small, fast and simple window manager
 
 USE_XLIB=	yes
 
-pre-everything::
-		@${ECHO} ==================================================================
-		@${ECHO} You may build dwm with your own config.h, just use DWM_CONF knob:
-		@${ECHO} make DWM_CONF=/path/to/dwm/config.h install clean
-		@${ECHO} ==================================================================
+MAN1=		dwm.1
+PLIST_FILES=	bin/dwm
 
 .if defined(DWM_CONF)
-	@${CP} {$DWM_CONF} ${WRKSRC}/config.h
+PKGNAMESUFFIX=-custom
 .endif
 
-MAN1=		dwm.1
-PLIST_FILES=	bin/dwm
+pre-everything::
+	@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"
+	@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
+	@${ECHO_MSG} "Note: Pre-3.2 config.h-files no longer work."
+
+post-extract:
+.if defined(DWM_CONF)
+	@${ECHO_MSG} "creating config.h from ${DWM_CONF}"
+	@${CP} ${DWM_CONF} ${WRKSRC}/config.h
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/dwm/distinfo b/x11-wm/dwm/distinfo
index 9d8daac545c3..315bbc8295b4 100644
--- a/x11-wm/dwm/distinfo
+++ b/x11-wm/dwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (dwm-3.2.2.tar.gz) = 14b9bbfc0d36117c135de5eaba50c880
-SHA256 (dwm-3.2.2.tar.gz) = dc7086619242fe1e661dcb27e850a2f431fcee8dbf246b46ea9d5d23784fd6cc
-SIZE (dwm-3.2.2.tar.gz) = 17388
+MD5 (dwm-3.4.tar.gz) = fb4ca53999b4c830b8e5e5c73e93deac
+SHA256 (dwm-3.4.tar.gz) = 654b300a8e63b8a88f93b304e08a50bae2d4261c8e9570a46aaa3d4f1675e4bb
+SIZE (dwm-3.4.tar.gz) = 17532
diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk
index 8576b3ef5d09..c14153ca1c40 100644
--- a/x11-wm/dwm/files/patch-config.mk
+++ b/x11-wm/dwm/files/patch-config.mk
@@ -1,12 +1,12 @@
---- config.mk.orig     Mon Aug  7 08:52:49 2006
-+++ config.mk  Mon Aug  7 13:12:07 2006
-@@ -4,21 +4,21 @@
+--- config.mk.orig	Wed Feb  7 12:42:14 2007
++++ config.mk	Thu Feb  8 12:43:49 2007
+@@ -4,18 +4,18 @@
  # Customize below to fit your system
  
  # paths
 -PREFIX = /usr/local
 -MANPREFIX = ${PREFIX}/share/man
-+PREFIX ?= /usr/local
++PREFIX?= /usr/local
 +MANPREFIX = ${PREFIX}/man
  
 -X11INC = /usr/X11R6/include
@@ -24,7 +24,9 @@
  LDFLAGS = ${LIBS}
  #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
  #LDFLAGS = -g ${LIBS}
+@@ -26,4 +26,4 @@
+ #CFLAGS += -xtarget=ultra
  
- # compiler
+ # compiler and linker
 -CC = cc
 +CC?= cc
diff --git a/x11-wm/dwm/pkg-descr b/x11-wm/dwm/pkg-descr
index c6e14b511279..6cf94eec9020 100644
--- a/x11-wm/dwm/pkg-descr
+++ b/x11-wm/dwm/pkg-descr
@@ -2,8 +2,8 @@ dwm is a minimalistic window manager. It manages windows in tiling and floating
 modes, much like ion, larswm and wmii. dwm however is much smaller, faster and
 simpler.
 
-It consists of a single binary and configuration is done by editing the source
-code, which makes it fast and secure. dwm reads from standard input to print
-arbitrary status text such as the date and/or system load.
+It consists of a single binary, configuration is done at compile-time by a
+single config.h file. dwm reads from standard input to print arbitrary status
+text such as the date and/or system load.
 
-WWW: http://dwm.suckless.org/
+WWW: http://www.suckless.org/wiki/dwm