pkg/45763: Outdated x11/dmenu package in pkgsrc-current (4.1.1 vs. 4.4.1); patch included

[bughunting%xs4all.nl@localhost]

>Number:         45763
>Category:       pkg
>Synopsis:       Outdated x11/dmenu package in pkgsrc-current (4.1.1 vs. 
>4.4.1); patch included
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Dec 31 04:10:00 +0000 2011
>Originator:     Bug Hunting
>Release:        
>Organization:
>Environment:
>Description:
The x11/dmenu package in pkgsrc-current currently holds dmenu-4.1.1, while
the current upstream release is 4.4.1.  Updating is desired.

There is no clear upstream changelog, but changes in the releases between
4.4.1 and (up and until) 4.4.1 can be found on <http://hg.suckless.org/dmenu>
or taken from the project's Mercurial repository
("hg clone http://hg.suckless.org/dmenu";); alternatively, here's a list of 
mailing
list release announcements, along with the main contents of those messages:

<http://lists.suckless.org/dev/1011/6434.html> (4.2):
``This release contains plenty code cleanups''

<http://lists.suckless.org/dev/1011/6441.html> (4.2.1):
``there were two missing files in yesterdays dmenu-4.2.tar.gz, hence I 
recreated a new bugfix release''

<http://lists.suckless.org/dev/1105/7949.html> (4.3):
``I've just released dmenu-4.3, which is basically smaller and faster.''

<http://lists.suckless.org/dev/1105/7950.html> (4.3.1):
``And a quick bugfix release, 4.3.1, sigh.''

<http://lists.suckless.org/dev/1107/8936.html> (4.4):
``I've just released dmenu-4.4. It fixes some bugs and it should be 
slightly nippier, especially if your path is, ahem, broken.''

<http://lists.suckless.org/dev/1109/9336.html> (4.4.1):
``I've released a small dmenu update, 4.4.1, which fixes a small bug in 
the font loading, and changes dmenu_run to let you use shell logic 
(foo && bar, etc).''

Additional pkgsrc package changes as included in the proposed patch below:

- update `DESCR' to reflect the current description text as taken from
  <http://tools.suckless.org/dmenu>;
- alter the Makefile to accept an undefined amount of space characters in
  the distfile's config.mk file (the amount of space characters in the lines in
  config.mk that define `CFLAGS' en `LDFLAGS' _did_ indeed change between
  release 4.1.1 and 4.4.1, probably to make it better outline); the proposed
  change accepts potential future changes in the amount of space characters
  there (without this change in Makefile the package built fine, but the program
  itself (i.e., dmenu(1)) was not able to run -- thus, this change is really 
needed);
- in options.mk, remove an unneeded space character in a sed(1) command.

When the package is updated, the relevant line from doc/TODO (added with
v1.10579) can be deleted; additionally, doc/CHANGES-201? should
obviously be updated accordingly as well.
>How-To-Repeat:
With an up-to-date checkout of pkgsrc-current, issue
"cd /usr/pkgsrc/x11/dmenu; make package-name"; compare with the
current contents of <http://tools.suckless.org/dmenu>.
>Fix:
Apply the following proposed patch, generated with
"cd /usr/pkgsrc/; cvs diff -u x11/dmenu > patchfile" and created,
tested, and found to work correctly on NetBSD/i386 (the MD5 sum of this
patch is 44b3a8bfbb4a0bca04d2ce917fea1d2f; please verify it before
applying):

Index: x11/dmenu/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/x11/dmenu/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- x11/dmenu/DESCR     14 Jun 2009 22:48:51 -0000      1.2
+++ x11/dmenu/DESCR     31 Dec 2011 03:58:20 -0000
@@ -1,3 +1,2 @@
-dynamic menu is a generic menu for X, originally designed for dwm (wm/dwm).
-It manages huge amounts (up to 10.000 and more) of user defined menu items
-efficiently.
+dmenu is a dynamic menu for X, originally designed for dwm (wm/dwm).
+It manages large numbers of user-defined menu items efficiently.
Index: x11/dmenu/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/dmenu/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- x11/dmenu/Makefile  17 Jun 2011 11:47:30 -0000      1.7
+++ x11/dmenu/Makefile  31 Dec 2011 03:58:20 -0000
@@ -1,14 +1,13 @@
 # $NetBSD: Makefile,v 1.7 2011/06/17 11:47:30 obache Exp $
 #
 
-DISTNAME=      dmenu-4.1.1
+DISTNAME=      dmenu-4.4.1
 CATEGORIES=    x11
 MASTER_SITES=  http://dl.suckless.org/tools/
 
 MAINTAINER=    leot1990%users.sourceforge.net@localhost
 HOMEPAGE=      http://tools.suckless.org/dmenu
 COMMENT=       Dynamic menu for X
-
 LICENSE=       mit
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -25,8 +24,8 @@
 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,^CFLAGS *= ,CFLAGS += ,'
+SUBST_SED.makefile+=   -e 's,^LDFLAGS *= ,LDFLAGS += ,'
 SUBST_SED.makefile+=   -e 's/cc/${CC:Q}/'
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
Index: x11/dmenu/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/dmenu/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- x11/dmenu/PLIST     14 Jun 2009 22:48:51 -0000      1.3
+++ x11/dmenu/PLIST     31 Dec 2011 03:58:20 -0000
@@ -1,5 +1,6 @@
 @comment $NetBSD: PLIST,v 1.3 2009/06/14 22:48:51 ahoka Exp $
 bin/dmenu
-bin/dmenu_path
 bin/dmenu_run
+bin/lsx
 man/man1/dmenu.1
+man/man1/lsx.1
Index: x11/dmenu/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/dmenu/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- x11/dmenu/distinfo  2 Jul 2010 21:48:49 -0000       1.5
+++ x11/dmenu/distinfo  31 Dec 2011 03:58:20 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.5 2010/07/02 21:48:49 ghen Exp $
 
-SHA1 (dmenu-4.1.1.tar.gz) = 5d41d9cbf68960863623d821962c31cac92d92fc
-RMD160 (dmenu-4.1.1.tar.gz) = 3683f9dc620b16b39dc531e49402d37bec78f123
-Size (dmenu-4.1.1.tar.gz) = 9351 bytes
+SHA1 (dmenu-4.4.1.tar.gz) = 42f8bb4b8bf72840cc343f0b3f31975a22350e5a
+RMD160 (dmenu-4.4.1.tar.gz) = 4a15486eaf19fdde93e763ec340001e5e74ac2a4
+Size (dmenu-4.4.1.tar.gz) = 9318 bytes
Index: x11/dmenu/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/dmenu/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- x11/dmenu/options.mk        15 Jun 2009 08:18:20 -0000      1.1
+++ x11/dmenu/options.mk        31 Dec 2011 03:58:20 -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