From nobody@FreeBSD.org  Sat May 29 17:37:27 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE13F1065675
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 29 May 2010 17:37:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id ACF488FC1B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 29 May 2010 17:37:27 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4THbRtn001058
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 29 May 2010 17:37:27 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o4THbREV001057;
	Sat, 29 May 2010 17:37:27 GMT
	(envelope-from nobody)
Message-Id: <201005291737.o4THbREV001057@www.freebsd.org>
Date: Sat, 29 May 2010 17:37:27 GMT
From: Demelier David <demelier.david@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: x11-wm/dwm and x11/dmenu update
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         147192
>Category:       ports
>Synopsis:       x11-wm/dwm and x11/dmenu update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 29 17:40:05 UTC 2010
>Closed-Date:    Sat Jun 05 11:29:59 UTC 2010
>Last-Modified:  Sat Jun  5 11:30:14 UTC 2010
>Originator:     Demelier David
>Release:        8.1-PRERELEASE
>Organization:
>Environment:
FreeBSD Melon.malikania.fr 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Sat May 29 11:00:37 CEST 2010     root@Melon.malikania.fr:/usr/obj/usr/src/sys/Melon  amd64

>Description:
dmenu, dwm were updated. The announcement was here :

http://lists.suckless.org/dev/1005/4377.html

This small PR is sent to update these both ports.
>How-To-Repeat:

>Fix:
--- Makefile.orig	2010-05-29 19:07:25.000000000 +0200
+++ Makefile	2010-05-29 19:08:24.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dwm
-PORTVERSION=	5.7.2
+PORTVERSION=	5.8.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dl.suckless.org/${PORTNAME}/ \
 		http://schot.a-eskwadraat.nl/files/
--- distinfo.orig	2009-12-07 15:19:50.000000000 +0100
+++ distinfo	2010-05-29 19:08:33.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (dwm-5.7.2.tar.gz) = a0b8a799ddc5034dd8a818c9bd76f3a3
-SHA256 (dwm-5.7.2.tar.gz) = 32bffe33d5da9cec55de7e6b215568ff9950cc24b93aca72e7097437a2bfcde0
-SIZE (dwm-5.7.2.tar.gz) = 19989
+MD5 (dwm-5.8.1.tar.gz) = a6f786addf9fb3240cc2246a346330ca
+SHA256 (dwm-5.8.1.tar.gz) = a9a42f493a7f0dfae09f5c38d94e83d7bf86763c691103f9187818ed53a334b1
+SIZE (dwm-5.8.1.tar.gz) = 20035
--- files/patch-config.mk.orig	2010-05-29 19:23:52.000000000 +0200
+++ files/patch-config.mk	2010-05-29 19:24:46.000000000 +0200
@@ -1,5 +1,5 @@
---- config.mk.orig	2009-07-14 20:07:55.000000000 +0200
-+++ config.mk	2009-07-20 13:29:40.000000000 +0200
+--- config.mk.orig	2010-05-29 19:10:33.000000000 +0200
++++ config.mk	2010-05-29 19:14:06.000000000 +0200
 @@ -4,11 +4,11 @@
  # Customize below to fit your system
  
@@ -14,23 +14,23 @@
 +X11INC = $(LOCALBASE)/include
 +X11LIB = $(LOCALBASE)/lib
  
- # Xinerama, un-comment if you want it
+ # Xinerama
  XINERAMALIBS = -L${X11LIB} -lXinerama
-@@ -19,15 +19,15 @@
+@@ -19,10 +19,10 @@
  LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
  
  # flags
 -CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
 +CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS+= -std=c99 ${INCS} ${CPPFLAGS}
- #LDFLAGS = -g ${LIBS}
--LDFLAGS = -s ${LIBS}
-+LDFLAGS+=  ${LIBS}
++CFLAGS+= -g -std=c99 ${INCS} ${CPPFLAGS}
+ #CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++LDFLAGS+= -g ${LIBS}
+ #LDFLAGS = -s ${LIBS}
  
  # Solaris
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+@@ -30,4 +30,4 @@
  #LDFLAGS = ${LIBS}
  
  # compiler and linker




--- Makefile.orig	2010-05-29 19:28:19.000000000 +0200
+++ Makefile	2010-05-29 19:30:25.000000000 +0200
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	dmenu
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	4.1.1
 CATEGORIES=	x11
-MASTER_SITES=	http://code.suckless.org/dl/tools/ \
-		http://schot.a-eskwadraat.nl/files/
+MASTER_SITES=	http://dl.suckless.org/tools/ \
 PATCH_SITES=	http://schot.a-eskwadraat.nl/files/
 
 MAINTAINER=	schot@a-eskwadraat.nl
--- distinfo.orig	2010-05-29 19:28:13.000000000 +0200
+++ distinfo	2010-05-29 19:31:09.000000000 +0200
@@ -1,6 +1,3 @@
-MD5 (dmenu-4.0.tar.gz) = 66e761a653930cc8a21614ba9fedf903
-SHA256 (dmenu-4.0.tar.gz) = c04508285e21a1fc055b76890ec47e9956d8edc4d460dbcac59f96f061b2e862
-SIZE (dmenu-4.0.tar.gz) = 8576
-MD5 (dmenu-4.0-xft.diff) = e259bf32b4ff15d345581f934ba99e46
-SHA256 (dmenu-4.0-xft.diff) = d7bbc1883453ef2d1025111fec48831f453c586007349a13ba2ab4b54177fd15
-SIZE (dmenu-4.0-xft.diff) = 8596
+MD5 (dmenu-4.1.1.tar.gz) = 931896a199741c23be945e8519a81c1d
+SHA256 (dmenu-4.1.1.tar.gz) = 9e5f775ae62169520aeb5707f72f8a843552becf776abbd7bcb6ba11fd41e60a
+SIZE (dmenu-4.1.1.tar.gz) = 9351


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat May 29 19:40:07 UTC 2010 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147192 
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sun May 30 08:23:51 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147192 

From: Max Brazhnikov <makc@freebsd.org>
To: bug-followup@freebsd.org, schot@a-eskwadraat.nl
Cc:  
Subject: Re: ports/147192: x11-wm/dwm and x11/dmenu update
Date: Sun, 30 May 2010 12:29:20 +0400

 Maintainer of x11-wm/dwm,
  
 Please note that PR ports/147192 has just been submitted.
  
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
  
 The full text of the PR can be found at:
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147192
State-Changed-From-To: open->feedback 
State-Changed-By: makc 
State-Changed-When: Sun May 30 08:30:15 UTC 2010 
State-Changed-Why:  
Awaiting maintainers approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147192 

From: Jeroen Schot <schot@A-Eskwadraat.nl>
To: bug-followup@freebsd.org
Cc: Demelier David <demelier.david@gmail.com>,
	Max Brazhnikov <makc@freebsd.org>
Subject: Re: ports/147192: x11-wm/dwm and x11/dmenu update
Date: Mon, 31 May 2010 11:51:45 +0200

 x11-wm/dwm is already updated to 5.8 in FreeBSD (see PR ports/147161).
 Attached diff updates dwm from 5.8 to 5.8.1.
 
 For x11/dmenu I am waiting for an updated version of the XFT patch. Or
 would it be better to disable XFT for 4.1.1 and re enable it in a next
 revision?
 
 -- Jeroen Schot
 
 diff -ruN dwm.orig/Makefile dwm/Makefile
 --- dwm.orig/Makefile	2010-05-31 01:37:39.000000000 +0200
 +++ dwm/Makefile	2010-05-31 11:45:53.000000000 +0200
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	dwm
 -PORTVERSION=	5.8
 +PORTVERSION=	5.8.1
  CATEGORIES=	x11-wm
  MASTER_SITES=	http://dl.suckless.org/${PORTNAME}/ \
  		http://schot.a-eskwadraat.nl/files/
 diff -ruN dwm.orig/distinfo dwm/distinfo
 --- dwm.orig/distinfo	2010-05-31 01:37:39.000000000 +0200
 +++ dwm/distinfo	2010-05-31 11:44:35.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (dwm-5.8.tar.gz) = a0143b29c17545ac292b69cae3646d83
 -SHA256 (dwm-5.8.tar.gz) = 34a00ad6a0b51a187a5b9396ff48256330cf09c23caccd6c1c75db84302b9b2e
 -SIZE (dwm-5.8.tar.gz) = 20165
 +MD5 (dwm-5.8.1.tar.gz) = a6f786addf9fb3240cc2246a346330ca
 +SHA256 (dwm-5.8.1.tar.gz) = a9a42f493a7f0dfae09f5c38d94e83d7bf86763c691103f9187818ed53a334b1
 +SIZE (dwm-5.8.1.tar.gz) = 20035

From: Jeroen Schot <schot@A-Eskwadraat.nl>
To: bug-followup@freebsd.org
Cc: Demelier David <demelier.david@gmail.com>,
	Max Brazhnikov <makc@freebsd.org>
Subject: Re: ports/147192: x11-wm/dwm and x11/dmenu update
Date: Mon, 31 May 2010 15:46:35 +0200

 Thanks to Ashish SHUKLA the XFT patch is updated for dmenu 4.1.1.
 Attached diff updates x11/dmenu from 4.0 to 4.1.1 and keeps optional
 XFT support.
 
 -- Jeroen Schot
 
 diff -ruN dmenu.orig/Makefile dmenu/Makefile
 --- dmenu.orig/Makefile	2010-05-16 12:17:48.000000000 +0200
 +++ dmenu/Makefile	2010-05-31 15:32:12.000000000 +0200
 @@ -6,10 +6,9 @@
  #
  
  PORTNAME=	dmenu
 -PORTVERSION=	4.0
 -PORTREVISION=	1
 +PORTVERSION=	4.1.1
  CATEGORIES=	x11
 -MASTER_SITES=	http://code.suckless.org/dl/tools/ \
 +MASTER_SITES=	http://dl.suckless.org/tools/ \
  		http://schot.a-eskwadraat.nl/files/
  PATCH_SITES=	http://schot.a-eskwadraat.nl/files/
  
 @@ -31,6 +30,16 @@
  USE_XORG+=	xft
  .endif
  
 +pre-everything::
 +	@${ECHO_MSG} "You can build dmenu with your own config.h using the DMENU_CONF knob:"
 +	@${ECHO_MSG} "make DMENU_CONF=/path/to/dmenu/config.h install clean"
 +
 +post-extract:
 +.if defined(DMENU_CONF)
 +	@${ECHO_MSG} "creating config.h from ${DMENU_CONF}"
 +	@${CP} ${DMENU_CONF} ${WRKSRC}/config.h
 +.endif
 +
  post-patch:
  	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} \
  	         -e "s,%%PREFIX%%,${PREFIX},g" \
 diff -ruN dmenu.orig/distinfo dmenu/distinfo
 --- dmenu.orig/distinfo	2010-05-16 12:16:20.000000000 +0200
 +++ dmenu/distinfo	2010-05-31 15:28:40.000000000 +0200
 @@ -1,6 +1,6 @@
 -MD5 (dmenu-4.0.tar.gz) = 66e761a653930cc8a21614ba9fedf903
 -SHA256 (dmenu-4.0.tar.gz) = c04508285e21a1fc055b76890ec47e9956d8edc4d460dbcac59f96f061b2e862
 -SIZE (dmenu-4.0.tar.gz) = 8576
 -MD5 (dmenu-4.0-xft.diff) = e259bf32b4ff15d345581f934ba99e46
 -SHA256 (dmenu-4.0-xft.diff) = d7bbc1883453ef2d1025111fec48831f453c586007349a13ba2ab4b54177fd15
 -SIZE (dmenu-4.0-xft.diff) = 8596
 +MD5 (dmenu-4.1.1.tar.gz) = 931896a199741c23be945e8519a81c1d
 +SHA256 (dmenu-4.1.1.tar.gz) = 9e5f775ae62169520aeb5707f72f8a843552becf776abbd7bcb6ba11fd41e60a
 +SIZE (dmenu-4.1.1.tar.gz) = 9351
 +MD5 (dmenu-4.1.1-xft.diff) = 8547edd9b9e46869e17023eb073a8fac
 +SHA256 (dmenu-4.1.1-xft.diff) = f74d68881d3fba05c77a0483f2e9faf1e16b57d526680df36c79262c4eff13e3
 +SIZE (dmenu-4.1.1-xft.diff) = 10230
State-Changed-From-To: feedback->open 
State-Changed-By: makc 
State-Changed-When: Tue Jun 1 23:03:27 UTC 2010 
State-Changed-Why:  
Feedback received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147192 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sat Jun 5 11:29:58 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147192 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/147192: commit references a PR
Date: Sat,  5 Jun 2010 11:29:19 +0000 (UTC)

 makc        2010-06-05 11:29:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11/dmenu            Makefile distinfo 
   Log:
   Update to 4.1.1
   
   PR:             ports/147192
   Submitted by:   Demelier David <demelier.david at gmail.com>
   Reviewed by:    Jeroen Schot (maintainer)
   
   Revision  Changes    Path
   1.30      +12 -3     ports/x11/dmenu/Makefile
   1.28      +6 -6      ports/x11/dmenu/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/147192: commit references a PR
Date: Sat,  5 Jun 2010 11:29:29 +0000 (UTC)

 makc        2010-06-05 11:29:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/dwm           Makefile distinfo 
   Log:
   Update to 5.8.1
   
   PR:             ports/147192
   Submitted by:   Demelier David <demelier.david at gmail.com>
   Reviewed by:    Jeroen Schot (maintainer)
   
   Revision  Changes    Path
   1.47      +1 -1      ports/x11-wm/dwm/Makefile
   1.45      +3 -3      ports/x11-wm/dwm/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
