pkg/44987: Outdated wm/dwm in pkgsrc-current (patch included)

[bughunting%xs4all.nl@localhost]

>Number:         44987
>Category:       pkg
>Synopsis:       Outdated wm/dwm in pkgsrc-current (patch included)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun May 22 20:40:00 +0000 2011
>Originator:     Bug Hunting
>Release:        n/a
>Organization:
>Environment:
>Description:
The wm/dwm package in pkgsrc-current currently holds dwm version 5.7.2, while
the current upstream release is 5.8.2.  Updating is desired.

Besides, the `MASTER_SITES' variable holds an outdated URL, and two other
small improvements could be made see patches below).
>How-To-Repeat:
With an up-to-date checkout of pkgsrc-current, issue
"cd /usr/pkgsrc/wm/dwm; make package-name"; compare with the current
content of <http://dwm.suckless.org/>.

For `MASTER_SITES', visit <http://code.suckless.org/dl/dwm/> (current definition
of the variable), which will give an HTTP 404 status page.
<http://dl.suckless.org/>, as linked to on <http://www.suckless.org/> (with link
name `code'), is now the correct URL.

See the current Makefile and options.mk files regarding the other two small
improvements; the former holds an unnecessary space in a sed(1) command,
while the latter holds `+=' where it can actually be `=' (as it is the first 
assignment
to the `SUBST_SED.makefile' variable).

For the actual upstream changes, e.g. to include in the CVS commit message),
see
<http://hg.suckless.org/dwm/log/60ea8fed13ab> (dwm-5.8),
<http://hg.suckless.org/dwm/log/1ed1e75c9c2e> (dwm-5.8.1),
and
<http://hg.suckless.org/dwm/log/a043f0800805> (dwm-5.8.2).
>Fix:
Proposed patch, generated with "cd /usr/pkgsrc/wm/dwm; cvs diff -u .",
and tested and found to work correctly:



Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/dwm/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile    18 Oct 2009 12:15:18 -0000      1.10
+++ Makefile    22 May 2011 20:27:36 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.10 2009/10/18 12:15:18 tnn Exp $
 #
 
-DISTNAME=      dwm-5.7.2
+DISTNAME=      dwm-5.8.2
 CATEGORIES=    wm
-MASTER_SITES=  http://code.suckless.org/dl/dwm/
+MASTER_SITES=  http://dl.suckless.org/dwm/
 
 MAINTAINER=    leot1990%users.sourceforge.net@localhost
 HOMEPAGE=      http://dwm.suckless.org/
@@ -19,7 +19,7 @@
 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,/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 += ,'
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/dwm/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo    18 Oct 2009 12:15:18 -0000      1.10
+++ distinfo    22 May 2011 20:27:36 -0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2009/10/18 12:15:18 tnn Exp $
+$NetBSD$
 
-SHA1 (dwm-5.7.2.tar.gz) = f374ab15033500276eab61ac5002b2cd05f8cbc7
-RMD160 (dwm-5.7.2.tar.gz) = 8fc6cc10ca6b0c6ae69fdf0f6122e015b849c7a1
-Size (dwm-5.7.2.tar.gz) = 19989 bytes
+SHA1 (dwm-5.8.2.tar.gz) = ee4fecee6b404969884088cafba14d538c77b9f9
+RMD160 (dwm-5.8.2.tar.gz) = 5cdc22af7b7d223ef935dc65eae7c8f3630b2b76
+Size (dwm-5.8.2.tar.gz) = 20326 bytes
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/dwm/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- options.mk  15 Jun 2009 08:17:43 -0000      1.1
+++ options.mk  22 May 2011 20:27:36 -0000
@@ -19,6 +19,6 @@
 SUBST_STAGE.options=   pre-build
 SUBST_MESSAGE.options= Toggle the Xinerama support
 SUBST_FILES.options=   config.mk
-SUBST_SED.options+=    -e '/^XINERAMA/ d'
+SUBST_SED.options+=    -e '/^XINERAMA/d'
 .  include "../../x11/libX11/buildlink3.mk"
 .endif