9 files changed, 3 insertions, 137 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 8c72513f0fb9..9abed134e374 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -148,11 +148,11 @@
     SUBDIR += ratpoison
     SUBDIR += sapphire
     SUBDIR += sawfish
-    SUBDIR += scrotwm
     SUBDIR += selectwm
     SUBDIR += simple-ccsm
     SUBDIR += skippy
     SUBDIR += skippy-xd
+    SUBDIR += spectrwm
     SUBDIR += stumpwm
     SUBDIR += swm
     SUBDIR += tinywm
diff --git a/x11-wm/scrotwm/Makefile b/x11-wm/scrotwm/Makefile
deleted file mode 100644
index d5a7073279dc..000000000000
--- a/x11-wm/scrotwm/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# New ports collection makefile for:   scrotwm
-# Date created:                June 29, 2009
-# Whom:                        Aragon Gouveia <aragon@phat.za.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	scrotwm
-PORTVERSION=	0.11.0
-CATEGORIES=	x11-wm
-MASTER_SITES=	https://opensource.conformal.com/snapshots/scrotwm/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	zeising@daemonic.se
-COMMENT=	A small, dynamic tiling window manager for X11
-
-LICENSE=	ISCL
-
-OPTIONS=	DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
-
-.include <bsd.port.pre.mk>
-
-USE_XORG=	x11 xproto xrandr xt xtst
-
-MAN1=		scrotwm.1
-USE_LDCONFIG=yes
-PORTEXAMPLES=	scrotwm_cz.conf \
-		scrotwm_es.conf \
-		scrotwm_fr.conf \
-		scrotwm_fr_ch.conf \
-		scrotwm_se.conf \
-		scrotwm_us.conf
-
-RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
-
-.if defined(WITH_DMENU_BOTTOM)
-EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
-
-do-build:
-	${CC} ${CFLAGS} -I${LOCALBASE}/include \
-		-I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \
-		-lXtst -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
-		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
-	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \
-		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc/scrotwm.conf.sample
-	@if [ ! -f ${PREFIX}/etc/scrotwm.conf ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \
-	fi
-	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-.for conf in ${PORTEXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${conf} ${EXAMPLESDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-wm/scrotwm/distinfo b/x11-wm/scrotwm/distinfo
deleted file mode 100644
index aa051b62c30f..000000000000
--- a/x11-wm/scrotwm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (scrotwm-0.11.0.tgz) = 7d2a5b30c6285ee2daead904b6dd6b89c4f2ca7ac64aac88213151e234c6554d
-SIZE (scrotwm-0.11.0.tgz) = 82600
diff --git a/x11-wm/scrotwm/files/spawn_menu_atbottom.patch b/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
deleted file mode 100644
index fdb39cc3a72a..000000000000
--- a/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-$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("name_workspace",	"dmenu"
- 					" -p Workspace"
- 					" -fn $bar_font"
- 					" -nb $bar_color"
- 					" -nf $bar_font_color"
- 					" -sb $bar_border"
--					" -sf $bar_color",	0);
-+					" -sf $bar_color"
-+					" -b",	0);
- }
- 
- /* key bindings */
diff --git a/x11-wm/scrotwm/files/startscrotwm b/x11-wm/scrotwm/files/startscrotwm
deleted file mode 100644
index 34721b34da5b..000000000000
--- a/x11-wm/scrotwm/files/startscrotwm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z "${DISPLAY}" ]
-then
-	echo "$0: Starting X server"
-	exec xinit $( which scrotwm )
-else
-	echo "$0: X server already running on display ${DISPLAY}"
-	$( which scrotwm )
-fi
diff --git a/x11-wm/scrotwm/pkg-descr b/x11-wm/scrotwm/pkg-descr
deleted file mode 100644
index 17977f41dae3..000000000000
--- a/x11-wm/scrotwm/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Scrotwm is a small dynamic tiling window manager for X11.  It tries to stay out
-of the way so that valuable screen real estate can be used for much more
-important stuff.  It has sane defaults and does not require one to learn a
-language to do any configuration.  It was written by hackers for hackers and it
-strives to be small, compact and fast.
-
-It was largely inspired by xmonad and dwm.  Both are fine products but suffer
-from things like: crazy-unportable-language-syndrome, silly defaults,
-asymmetrical window layout, "how hard can it be?" and good old NIH.
-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: https://opensource.conformal.com/wiki/scrotwm
diff --git a/x11-wm/scrotwm/pkg-plist b/x11-wm/scrotwm/pkg-plist
deleted file mode 100644
index 58d1d161c1a5..000000000000
--- a/x11-wm/scrotwm/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/scrotwm
-bin/screenshot.sh
-bin/startscrotwm
-lib/libswmhack.so
-@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/files/spawn_menu_atbottom.patch b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
index fdb39cc3a72a..844dce1c6d4a 100644
--- a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
+++ b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- scrotwm.c.orig	2012-01-11 19:42:57.000000000 +0100
-+++ scrotwm.c	2012-01-11 21:36:07.000000000 +0100
+--- spectrwm.c.orig	2012-01-11 19:42:57.000000000 +0100
++++ spectrwm.c	2012-01-11 21:36:07.000000000 +0100
 @@ -4481,14 +4481,16 @@
  					" -nb $bar_color"
  					" -nf $bar_font_color"
diff --git a/x11-wm/spectrwm/files/startscrotwm b/x11-wm/spectrwm/files/startscrotwm
index 34721b34da5b..e69de29bb2d1 100644
--- a/x11-wm/spectrwm/files/startscrotwm
+++ b/x11-wm/spectrwm/files/startscrotwm
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z "${DISPLAY}" ]
-then
-	echo "$0: Starting X server"
-	exec xinit $( which scrotwm )
-else
-	echo "$0: X server already running on display ${DISPLAY}"
-	$( which scrotwm )
-fi