Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Jan 2012 23:39:40 +0100 (CET)
From:      Niclas Zeising <zeising@daemonic.se>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/164032: [PATCH] update to x11-wm/scrotwm
Message-ID:  <201201112239.q0BMdeoE091659@vincent.daemonic.se>
Resent-Message-ID: <201201112240.q0BMeC5R021946@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         164032
>Category:       ports
>Synopsis:       [PATCH] update to x11-wm/scrotwm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 11 22:40:12 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201112239.q0BMdeoE091659>