ports/124831: Update port: x11/dmenu to 3.7

[Jeroen Schot]

>Number:         124831
>Category:       ports
>Synopsis:       Update port: x11/dmenu to 3.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 21 13:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Jeroen Schot
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD shine 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #4: Tue Apr 29 18:54:18 CEST 2008 schot at shine:/usr/obj/usr/src/sys/MACBOOK i386
>Description:
Attached diff updates the port of x11/dmenu from 3.6 to 3.7.
>How-To-Repeat:
>Fix:
diff -ruN dmenu.orig/Makefile dmenu/Makefile
--- dmenu.orig/Makefile	2008-04-04 21:10:29.000000000 +0200
+++ dmenu/Makefile	2008-06-21 14:58:21.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dmenu
-PORTVERSION=	3.6
+PORTVERSION=	3.7
 CATEGORIES=	x11
 MASTER_SITES=	http://www.suckless.org/download/ \
 		http://schot.a-eskwadraat.nl/files/
@@ -14,7 +14,7 @@
 MAINTAINER=	schot at a-eskwadraat.nl
 COMMENT=	X11 menu application (not only) for the dwm window manager
 
-USE_XORG=	x11
+USE_XORG=	x11 xinerama
 
 MAN1=		dmenu.1
 PLIST_FILES=	bin/dmenu bin/dmenu_path bin/dmenu_run
diff -ruN dmenu.orig/distinfo dmenu/distinfo
--- dmenu.orig/distinfo	2008-04-04 21:10:30.000000000 +0200
+++ dmenu/distinfo	2008-06-21 14:56:17.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (dmenu-3.6.tar.gz) = e39d8e0a77a929a2b80baf44d3dc6019
-SHA256 (dmenu-3.6.tar.gz) = c0183c4e1afa769cdf6a2c98cd354be23674412b6b483e71b22b9bd5e4f07bb7
-SIZE (dmenu-3.6.tar.gz) = 8508
+MD5 (dmenu-3.7.tar.gz) = dbb6c20e1454c414a893fe4361b846b2
+SHA256 (dmenu-3.7.tar.gz) = 60cebbae5f1fc1dbd930c4b43f000cab9b0a64554fa69cedc6dd5d8fc768aaee
+SIZE (dmenu-3.7.tar.gz) = 8478
diff -ruN dmenu.orig/files/patch-config.mk dmenu/files/patch-config.mk
--- dmenu.orig/files/patch-config.mk	2008-04-19 19:54:19.000000000 +0200
+++ dmenu/files/patch-config.mk	2008-06-21 14:57:59.000000000 +0200
@@ -1,6 +1,6 @@
---- config.mk.orig	2007-10-25 20:26:14.000000000 +0200
-+++ config.mk	2007-10-27 00:36:35.000000000 +0200
-@@ -4,19 +4,19 @@
+--- config.mk.orig	2008-06-18 19:20:41.000000000 +0200
++++ config.mk	2008-06-21 14:57:31.000000000 +0200
+@@ -4,11 +4,11 @@
  # Customize below to fit your system
  
  # paths
@@ -14,20 +14,22 @@
 +X11INC = $(LOCALBASE)/include
 +X11LIB = $(LOCALBASE)/lib
  
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC}
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+@@ -19,13 +19,13 @@
+ LIBS = -L/usr/lib -lc -L${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}\"
++CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS+= ${INCS} ${CPPFLAGS}
 +LDFLAGS+= ${LIBS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
  
-@@ -26,4 +26,4 @@
- #CFLAGS += -xtarget=ultra
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
  
  # compiler and linker
 -CC = cc
>Release-Note:
>Audit-Trail:
>Unformatted: