diff options
| author | tonio <tonio@pkgsrc.org> | 2008-12-07 15:46:39 +0000 |
|---|---|---|
| committer | tonio <tonio@pkgsrc.org> | 2008-12-07 15:46:39 +0000 |
| commit | 60ead535cfdc568f8d715fa927f5f4bd615b9320 (patch) | |
| tree | 2bdad25fd22c374975aa58240e0a5ed285f40a89 /wm | |
| parent | a6e61adc5995241c8a2483ed9b4930e5fe4af239 (diff) | |
| download | pkgsrc-60ead535cfdc568f8d715fa927f5f4bd615b9320.tar.gz | |
Update wm/dwm to 5.3.1
No real changelog from upstream, apparently mostly bugfixes
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/dwm/Makefile | 15 | ||||
| -rw-r--r-- | wm/dwm/distinfo | 10 | ||||
| -rw-r--r-- | wm/dwm/patches/patch-aa | 26 |
3 files changed, 29 insertions, 22 deletions
diff --git a/wm/dwm/Makefile b/wm/dwm/Makefile index bcfb764ab1c..316aa39abba 100644 --- a/wm/dwm/Makefile +++ b/wm/dwm/Makefile @@ -1,18 +1,21 @@ -# $NetBSD: Makefile,v 1.5 2008/04/25 07:35:48 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2008/12/07 15:46:39 tonio Exp $ -DISTNAME= dwm-4.9 +DISTNAME= dwm-5.3.1 CATEGORIES= wm -MASTER_SITES= http://suckless.org/download/ +MASTER_SITES= http://code.suckless.org/dl/dwm/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://dwm.suckless.org/ +HOMEPAGE= http://www.suckless.org/dwm/ COMMENT= Dynamic window manager +PKG_DESTDIR_SUPPORT= user-destdir + NO_CONFIGURE= yes +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dwm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/dwm.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/dwm ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/dwm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/dwm/distinfo b/wm/dwm/distinfo index 808743d6e66..1bf0193e9bc 100644 --- a/wm/dwm/distinfo +++ b/wm/dwm/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2008/04/25 07:35:48 wiz Exp $ +$NetBSD: distinfo,v 1.6 2008/12/07 15:46:39 tonio Exp $ -SHA1 (dwm-4.9.tar.gz) = c8ecf932084f626a22efc020764a62aaebd48db5 -RMD160 (dwm-4.9.tar.gz) = 8cd82f10f0ac5852e2c3ab51774df710a29bd8b2 -Size (dwm-4.9.tar.gz) = 18132 bytes -SHA1 (patch-aa) = fa44f979fbd99bf236a53c76d77a03c609bae006 +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 diff --git a/wm/dwm/patches/patch-aa b/wm/dwm/patches/patch-aa index 4ff4247ed99..73ddffbc81d 100644 --- a/wm/dwm/patches/patch-aa +++ b/wm/dwm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2008/04/25 07:35:49 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2008/12/07 15:46:39 tonio Exp $ ---- config.mk.orig 2008-04-03 22:57:01.000000000 +0200 +--- config.mk.orig 2008-12-06 10:33:03.000000000 +0100 +++ config.mk -@@ -4,19 +4,18 @@ VERSION = 4.9 +@@ -4,11 +4,10 @@ VERSION = 5.3.1 # Customize below to fit your system # paths @@ -15,20 +15,24 @@ $NetBSD: patch-aa,v 1.4 2008/04/25 07:35:49 wiz Exp $ +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 -+LIBS = -lc -L${X11LIB} ${COMPILER_RPATH_FLAG}${X11LIB} -lX11 +-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} ++LIBS = -lc -L${X11LIB} ${COMPILER_RPATH_FLAG}${X11LIB} -lX11 ${XINERAMALIBS} # flags --CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" + CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -LDFLAGS = -s ${LIBS} -+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\" -+LDFLAGS += ${LIBS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = -g ${LIBS} ++CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} ++LDFLAGS = ${LIBS} -@@ -25,4 +24,4 @@ LDFLAGS = -s ${LIBS} + # Solaris + #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" #LDFLAGS = ${LIBS} # compiler and linker |