10 files changed, 60 insertions, 34 deletions

diff --git a/x11-wm/scrotwm/Makefile b/x11-wm/scrotwm/Makefile
index 908f77b58b48..a96ce933093c 100644
--- a/x11-wm/scrotwm/Makefile
+++ b/x11-wm/scrotwm/Makefile
@@ -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 @@ USE_XORG=	x11 xproto xrandr xt xtst
 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 @@ post-patch:
 
 do-build:
 	${CC} ${CFLAGS} -I${LOCALBASE}/include \
-		-I${WRKSRC}/linux -lutil -L${LOCALBASE}/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${LOCALBASE}/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 @@ do-install:
 		${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>
diff --git a/x11-wm/scrotwm/distinfo b/x11-wm/scrotwm/distinfo
index 85d31f7eecc2..921c90b87750 100644
--- a/x11-wm/scrotwm/distinfo
+++ b/x11-wm/scrotwm/distinfo
@@ -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
diff --git a/x11-wm/scrotwm/files/spawn_menu_atbottom.patch b/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
index 81986afd971d..fdb39cc3a72a 100644
--- a/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
+++ b/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
@@ -1,14 +1,16 @@
---- scrotwm.c	13 Aug 2011 20:26:02 -0000
-+++ scrotwm.c	13 Aug 2011 22:56:08 -0000
-@@ -3984,14 +3984,16 @@
+$FreeBSD$
+
+--- 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"
diff --git a/x11-wm/scrotwm/pkg-descr b/x11-wm/scrotwm/pkg-descr
index 57ba33f2612b..17977f41dae3 100644
--- a/x11-wm/scrotwm/pkg-descr
+++ b/x11-wm/scrotwm/pkg-descr
@@ -11,4 +11,4 @@ Nevertheless dwm was a phenomenal resource and many good ideas and code was
 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
diff --git a/x11-wm/scrotwm/pkg-plist b/x11-wm/scrotwm/pkg-plist
index cb8ebbdfbeac..67d82d9889c1 100644
--- a/x11-wm/scrotwm/pkg-plist
+++ b/x11-wm/scrotwm/pkg-plist
@@ -2,6 +2,12 @@ bin/scrotwm
 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
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index 908f77b58b48..a96ce933093c 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -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 @@ USE_XORG=	x11 xproto xrandr xt xtst
 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 @@ post-patch:
 
 do-build:
 	${CC} ${CFLAGS} -I${LOCALBASE}/include \
-		-I${WRKSRC}/linux -lutil -L${LOCALBASE}/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${LOCALBASE}/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 @@ do-install:
 		${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>
diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo
index 85d31f7eecc2..921c90b87750 100644
--- a/x11-wm/spectrwm/distinfo
+++ b/x11-wm/spectrwm/distinfo
@@ -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
diff --git a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
index 81986afd971d..fdb39cc3a72a 100644
--- a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
+++ b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
@@ -1,14 +1,16 @@
---- scrotwm.c	13 Aug 2011 20:26:02 -0000
-+++ scrotwm.c	13 Aug 2011 22:56:08 -0000
-@@ -3984,14 +3984,16 @@
+$FreeBSD$
+
+--- 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"
diff --git a/x11-wm/spectrwm/pkg-descr b/x11-wm/spectrwm/pkg-descr
index 57ba33f2612b..17977f41dae3 100644
--- a/x11-wm/spectrwm/pkg-descr
+++ b/x11-wm/spectrwm/pkg-descr
@@ -11,4 +11,4 @@ Nevertheless dwm was a phenomenal resource and many good ideas and code was
 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
diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist
index cb8ebbdfbeac..67d82d9889c1 100644
--- a/x11-wm/spectrwm/pkg-plist
+++ b/x11-wm/spectrwm/pkg-plist
@@ -2,6 +2,12 @@ bin/scrotwm
 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