From nobody@FreeBSD.org  Wed Aug  2 17:46:10 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E1C1616A4DF
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  2 Aug 2006 17:46:10 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8FE8243D45
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  2 Aug 2006 17:46:10 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k72HkAp2000387
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 2 Aug 2006 17:46:10 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k72HkApc000384;
	Wed, 2 Aug 2006 17:46:10 GMT
	(envelope-from nobody)
Message-Id: <200608021746.k72HkApc000384@www.freebsd.org>
Date: Wed, 2 Aug 2006 17:46:10 GMT
From: Jeroen Schot <schot@a-eskwadraat.nl>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: x11-wm/dwm to 0.6
X-Send-Pr-Version: www-2.3

>Number:         101273
>Category:       ports
>Synopsis:       Update port: x11-wm/dwm to 0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 02 17:50:19 GMT 2006
>Closed-Date:    Sat Aug 05 10:11:20 GMT 2006
>Last-Modified:  Sat Aug 05 10:11:20 GMT 2006
>Originator:     Jeroen Schot
>Release:        6.1
>Organization:
>Environment:
FreeBSD vocal 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May  7 04:32:43 UTC 2006     root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Update the port of dwm from 0.5 to 0.6.
>How-To-Repeat:

>Fix:
diff -ur dwm.orig/Makefile dwm/Makefile
--- dwm.orig/Makefile   Wed Aug  2 19:27:43 2006
+++ dwm/Makefile        Wed Aug  2 19:34:40 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      dwm
-PORTVERSION=   0.5
+PORTVERSION=   0.6
 CATEGORIES=    x11-wm
 MASTER_SITES=  http://10kloc.org/download/ \
                http://schot.a-eskwadraat.nl/files/
@@ -18,5 +18,8 @@
 
 MAN1=          dwm.1
 PLIST_FILES=   bin/dwm
+
+post-patch:
+       ${CP} ${WRKSRC}/config.default.h ${WRKSRC}/config.h
 
 .include <bsd.port.mk>
diff -ur dwm.orig/distinfo dwm/distinfo
--- dwm.orig/distinfo   Wed Aug  2 19:27:43 2006
+++ dwm/distinfo        Wed Aug  2 19:08:48 2006
@@ -1,3 +1,3 @@
-MD5 (dwm-0.5.tar.gz) = e8dfa2d3502d6bc9aeb9f0f21ab2dec5
-SHA256 (dwm-0.5.tar.gz) = d025d5a43dc09fa81985ea41363cd2dbc967a8923d6b62a930a7238a56ca1473
-SIZE (dwm-0.5.tar.gz) = 13795
+MD5 (dwm-0.6.tar.gz) = be86556b42a6aef84c99a5774a5acd46
+SHA256 (dwm-0.6.tar.gz) = 3e460f2f736a56972da800d5e96d63bc164de087f984cc516055abdb5e547563
+SIZE (dwm-0.6.tar.gz) = 13998
diff -ur dwm.orig/files/patch-config.mk dwm/files/patch-config.mk
--- dwm.orig/files/patch-config.mk      Wed Aug  2 19:27:43 2006
+++ dwm/files/patch-config.mk   Wed Aug  2 19:17:45 2006
@@ -1,7 +1,7 @@
---- config.mk.orig     Fri Jul 21 21:14:42 2006
-+++ config.mk  Sat Jul 29 21:01:26 2006
-@@ -1,11 +1,11 @@
- # Customize to fit your system
+--- config.mk.orig     Wed Aug  2 18:59:04 2006
++++ config.mk  Wed Aug  2 19:00:14 2006
+@@ -4,21 +4,21 @@
+ # Customize below to fit your system
  
  # paths
 -PREFIX = /usr/local
@@ -14,21 +14,17 @@
 +X11INC = $(X11BASE)/include
 +X11LIB = $(X11BASE)/lib
  
- VERSION = 0.5
- 
-@@ -13,7 +13,7 @@
- LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
- 
- # Linux/BSD
--CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-+CFLAGS+= -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-       -DVERSION=\"${VERSION}\"
+ # includes and libs
+ INCS = -I/usr/lib -I${X11INC}
+ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+ 
+ # flags+-CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\"
++CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
  LDFLAGS = ${LIBS}
- #CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-@@ -26,5 +26,5 @@
- #LIBS += -lnsl -lsocket
+ #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = -g ${LIBS}
  
- AR = ar cr
+ # compiler
 -CC = cc
 +CC?= cc
- RANLIB = ranlib
>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Wed Aug 2 17:50:26 UTC 2006 
Class-Changed-Why:  
Fix category (submitter is maintainer) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101273 
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Wed Aug 2 22:31:26 UTC 2006 
Responsible-Changed-Why:  
Eat. 

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

From: Rong-En Fan <rafan@freebsd.org>
To: Jeroen Schot <schot@a-eskwadraat.nl>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: ports/101273: Update port: x11-wm/dwm to 0.6
Date: Thu, 3 Aug 2006 18:21:19 +0800

 On Wed, Aug 02, 2006 at 05:46:10PM +0000, Jeroen Schot wrote:
 > -@@ -26,5 +26,5 @@
 > - #LIBS += -lnsl -lsocket
 > + #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 > + #LDFLAGS = -g ${LIBS}
 >   
 > - AR = ar cr
 > + # compiler
 >  -CC = cc
 >  +CC?= cc
 > - RANLIB = ranlib
 
 This hunk does not work:
 
 --------------------------
 |diff -ur dwm.orig/files/patch-config.mk dwm/files/patch-config.mk
 |--- dwm.orig/files/patch-config.mk      Wed Aug  2 19:27:43 2006
 |+++ dwm/files/patch-config.mk   Wed Aug  2 19:17:45 2006
 --------------------------
 Patching file files/patch-config.mk using Plan A...
 Hunk #1 succeeded at 1 with fuzz 2.
 patch: **** malformed patch at line 78:  
 
 Please send me a working diff. Thanks.
 
 Rong-En Fan

From: Jeroen Schot <schot@A-Eskwadraat.nl>
To: Rong-En Fan <rafan@freebsd.org>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: ports/101273: Update port: x11-wm/dwm to 0.6
Date: Thu, 3 Aug 2006 14:29:09 +0200

 --vtzGhvizbBRQ85DL
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Thu, Aug 03, 2006 at 06:21:19PM +0800, Rong-En Fan wrote:
 > On Wed, Aug 02, 2006 at 05:46:10PM +0000, Jeroen Schot wrote:
 > > -@@ -26,5 +26,5 @@
 > > - #LIBS += -lnsl -lsocket
 > > + #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 > > + #LDFLAGS = -g ${LIBS}
 > >   
 > > - AR = ar cr
 > > + # compiler
 > >  -CC = cc
 > >  +CC?= cc
 > > - RANLIB = ranlib
 > 
 > This hunk does not work:
 > 
 > --------------------------
 > |diff -ur dwm.orig/files/patch-config.mk dwm/files/patch-config.mk
 > |--- dwm.orig/files/patch-config.mk      Wed Aug  2 19:27:43 2006
 > |+++ dwm/files/patch-config.mk   Wed Aug  2 19:17:45 2006
 > --------------------------
 > Patching file files/patch-config.mk using Plan A...
 > Hunk #1 succeeded at 1 with fuzz 2.
 > patch: **** malformed patch at line 78:  
 > 
 > Please send me a working diff. Thanks.
 > 
 > Rong-En Fan
 
 Ok, I see what I did wrong, attached is a new, working diff.
 
 Regards,
 -- 
 Jeroen Schot
 
 schot@a-eskwadraat.nl (mail & jabber)
 http://schot.a-eskwadraat.nl
 
 --vtzGhvizbBRQ85DL
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="dwm.patch-fixed"
 
 diff -ur dwm.orig/Makefile dwm/Makefile
 --- dwm.orig/Makefile	Sun Jul 30 15:03:21 2006
 +++ dwm/Makefile	Wed Aug  2 19:34:40 2006
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	dwm
 -PORTVERSION=	0.5
 +PORTVERSION=	0.6
  CATEGORIES=	x11-wm
  MASTER_SITES=	http://10kloc.org/download/ \
  		http://schot.a-eskwadraat.nl/files/
 @@ -18,5 +18,8 @@
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 +
 +post-patch:
 +	${CP} ${WRKSRC}/config.default.h ${WRKSRC}/config.h
  
  .include <bsd.port.mk>
 diff -ur dwm.orig/distinfo dwm/distinfo
 --- dwm.orig/distinfo	Sun Jul 30 15:03:21 2006
 +++ dwm/distinfo	Wed Aug  2 19:08:48 2006
 @@ -1,3 +1,3 @@
 -MD5 (dwm-0.5.tar.gz) = e8dfa2d3502d6bc9aeb9f0f21ab2dec5
 -SHA256 (dwm-0.5.tar.gz) = d025d5a43dc09fa81985ea41363cd2dbc967a8923d6b62a930a7238a56ca1473
 -SIZE (dwm-0.5.tar.gz) = 13795
 +MD5 (dwm-0.6.tar.gz) = be86556b42a6aef84c99a5774a5acd46
 +SHA256 (dwm-0.6.tar.gz) = 3e460f2f736a56972da800d5e96d63bc164de087f984cc516055abdb5e547563
 +SIZE (dwm-0.6.tar.gz) = 13998
 diff -ur dwm.orig/files/patch-config.mk dwm/files/patch-config.mk
 --- dwm.orig/files/patch-config.mk	Sun Jul 30 15:03:21 2006
 +++ dwm/files/patch-config.mk	Wed Aug  2 19:17:45 2006
 @@ -1,7 +1,7 @@
 ---- config.mk.orig	Fri Jul 21 21:14:42 2006
 -+++ config.mk	Sat Jul 29 21:01:26 2006
 -@@ -1,11 +1,11 @@
 - # Customize to fit your system
 +--- config.mk.orig	Wed Aug  2 18:59:04 2006
 ++++ config.mk	Wed Aug  2 19:00:14 2006
 +@@ -4,21 +4,21 @@
 + # Customize below to fit your system
   
   # paths
  -PREFIX = /usr/local
 @@ -14,21 +14,17 @@
  +X11INC = $(X11BASE)/include
  +X11LIB = $(X11BASE)/lib
   
 - VERSION = 0.5
 - 
 -@@ -13,7 +13,7 @@
 - LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
 - 
 - # Linux/BSD
 --CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 -+CFLAGS+= -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 - 	-DVERSION=\"${VERSION}\"
 + # includes and libs
 + INCS = -I/usr/lib -I${X11INC}
 + LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 + 
 + # flags
 +-CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\"
 ++CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
   LDFLAGS = ${LIBS}
 - #CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 -@@ -26,5 +26,5 @@
 - #LIBS += -lnsl -lsocket
 + #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 + #LDFLAGS = -g ${LIBS}
   
 - AR = ar cr
 + # compiler
  -CC = cc
  +CC?= cc
 - RANLIB = ranlib
 
 --vtzGhvizbBRQ85DL--
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Aug 5 10:10:30 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101273 
>Unformatted:
