4 files changed, 28 insertions, 29 deletions

diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index d5a7073279dc..72f5e79b5d82 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	scrotwm
-PORTVERSION=	0.11.0
+PORTNAME=	spectrwm
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	https://opensource.conformal.com/snapshots/scrotwm/
+MASTER_SITES=	https://opensource.conformal.com/snapshots/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	zeising@daemonic.se
@@ -22,14 +22,14 @@ OPTIONS=	DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
 
 USE_XORG=	x11 xproto xrandr xt xtst
 
-MAN1=		scrotwm.1
+MAN1=		spectrwm.1
 USE_LDCONFIG=yes
-PORTEXAMPLES=	scrotwm_cz.conf \
-		scrotwm_es.conf \
-		scrotwm_fr.conf \
-		scrotwm_fr_ch.conf \
-		scrotwm_se.conf \
-		scrotwm_us.conf
+PORTEXAMPLES=	spectrwm_cz.conf \
+		spectrwm_es.conf \
+		spectrwm_fr.conf \
+		spectrwm_fr_ch.conf \
+		spectrwm_se.conf \
+		spectrwm_us.conf
 
 RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 
@@ -38,7 +38,7 @@ EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
 
 do-build:
 	${CC} ${CFLAGS} -I${LOCALBASE}/include \
@@ -52,12 +52,11 @@ 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 ; \
+	${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${PREFIX}/etc/spectrwm.conf.sample
+	@if [ ! -f ${PREFIX}/etc/spectrwm.conf ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/spectrwm.conf.sample ${PREFIX}/etc/spectrwm.conf ; \
 	fi
-	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 .for conf in ${PORTEXAMPLES}
diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo
index aa051b62c30f..b962cce2165b 100644
--- a/x11-wm/spectrwm/distinfo
+++ b/x11-wm/spectrwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scrotwm-0.11.0.tgz) = 7d2a5b30c6285ee2daead904b6dd6b89c4f2ca7ac64aac88213151e234c6554d
-SIZE (scrotwm-0.11.0.tgz) = 82600
+SHA256 (spectrwm-1.0.0.tgz) = 4cfd7ed7c61fdfc8c108e5efec4513ee14b32baa8d2b095465c62e7bfdd65998
+SIZE (spectrwm-1.0.0.tgz) = 88112
diff --git a/x11-wm/spectrwm/pkg-descr b/x11-wm/spectrwm/pkg-descr
index 17977f41dae3..955c80ff0e3b 100644
--- a/x11-wm/spectrwm/pkg-descr
+++ b/x11-wm/spectrwm/pkg-descr
@@ -1,8 +1,9 @@
-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.
+Spectrwm (previously known as 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,
@@ -11,4 +12,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: https://opensource.conformal.com/wiki/scrotwm
+WWW: https://opensource.conformal.com/wiki/spectrwm
diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist
index 58d1d161c1a5..7aadbc5eed77 100644
--- a/x11-wm/spectrwm/pkg-plist
+++ b/x11-wm/spectrwm/pkg-plist
@@ -1,7 +1,6 @@
-bin/scrotwm
+bin/spectrwm
 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
+@unexec if [ ! -f %D/etc/spectrwm.conf ] || cmp -s %D/etc/spectrwm.conf.sample %D/etc/spectrwm.conf; then rm -f %D/etc/spectrwm.conf; else echo %%PREFIX%%/etc/spectrwm.conf contains changes, remove it manually to delete this package completely.; fi
+etc/spectrwm.conf.sample
+@exec [ -f %D/etc/spectrwm.conf ] || cp -p %D/%F %D/etc/spectrwm.conf