From b83a950cb2b175c849b15c8aa478dff504e072be Mon Sep 17 00:00:00 2001
From: Phillip Warner
Date: Tue, 12 Jul 2011 05:06:04 -0400
Subject: desktop/dmenu: Updated for version 4.3.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 desktop/dmenu/dmenu-4.0-libdir_cflags_fixups.diff  | 26 ----------------------
 .../dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff    | 26 ++++++++++++++++++++++
 desktop/dmenu/dmenu.SlackBuild                     |  4 ++--
 desktop/dmenu/dmenu.info                           |  8 +++----
 4 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 desktop/dmenu/dmenu-4.0-libdir_cflags_fixups.diff
 create mode 100644 desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff

(limited to 'desktop/dmenu')

diff --git a/desktop/dmenu/dmenu-4.0-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.0-libdir_cflags_fixups.diff
deleted file mode 100644
index b8e009ff3c..0000000000
--- a/desktop/dmenu/dmenu-4.0-libdir_cflags_fixups.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur dmenu-4.0.orig/config.mk dmenu-4.0/config.mk
---- dmenu-4.0.orig/config.mk	2009-04-18 06:50:04.000000000 -0500
-+++ dmenu-4.0/config.mk	2009-08-03 00:32:57.258455322 -0500
-@@ -6,6 +6,7 @@
- # paths
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
-+LIBDIR = /usr/local/lib
- 
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -16,11 +17,12 @@
- 
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
-+LIBS = -L${LIBDIR} -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
- 
- # flags
-+OPTS ?= -Os
- CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
- LDFLAGS = -s ${LIBS}
- 
- # Solaris
diff --git a/desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff
new file mode 100644
index 0000000000..e8fe33c223
--- /dev/null
+++ b/desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff
@@ -0,0 +1,26 @@
+diff -Naur dmenu-4.3.1-orig/config.mk dmenu-4.3.1/config.mk
+--- dmenu-4.3.1-orig/config.mk	2011-05-18 12:02:16.000000000 -0400
++++ dmenu-4.3.1/config.mk	2011-06-25 18:13:35.000000000 -0400
+@@ -4,6 +4,7 @@
+ # paths
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
++LIBDIR = /usr/local/lib
+ 
+ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+@@ -14,11 +15,12 @@
+ 
+ # includes and libs
+ INCS = -I${X11INC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
++LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS}
+ 
+ # flags
++OPTS ?= -Os
+ CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS   = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
++CFLAGS   = -ansi -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
+ LDFLAGS  = -s ${LIBS}
+ 
+ # compiler and linker
diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild
index 246c338b03..d80cce71a6 100644
--- a/desktop/dmenu/dmenu.SlackBuild
+++ b/desktop/dmenu/dmenu.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by Phillip Warner for version >= 4.0
 
 PRGNAM=dmenu
-VERSION=4.1.1
+VERSION=4.3.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,7 @@ find . \
  -exec chmod 644 {} \;
 
 # Fixup the CFLAGS and LIBDIR settings to prevent multilib conflicts
-patch -p1 < $CWD/dmenu-4.0-libdir_cflags_fixups.diff
+patch -p1 < $CWD/dmenu-4.3.1-libdir_cflags_fixups.diff
 
 make install \
   OPTS="$SLKCFLAGS" \
diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info
index 63563f4060..14997c0e0a 100644
--- a/desktop/dmenu/dmenu.info
+++ b/desktop/dmenu/dmenu.info
@@ -1,10 +1,10 @@
 PRGNAM="dmenu"
-VERSION="4.1.1"
+VERSION="4.3.1"
 HOMEPAGE="http://tools.suckless.org/dmenu"
-DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.1.1.tar.gz"
-MD5SUM="931896a199741c23be945e8519a81c1d"
+DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.3.1.tar.gz"
+MD5SUM="6b619f6901bf4765442b4e410b1e5410"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Phillip Warner"
 EMAIL="pc_warner@yahoo.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
-- 
cgit v1.2.3