[pkgsrc/trunk]: pkgsrc/x11/dmenu Update to dmenu 3.9. Changes unlisted, at l...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36cdd55df94a
branches:  trunk
changeset: 555555:36cdd55df94a
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Thu Mar 05 09:26:18 2009 +0000

description:
Update to dmenu 3.9.  Changes unlisted, at least Xinerama support.

diffstat:

 x11/dmenu/Makefile         |   8 +++++---
 x11/dmenu/distinfo         |  10 +++++-----
 x11/dmenu/patches/patch-aa |  24 +++++++++++++++---------
 3 files changed, 25 insertions(+), 17 deletions(-)

diffs (82 lines):

diff -r d8b3e4157f16 -r 36cdd55df94a x11/dmenu/Makefile
--- a/x11/dmenu/Makefile        Thu Mar 05 09:21:53 2009 +0000
+++ b/x11/dmenu/Makefile        Thu Mar 05 09:26:18 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/04/04 20:28:05 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2009/03/05 09:26:18 ghen Exp $
 
-DISTNAME=              dmenu-3.6
+DISTNAME=              dmenu-3.9
 CATEGORIES=            x11
-MASTER_SITES=          http://www.suckless.org/download/
+MASTER_SITES=          http://code.suckless.org/dl/tools/
 
 MAINTAINER=            ghen%NetBSD.org@localhost
 HOMEPAGE=              http://www.suckless.org/wiki/tools/xlib
@@ -10,5 +10,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d8b3e4157f16 -r 36cdd55df94a x11/dmenu/distinfo
--- a/x11/dmenu/distinfo        Thu Mar 05 09:21:53 2009 +0000
+++ b/x11/dmenu/distinfo        Thu Mar 05 09:26:18 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/04/04 20:28:05 ghen Exp $
+$NetBSD: distinfo,v 1.3 2009/03/05 09:26:18 ghen Exp $
 
-SHA1 (dmenu-3.6.tar.gz) = 9570e160318075cfe6a6e967f9c73d1a2d097e15
-RMD160 (dmenu-3.6.tar.gz) = 7d2b660a1d563338a4597f23e48a9b1671ee7a29
-Size (dmenu-3.6.tar.gz) = 8508 bytes
-SHA1 (patch-aa) = 7e0f28441a2c6dca05d1afcf931763444bd2dc0d
+SHA1 (dmenu-3.9.tar.gz) = 9575cf9225de45ae3eb180aaddff2f5e5a662942
+RMD160 (dmenu-3.9.tar.gz) = 76dae0e752f9ae9d24d15568aaf80ec927301414
+Size (dmenu-3.9.tar.gz) = 8582 bytes
+SHA1 (patch-aa) = 99626aa65ab51da724372882b97f6c0ed4594701
diff -r d8b3e4157f16 -r 36cdd55df94a x11/dmenu/patches/patch-aa
--- a/x11/dmenu/patches/patch-aa        Thu Mar 05 09:21:53 2009 +0000
+++ b/x11/dmenu/patches/patch-aa        Thu Mar 05 09:26:18 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/01/06 21:45:07 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2009/03/05 09:26:18 ghen Exp $
 
---- config.mk.orig     2007-10-25 20:26:14.000000000 +0200
+--- config.mk.orig     2008-09-09 21:45:00.000000000 +0200
 +++ config.mk
-@@ -4,19 +4,18 @@ VERSION = 3.4
+@@ -4,11 +4,10 @@ VERSION = 3.9
  # Customize below to fit your system
  
  # paths
@@ -15,16 +15,22 @@
 +X11INC = ${X11BASE}/include
 +X11LIB = ${X11BASE}/lib
  
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+@@ -16,12 +15,12 @@ XINERAMAFLAGS = -DXINERAMA
+ 
  # includes and libs
  INCS = -I. -I/usr/include -I${X11INC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 +LIBS = -lc -L${X11LIB} ${COMPILER_RPATH_FLAG}${X11LIB}${X11LIB} -lX11
  
  # 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 += -s ${LIBS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
++CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += -s ${LIBS} ${XINERAMALIBS}
  
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"