Attachment 186504 Details for Bug 222423 – cwm.diff

[patch] cwm.diff

cwm.diff (text/plain), 5.06 KB, created by Tobias Kortkamp on 2017-09-18 08:50:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-09-18 08:50:14 UTC

Size: 5.06 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 449653)
>+++ UPDATING	(working copy)
>@@ -5,6 +5,14 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20170913
>+  AFFECTS: users of x11-wm/cwm
>+  AUTHOR: tobik@FreeBSD.org
>+
>+  Configuration options were renamed and you need to update your ~/.cwmrc
>+  accordingly.  Make sure to check cwmrc(5) for the new option names.
>+  cwm-migrate-config.pl can help in migrating your ~/.cwmrc.
>+
> 20170904
>   AFFECTS: users of net-mgmt/seafile-server
>   AUTHOR: ultima@FreeBSD.org
>Index: x11-wm/cwm/Makefile
>===================================================================
>--- x11-wm/cwm/Makefile	(revision 449744)
>+++ x11-wm/cwm/Makefile	(working copy)
>@@ -1,29 +1,44 @@
> # $FreeBSD$
> 
> PORTNAME=	cwm
>-PORTVERSION=	5.6
> DISTVERSIONPREFIX=	v
>+DISTVERSION=	5.6-201
>+DISTVERSIONSUFFIX=	-g5a46349
> CATEGORIES=	x11-wm
>-MASTER_SITES=	http://chneukirchen.org/releases/ \
> 
> MAINTAINER=	braakvaak@aol.com
> COMMENT=	Minimalistic window manager for X11 based on evilwm
> 
>-LICENSE=	BSD2CLAUSE
>+LICENSE=	ISCL
> 
>-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
>+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
> 
>-USES=		pkgconfig:build
>-USE_XORG=	x11 xft xinerama xrandr
>+USES=		pkgconfig shebangfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	chneukirchen
>+USE_XORG=	x11 xft xinerama xrandr
> 
> PLIST_FILES=	bin/cwm \
>+		bin/cwm-migrate-config.pl \
> 		man/man1/cwm.1.gz \
> 		man/man5/cwmrc.5.gz
>+SHEBANG_FILES=	migrate-config.pl
> 
>+.include <bsd.port.options.mk>
>+
>+post-patch:
>+	@${REINPLACE_CMD} 's@/usr/X11R6@${LOCALBASE}@' ${WRKSRC}/cwmrc.5
>+	@${REINPLACE_CMD} -e 's@strlcpy.o strlcat.o@@' \
>+		-e 's@strtonum.o@@' ${WRKSRC}/Makefile
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100072
>+	@${REINPLACE_CMD} 's@reallocarray.o@@' ${WRKSRC}/Makefile
>+.endif
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/cwm ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/migrate-config.pl \
>+		${STAGEDIR}${PREFIX}/bin/cwm-migrate-config.pl
> 	${INSTALL_MAN} ${WRKSRC}/cwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
> 	${INSTALL_MAN} ${WRKSRC}/cwmrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
> 
>Index: x11-wm/cwm/distinfo
>===================================================================
>--- x11-wm/cwm/distinfo	(revision 449744)
>+++ x11-wm/cwm/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (chneukirchen-cwm-v5.6_GH0.tar.gz) = 006320bb1716cc0f93bac5634dcccd01f21d468263b5fc9d1be2dd11078a0625
>-SIZE (chneukirchen-cwm-v5.6_GH0.tar.gz) = 50799
>+TIMESTAMP = 1505255816
>+SHA256 (chneukirchen-cwm-v5.6-201-g5a46349_GH0.tar.gz) = 0ef72de4dcffc5d1ea848d8e1e24884ae6436147c042f56166d996f28d46ebb8
>+SIZE (chneukirchen-cwm-v5.6-201-g5a46349_GH0.tar.gz) = 51003
>Index: x11-wm/cwm/files/patch-Makefile
>===================================================================
>--- x11-wm/cwm/files/patch-Makefile	(revision 449744)
>+++ x11-wm/cwm/files/patch-Makefile	(nonexistent)
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2015-03-26 00:34:30 UTC
>-+++ Makefile
>-@@ -16,7 +16,7 @@ OBJS=		calmwm.o screen.o xmalloc.o clien
>- 
>- CPPFLAGS+=	`pkg-config --cflags fontconfig x11 xft xinerama xrandr`
>- 
>--CFLAGS?=	-Wall -O2 -g -D_GNU_SOURCE
>-+CFLAGS?=	-Wall -g -pthread
>- 
>- LDFLAGS+=	`pkg-config --libs fontconfig x11 xft xinerama xrandr`
>- 
>
>Property changes on: x11-wm/cwm/files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11-wm/cwm/files/patch-kbfunc.c
>===================================================================
>--- x11-wm/cwm/files/patch-kbfunc.c	(revision 449744)
>+++ x11-wm/cwm/files/patch-kbfunc.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- kbfunc.c.orig	2015-03-26 00:09:51 UTC
>-+++ kbfunc.c
>-@@ -324,7 +324,7 @@ kbfunc_ssh(struct client_ctx *cc, union 
>- 	struct menu_q		 menuq;
>- 	FILE			*fp;
>- 	char			*buf, *lbuf, *p;
>--	char			 hostbuf[HOST_NAME_MAX+1];
>-+	char			 hostbuf[_POSIX_HOST_NAME_MAX+1];
>- 	char			 path[PATH_MAX];
>- 	int			 l;
>- 	size_t			 len;
>
>Property changes on: x11-wm/cwm/files/patch-kbfunc.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11-wm/cwm/pkg-descr
>===================================================================
>--- x11-wm/cwm/pkg-descr	(revision 449744)
>+++ x11-wm/cwm/pkg-descr	(working copy)
>@@ -2,7 +2,4 @@
> novel features, including the ability to search for windows. it features a
> very simple and attractive aesthetic.
> 
>-This port is based on OpenBSD's continued work on cwm, as development on the
>-project seems to have halted.
>-
>-WWW: http://monkey.org/~marius/pages/?page=cwm
>+WWW: https://github.com/chneukirchen/cwm

Flags:

tobik: maintainer-approval? (braakvaak)

Actions: View | Diff

Attachments on bug 222423: 186504