From zeising@daemonic.se  Wed Jan 11 22:39:46 2012
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A9ED2106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 22:39:46 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id 071848FC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 22:39:45 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id ED0CB40004
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 23:39:44 +0100 (CET)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id E00BB40006; Wed, 11 Jan 2012 23:39:44 +0100 (CET)
Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id 3D9DF40004
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 23:39:44 +0100 (CET)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6])
	by mx.daemonic.se (Postfix) with ESMTPS id DCFD8119D3D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 23:39:43 +0100 (CET)
Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA)
	by mailscanner.daemonic.se (mailscanner.daemonic.se [2001:470:dca9:0:1::6]) (amavisd-new, port 10025)
	with ESMTPS id aiz0OYtkvv-e for <FreeBSD-gnats-submit@freebsd.org>;
	Wed, 11 Jan 2012 23:39:41 +0100 (CET)
Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4])
	by mx.daemonic.se (Postfix) with ESMTPS id 17DCE119D3C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 23:39:41 +0100 (CET)
Received: from vincent.daemonic.se (login.daemonic.se [IPv6:2001:470:dca9:0:1::10])
	by mail.daemonic.se (Postfix) with ESMTPS id E9D3B12B089
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Jan 2012 23:39:40 +0100 (CET)
Received: (from zeising@localhost)
	by vincent.daemonic.se (8.14.5/8.14.5/Submit) id q0BMdeoE091659;
	Wed, 11 Jan 2012 23:39:40 +0100 (CET)
	(envelope-from zeising)
Message-Id: <201201112239.q0BMdeoE091659@vincent.daemonic.se>
Date: Wed, 11 Jan 2012 23:39:40 +0100 (CET)
From: Niclas Zeising <zeising@daemonic.se>
Reply-To: Niclas Zeising <zeising@daemonic.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] update to x11-wm/scrotwm
X-Send-Pr-Version: 3.113
X-GNATS-Notify: aragon@phat.za.net

>Number:         164032
>Category:       ports
>Synopsis:       [PATCH] update to x11-wm/scrotwm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 11 22:40:12 UTC 2012
>Closed-Date:    Mon Jan 16 19:11:24 UTC 2012
>Last-Modified:  Mon Jan 16 19:20:07 UTC 2012
>Originator:     Niclas Zeising
>Release:        FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD vincent.daemonic.se 9.0-BETA2 FreeBSD 9.0-BETA2 #0 r225368: Sat Sep 3 22:13:26 CEST 2011 root@vincent.daemonic.se:/usr/obj/usr/src/sys/VINCENT amd64


	
>Description:
	Attached patch updates x11-wm/scrotwm to the latest version, and makes the dependency on x11/dmenu non-optional.
>How-To-Repeat:
	
>Fix:

	

--- x11-wm.scrotwm.update.0.10.0.diff begins here ---
Index: x11-wm/scrotwm/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/scrotwm/Makefile,v
retrieving revision 1.11
diff -u -d -r1.11 Makefile
--- x11-wm/scrotwm/Makefile	16 Aug 2011 21:53:28 -0000	1.11
+++ x11-wm/scrotwm/Makefile	11 Jan 2012 22:36:12 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scrotwm
-PORTVERSION=	0.9.34
+PORTVERSION=	0.10.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://opensource.conformal.com/snapshots/scrotwm/
 EXTRACT_SUFX=	.tgz
@@ -16,8 +16,7 @@
 
 LICENSE=	ISCL
 
-OPTIONS=	DMENU "Depend on x11/dmenu" Off \
-		DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
+OPTIONS=	DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
 
 .include <bsd.port.pre.mk>
 
@@ -26,9 +25,8 @@
 MAN1=		scrotwm.1
 USE_LDCONFIG=yes
 
-.if defined(WITH_DMENU)
 RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
-.endif
+
 .if defined(WITH_DMENU_BOTTOM)
 EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
 .endif
@@ -38,9 +36,10 @@
 
 do-build:
 	${CC} ${CFLAGS} -I${X11BASE}/include \
-		-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr -lXtst \
+		-I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \
+		-lXtst -DSWM_LIB=\"${PREFIX}/lib/libwmhack.so\" \
 		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
-	${CC} ${CFLAGS} -I${X11BASE}/include -shared -fPIC \
+	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \
 		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
 
 do-install:
@@ -53,6 +52,12 @@
 		${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \
 	fi
 	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/scrotwm_cz.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/scrotwm_es.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/scrotwm_fr.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/scrotwm_fr_ch.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/scrotwm_se.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/scrotwm_us.conf ${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: x11-wm/scrotwm/distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-wm/scrotwm/distinfo,v
retrieving revision 1.11
diff -u -d -r1.11 distinfo
--- x11-wm/scrotwm/distinfo	16 Aug 2011 21:53:28 -0000	1.11
+++ x11-wm/scrotwm/distinfo	11 Jan 2012 22:36:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (scrotwm-0.9.34.tgz) = 46f055f3c1b7d32bcaaf94193fd01a727422e787e8a7afcf987db2ffdec9ada8
-SIZE (scrotwm-0.9.34.tgz) = 69755
+SHA256 (scrotwm-0.10.0.tgz) = 4219beaa2f0dcb6bb8e80180d03bbf3ad58daaff627de189f0b7641b1faf7222
+SIZE (scrotwm-0.10.0.tgz) = 80960
Index: x11-wm/scrotwm/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-plist,v
retrieving revision 1.1
diff -u -d -r1.1 pkg-plist
--- x11-wm/scrotwm/pkg-plist	5 Jul 2011 17:42:12 -0000	1.1
+++ x11-wm/scrotwm/pkg-plist	11 Jan 2012 22:36:12 -0000
@@ -2,6 +2,12 @@
 bin/startscrotwm
 lib/libswmhack.so
 %%EXAMPLESDIR%%/screenshot.sh
+%%EXAMPLESDIR%%/scrotwm_cz.conf
+%%EXAMPLESDIR%%/scrotwm_es.conf
+%%EXAMPLESDIR%%/scrotwm_fr.conf
+%%EXAMPLESDIR%%/scrotwm_fr_ch.conf
+%%EXAMPLESDIR%%/scrotwm_se.conf
+%%EXAMPLESDIR%%/scrotwm_us.conf
 @unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi
 etc/scrotwm.conf.sample
 @exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf
Index: x11-wm/scrotwm/files/spawn_menu_atbottom.patch
===================================================================
RCS file: /home/ncvs/ports/x11-wm/scrotwm/files/spawn_menu_atbottom.patch,v
retrieving revision 1.4
diff -u -d -r1.4 spawn_menu_atbottom.patch
--- x11-wm/scrotwm/files/spawn_menu_atbottom.patch	16 Aug 2011 21:53:28 -0000	1.4
+++ x11-wm/scrotwm/files/spawn_menu_atbottom.patch	11 Jan 2012 22:36:12 -0000
@@ -1,14 +1,14 @@
---- scrotwm.c	13 Aug 2011 20:26:02 -0000
-+++ scrotwm.c	13 Aug 2011 22:56:08 -0000
-@@ -3984,14 +3984,16 @@
+--- scrotwm.c.orig	2012-01-11 19:42:57.000000000 +0100
++++ scrotwm.c	2012-01-11 21:36:07.000000000 +0100
+@@ -4481,14 +4481,16 @@
  					" -nb $bar_color"
  					" -nf $bar_font_color"
  					" -sb $bar_border"
 -					" -sf $bar_color",	0);
 +					" -sf $bar_color"
 +					" -b",	0);
- 	setconfspawn("uniconify",	"dmenu"
- 					" -i"
+ 	setconfspawn("name_workspace",	"dmenu"
+ 					" -p Workspace"
  					" -fn $bar_font"
  					" -nb $bar_color"
  					" -nf $bar_font_color"
--- x11-wm.scrotwm.update.0.10.0.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jan 11 22:40:29 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: aragon@phat.za.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/164032: [PATCH] update to x11-wm/scrotwm
Date: Wed, 11 Jan 2012 22:40:27 UT

 Maintainer of x11-wm/scrotwm,
 
 Please note that PR ports/164032 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/164032
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Niclas Zeising <zeising@daemonic.se>
To: bug-followup@FreeBSD.org, zeising@daemonic.se
Cc:  
Subject: Re: ports/164032: [PATCH] update to x11-wm/scrotwm
Date: Thu, 12 Jan 2012 10:58:22 +0100

 This is a multi-part message in MIME format.
 --------------040804040905020006090600
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Here is an updated patch which changes the WWW: line in pkg-descr as
 well, since the homepage has moved.
 Regards!
 -- 
 Niclas
 
 --------------040804040905020006090600
 Content-Type: text/plain;
  name="x11-wm.scrotwm.update.0.10.0.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="x11-wm.scrotwm.update.0.10.0.diff"
 
 Index: x11-wm/scrotwm/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/Makefile,v
 retrieving revision 1.11
 diff -u -d -r1.11 Makefile
 --- x11-wm/scrotwm/Makefile	16 Aug 2011 21:53:28 -0000	1.11
 +++ x11-wm/scrotwm/Makefile	12 Jan 2012 09:55:11 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	scrotwm
 -PORTVERSION=	0.9.34
 +PORTVERSION=	0.10.0
  CATEGORIES=	x11-wm
  MASTER_SITES=	https://opensource.conformal.com/snapshots/scrotwm/
  EXTRACT_SUFX=	.tgz
 @@ -16,8 +16,7 @@
  
  LICENSE=	ISCL
  
 -OPTIONS=	DMENU "Depend on x11/dmenu" Off \
 -		DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
 +OPTIONS=	DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
  
  .include <bsd.port.pre.mk>
  
 @@ -26,9 +25,8 @@
  MAN1=		scrotwm.1
  USE_LDCONFIG=yes
  
 -.if defined(WITH_DMENU)
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 -.endif
 +
  .if defined(WITH_DMENU_BOTTOM)
  EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
  .endif
 @@ -38,9 +36,10 @@
  
  do-build:
  	${CC} ${CFLAGS} -I${X11BASE}/include \
 -		-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr -lXtst \
 +		-I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \
 +		-lXtst -DSWM_LIB=\"${PREFIX}/lib/libwmhack.so\" \
  		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 -	${CC} ${CFLAGS} -I${X11BASE}/include -shared -fPIC \
 +	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \
  		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
  
  do-install:
 @@ -53,6 +52,12 @@
  		${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \
  	fi
  	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
 -	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}/
 +	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_cz.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_es.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_fr.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_fr_ch.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_se.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_us.conf ${EXAMPLESDIR}
  
  .include <bsd.port.post.mk>
 Index: x11-wm/scrotwm/distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/distinfo,v
 retrieving revision 1.11
 diff -u -d -r1.11 distinfo
 --- x11-wm/scrotwm/distinfo	16 Aug 2011 21:53:28 -0000	1.11
 +++ x11-wm/scrotwm/distinfo	12 Jan 2012 09:55:11 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (scrotwm-0.9.34.tgz) = 46f055f3c1b7d32bcaaf94193fd01a727422e787e8a7afcf987db2ffdec9ada8
 -SIZE (scrotwm-0.9.34.tgz) = 69755
 +SHA256 (scrotwm-0.10.0.tgz) = 4219beaa2f0dcb6bb8e80180d03bbf3ad58daaff627de189f0b7641b1faf7222
 +SIZE (scrotwm-0.10.0.tgz) = 80960
 Index: x11-wm/scrotwm/pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-descr,v
 retrieving revision 1.1
 diff -u -d -r1.1 pkg-descr
 --- x11-wm/scrotwm/pkg-descr	1 Jul 2009 19:06:37 -0000	1.1
 +++ x11-wm/scrotwm/pkg-descr	12 Jan 2012 09:55:11 -0000
 @@ -11,4 +11,4 @@
  borrowed from it.  On the other hand xmonad has great defaults, key bindings
  and xinerama support but is crippled by not being written in C.
  
 -WWW: http://www.peereboom.us/scrotwm/html/scrotwm.html
 +WWW: https://opensource.conformal.com/wiki/scrotwm
 Index: x11-wm/scrotwm/pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-plist,v
 retrieving revision 1.1
 diff -u -d -r1.1 pkg-plist
 --- x11-wm/scrotwm/pkg-plist	5 Jul 2011 17:42:12 -0000	1.1
 +++ x11-wm/scrotwm/pkg-plist	12 Jan 2012 09:55:11 -0000
 @@ -2,6 +2,12 @@
  bin/startscrotwm
  lib/libswmhack.so
  %%EXAMPLESDIR%%/screenshot.sh
 +%%EXAMPLESDIR%%/scrotwm_cz.conf
 +%%EXAMPLESDIR%%/scrotwm_es.conf
 +%%EXAMPLESDIR%%/scrotwm_fr.conf
 +%%EXAMPLESDIR%%/scrotwm_fr_ch.conf
 +%%EXAMPLESDIR%%/scrotwm_se.conf
 +%%EXAMPLESDIR%%/scrotwm_us.conf
  @unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi
  etc/scrotwm.conf.sample
  @exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf
 Index: x11-wm/scrotwm/files/spawn_menu_atbottom.patch
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/files/spawn_menu_atbottom.patch,v
 retrieving revision 1.4
 diff -u -d -r1.4 spawn_menu_atbottom.patch
 --- x11-wm/scrotwm/files/spawn_menu_atbottom.patch	16 Aug 2011 21:53:28 -0000	1.4
 +++ x11-wm/scrotwm/files/spawn_menu_atbottom.patch	12 Jan 2012 09:55:11 -0000
 @@ -1,14 +1,14 @@
 ---- scrotwm.c	13 Aug 2011 20:26:02 -0000
 -+++ scrotwm.c	13 Aug 2011 22:56:08 -0000
 -@@ -3984,14 +3984,16 @@
 +--- scrotwm.c.orig	2012-01-11 19:42:57.000000000 +0100
 ++++ scrotwm.c	2012-01-11 21:36:07.000000000 +0100
 +@@ -4481,14 +4481,16 @@
   					" -nb $bar_color"
   					" -nf $bar_font_color"
   					" -sb $bar_border"
  -					" -sf $bar_color",	0);
  +					" -sf $bar_color"
  +					" -b",	0);
 - 	setconfspawn("uniconify",	"dmenu"
 - 					" -i"
 + 	setconfspawn("name_workspace",	"dmenu"
 + 					" -p Workspace"
   					" -fn $bar_font"
   					" -nb $bar_color"
   					" -nf $bar_font_color"
 
 --------------040804040905020006090600--

From: Niclas Zeising <zeising@daemonic.se>
To: bug-followup@FreeBSD.org, zeising@daemonic.se
Cc:  
Subject: Re: ports/164032: [PATCH] update to x11-wm/scrotwm
Date: Mon, 16 Jan 2012 18:44:32 +0100

 This is a multi-part message in MIME format.
 --------------050701060903070209010003
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Here is a new patch which in addition to previous patches also changes
 maintainership to me. Previous maintainer asked in a private mail to me
 if I was willing to take over maintainership since s/he only uses
 scrotwm sporadically.
 Regards!
 -- 
 Niclas
 
 --------------050701060903070209010003
 Content-Type: text/plain;
  name="x11-wm.scrotwm.update.0.10.0.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="x11-wm.scrotwm.update.0.10.0.diff"
 
 Index: x11-wm/scrotwm/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/Makefile,v
 retrieving revision 1.11
 diff -u -d -r1.11 Makefile
 --- x11-wm/scrotwm/Makefile	16 Aug 2011 21:53:28 -0000	1.11
 +++ x11-wm/scrotwm/Makefile	16 Jan 2012 17:33:26 -0000
 @@ -6,18 +6,17 @@
  #
  
  PORTNAME=	scrotwm
 -PORTVERSION=	0.9.34
 +PORTVERSION=	0.10.0
  CATEGORIES=	x11-wm
  MASTER_SITES=	https://opensource.conformal.com/snapshots/scrotwm/
  EXTRACT_SUFX=	.tgz
  
 -MAINTAINER=	aragon@phat.za.net
 +MAINTAINER=	zeising@daemonic.se
  COMMENT=	A small, dynamic tiling window manager for X11
  
  LICENSE=	ISCL
  
 -OPTIONS=	DMENU "Depend on x11/dmenu" Off \
 -		DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
 +OPTIONS=	DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
  
  .include <bsd.port.pre.mk>
  
 @@ -26,9 +25,8 @@
  MAN1=		scrotwm.1
  USE_LDCONFIG=yes
  
 -.if defined(WITH_DMENU)
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 -.endif
 +
  .if defined(WITH_DMENU_BOTTOM)
  EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
  .endif
 @@ -38,9 +36,10 @@
  
  do-build:
  	${CC} ${CFLAGS} -I${X11BASE}/include \
 -		-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr -lXtst \
 +		-I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \
 +		-lXtst -DSWM_LIB=\"${PREFIX}/lib/libwmhack.so\" \
  		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 -	${CC} ${CFLAGS} -I${X11BASE}/include -shared -fPIC \
 +	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \
  		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
  
  do-install:
 @@ -53,6 +52,12 @@
  		${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \
  	fi
  	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
 -	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}/
 +	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_cz.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_es.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_fr.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_fr_ch.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_se.conf ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/scrotwm_us.conf ${EXAMPLESDIR}
  
  .include <bsd.port.post.mk>
 Index: x11-wm/scrotwm/distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/distinfo,v
 retrieving revision 1.11
 diff -u -d -r1.11 distinfo
 --- x11-wm/scrotwm/distinfo	16 Aug 2011 21:53:28 -0000	1.11
 +++ x11-wm/scrotwm/distinfo	16 Jan 2012 17:33:26 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (scrotwm-0.9.34.tgz) = 46f055f3c1b7d32bcaaf94193fd01a727422e787e8a7afcf987db2ffdec9ada8
 -SIZE (scrotwm-0.9.34.tgz) = 69755
 +SHA256 (scrotwm-0.10.0.tgz) = 4219beaa2f0dcb6bb8e80180d03bbf3ad58daaff627de189f0b7641b1faf7222
 +SIZE (scrotwm-0.10.0.tgz) = 80960
 Index: x11-wm/scrotwm/pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-descr,v
 retrieving revision 1.1
 diff -u -d -r1.1 pkg-descr
 --- x11-wm/scrotwm/pkg-descr	1 Jul 2009 19:06:37 -0000	1.1
 +++ x11-wm/scrotwm/pkg-descr	16 Jan 2012 17:33:26 -0000
 @@ -11,4 +11,4 @@
  borrowed from it.  On the other hand xmonad has great defaults, key bindings
  and xinerama support but is crippled by not being written in C.
  
 -WWW: http://www.peereboom.us/scrotwm/html/scrotwm.html
 +WWW: https://opensource.conformal.com/wiki/scrotwm
 Index: x11-wm/scrotwm/pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-plist,v
 retrieving revision 1.1
 diff -u -d -r1.1 pkg-plist
 --- x11-wm/scrotwm/pkg-plist	5 Jul 2011 17:42:12 -0000	1.1
 +++ x11-wm/scrotwm/pkg-plist	16 Jan 2012 17:33:26 -0000
 @@ -2,6 +2,12 @@
  bin/startscrotwm
  lib/libswmhack.so
  %%EXAMPLESDIR%%/screenshot.sh
 +%%EXAMPLESDIR%%/scrotwm_cz.conf
 +%%EXAMPLESDIR%%/scrotwm_es.conf
 +%%EXAMPLESDIR%%/scrotwm_fr.conf
 +%%EXAMPLESDIR%%/scrotwm_fr_ch.conf
 +%%EXAMPLESDIR%%/scrotwm_se.conf
 +%%EXAMPLESDIR%%/scrotwm_us.conf
  @unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi
  etc/scrotwm.conf.sample
  @exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf
 Index: x11-wm/scrotwm/files/spawn_menu_atbottom.patch
 ===================================================================
 RCS file: /home/ncvs/ports/x11-wm/scrotwm/files/spawn_menu_atbottom.patch,v
 retrieving revision 1.4
 diff -u -d -r1.4 spawn_menu_atbottom.patch
 --- x11-wm/scrotwm/files/spawn_menu_atbottom.patch	16 Aug 2011 21:53:28 -0000	1.4
 +++ x11-wm/scrotwm/files/spawn_menu_atbottom.patch	16 Jan 2012 17:33:26 -0000
 @@ -1,14 +1,14 @@
 ---- scrotwm.c	13 Aug 2011 20:26:02 -0000
 -+++ scrotwm.c	13 Aug 2011 22:56:08 -0000
 -@@ -3984,14 +3984,16 @@
 +--- scrotwm.c.orig	2012-01-11 19:42:57.000000000 +0100
 ++++ scrotwm.c	2012-01-11 21:36:07.000000000 +0100
 +@@ -4481,14 +4481,16 @@
   					" -nb $bar_color"
   					" -nf $bar_font_color"
   					" -sb $bar_border"
  -					" -sf $bar_color",	0);
  +					" -sf $bar_color"
  +					" -b",	0);
 - 	setconfspawn("uniconify",	"dmenu"
 - 					" -i"
 + 	setconfspawn("name_workspace",	"dmenu"
 + 					" -p Workspace"
   					" -fn $bar_font"
   					" -nb $bar_color"
   					" -nf $bar_font_color"
 
 --------------050701060903070209010003--
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Mon Jan 16 18:39:00 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164032 
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Mon Jan 16 19:11:22 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164032: commit references a PR
Date: Mon, 16 Jan 2012 19:11:14 +0000 (UTC)

 crees       2012-01-16 19:11:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/scrotwm       Makefile distinfo pkg-descr pkg-plist 
     x11-wm/scrotwm/files spawn_menu_atbottom.patch 
   Log:
   - Pass maintainership to submitter
   Approved by:    maintainer via email
   
   - Update to 0.10.0
   
   - Update WWW
   
   PR:             ports/164032
   Submitted by:   Niclas Zeising <zeising@daemonic.se>
   
   Revision  Changes    Path
   1.13      +14 -9     ports/x11-wm/scrotwm/Makefile
   1.12      +2 -2      ports/x11-wm/scrotwm/distinfo
   1.5       +7 -5      ports/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
   1.2       +1 -1      ports/x11-wm/scrotwm/pkg-descr
   1.2       +6 -0      ports/x11-wm/scrotwm/pkg-plist
 _______________________________________________
 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:
