Attachment 122127 Details for Bug 165248 – x11-wm.scrotwm.rename.update.1.0.0.diff

[patch] x11-wm.scrotwm.rename.update.1.0.0.diff

x11-wm.scrotwm.rename.update.1.0.0.diff (text/plain), 7.44 KB, created by Niclas Zeising on 2012-02-17 19:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2012-02-17 19:00:23 UTC

Size: 7.44 KB

patch

obsolete

>Index: MOVED
>===================================================================
>RCS file: /home/ncvs/ports/MOVED,v
>retrieving revision 1.2776
>diff -u -d -r1.2776 MOVED
>--- MOVED	14 Feb 2012 16:53:27 -0000	1.2776
>+++ MOVED	17 Feb 2012 18:45:40 -0000
>@@ -3232,3 +3232,4 @@
> chinese/fcitx-keyboard|textproc/fcitx-keyboard|2012-02-07|Moved to more appropriate category
> textproc/hs-attoparsec-text||2012-02-13|Removed: The package is deprecated.
> devel/hs-hmake||2012-02-13|Removed: Broken, unmaintained upstream.
>+x11-wm/scrotwm|x11-wm/spectrwm|2012-02-17|Project renamed
>Index: x11-wm/scrotwm/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11-wm/scrotwm/Makefile,v
>retrieving revision 1.15
>diff -u -d -r1.15 Makefile
>--- x11-wm/scrotwm/Makefile	10 Feb 2012 08:16:33 -0000	1.15
>+++ x11-wm/scrotwm/Makefile	17 Feb 2012 18:45:40 -0000
>@@ -1,14 +1,14 @@
>-# New ports collection makefile for:   scrotwm
>+# New ports collection makefile for:   spectrwm
> # Date created:                June 29, 2009
> # Whom:                        Aragon Gouveia <aragon@phat.za.net>
> #
> # $FreeBSD: ports/x11-wm/scrotwm/Makefile,v 1.15 2012/02/10 08:16:33 jgh Exp $
> #
> 
>-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/spectrwm/
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	zeising@daemonic.se
>@@ -22,14 +22,14 @@
> 
> 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 @@
> .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 @@
> 	${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}
>Index: x11-wm/scrotwm/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11-wm/scrotwm/distinfo,v
>retrieving revision 1.13
>diff -u -d -r1.13 distinfo
>--- x11-wm/scrotwm/distinfo	10 Feb 2012 08:16:33 -0000	1.13
>+++ x11-wm/scrotwm/distinfo	17 Feb 2012 18:45:40 -0000
>@@ -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
>Index: x11-wm/scrotwm/pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-descr,v
>retrieving revision 1.2
>diff -u -d -r1.2 pkg-descr
>--- x11-wm/scrotwm/pkg-descr	16 Jan 2012 19:11:05 -0000	1.2
>+++ x11-wm/scrotwm/pkg-descr	17 Feb 2012 18:45:40 -0000
>@@ -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 @@
> 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
>Index: x11-wm/scrotwm/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/x11-wm/scrotwm/pkg-plist,v
>retrieving revision 1.3
>diff -u -d -r1.3 pkg-plist
>--- x11-wm/scrotwm/pkg-plist	10 Feb 2012 08:16:33 -0000	1.3
>+++ x11-wm/scrotwm/pkg-plist	17 Feb 2012 18:45:40 -0000
>@@ -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
>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.5
>diff -u -d -r1.5 spawn_menu_atbottom.patch
>--- x11-wm/scrotwm/files/spawn_menu_atbottom.patch	16 Jan 2012 19:11:05 -0000	1.5
>+++ x11-wm/scrotwm/files/spawn_menu_atbottom.patch	17 Feb 2012 18:45:40 -0000
>@@ -1,7 +1,7 @@
> $FreeBSD: ports/x11-wm/scrotwm/files/spawn_menu_atbottom.patch,v 1.5 2012/01/16 19:11:05 crees Exp $
> 
>---- 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"
>Index: x11-wm/scrotwm/files/startscrotwm
>===================================================================
>RCS file: x11-wm/scrotwm/files/startscrotwm
>diff -N x11-wm/scrotwm/files/startscrotwm
>--- x11-wm/scrotwm/files/startscrotwm	4 May 2010 11:11:20 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -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

Actions: View | Diff

Attachments on bug 165248: 122127