Upgrade to version 5.5.

Work done by Leonardo Taccari in pkgsrc-wip.

Thanks!

3 files changed, 25 insertions, 53 deletions

diff --git a/wm/dwm/Makefile b/wm/dwm/Makefile
index 316aa39abba..6bdd6736706 100644
--- a/wm/dwm/Makefile
+++ b/wm/dwm/Makefile
@@ -1,21 +1,34 @@
-# $NetBSD: Makefile,v 1.6 2008/12/07 15:46:39 tonio Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/14 22:45:12 ahoka Exp $
+#
 
-DISTNAME=	dwm-5.3.1
+DISTNAME=	dwm-5.5
 CATEGORIES=	wm
 MASTER_SITES=	http://code.suckless.org/dl/dwm/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.suckless.org/dwm/
+MAINTAINER=	leot1990@users.sourceforge.net
+HOMEPAGE=	http://dwm.suckless.org/
 COMMENT=	Dynamic window manager
 
+LICENSE=	mit
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	yes
+
+# Adjust config.mk
+SUBST_CLASSES+=		makefile
+SUBST_STAGE.makefile=	pre-build
+SUBST_MESSAGE.makefile=	Fixing config.mk
+SUBST_FILES.makefile=	config.mk
+SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
+SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},'
+SUBST_SED.makefile+=	-e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+=	-e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dwm ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dwm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.include "options.mk"
 
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/dwm/distinfo b/wm/dwm/distinfo
index 1bf0193e9bc..30e2a3a483d 100644
--- a/wm/dwm/distinfo
+++ b/wm/dwm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/12/07 15:46:39 tonio Exp $
+$NetBSD: distinfo,v 1.7 2009/06/14 22:45:12 ahoka Exp $
 
-SHA1 (dwm-5.3.1.tar.gz) = e68a4b4714de434c106e28146dd541d183c1e821
-RMD160 (dwm-5.3.1.tar.gz) = add0e8d07acaed9f4f1a0799d320c1f8f2172470
-Size (dwm-5.3.1.tar.gz) = 18403 bytes
-SHA1 (patch-aa) = c0abe71f7e44eb2c66e1e7350dedc3ff0ee9cd82
+SHA1 (dwm-5.5.tar.gz) = ad756106b1bd3a7429127246f577f2842b3a4fd6
+RMD160 (dwm-5.5.tar.gz) = 045decca40dea064b89b48e86cd2cbe00f546aef
+Size (dwm-5.5.tar.gz) = 17959 bytes
diff --git a/wm/dwm/patches/patch-aa b/wm/dwm/patches/patch-aa
deleted file mode 100644
index 73ddffbc81d..00000000000
--- a/wm/dwm/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/12/07 15:46:39 tonio Exp $
-
---- config.mk.orig	2008-12-06 10:33:03.000000000 +0100
-+++ config.mk
-@@ -4,11 +4,10 @@ VERSION = 5.3.1
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX = ${PREFIX}/${PKGMANDIR}
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = ${X11BASE}/include
-+X11LIB = ${X11BASE}/lib
- 
- # Xinerama, un-comment if you want it
- #XINERAMALIBS = -L${X11LIB} -lXinerama
-@@ -16,16 +15,16 @@ X11LIB = /usr/X11R6/lib
- 
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
-+LIBS = -lc -L${X11LIB} ${COMPILER_RPATH_FLAG}${X11LIB} -lX11 ${XINERAMALIBS}
- 
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS = -s ${LIBS}
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS = ${LIBS}
- 
- # Solaris
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+#CC = cc