svn commit: r382287 - in head/x11-wm/cwm: . files

[Vanilla I. Shu]

Author: vanilla
Date: Thu Mar 26 01:57:14 2015
New Revision: 382287
URL: https://svnweb.freebsd.org/changeset/ports/382287
QAT: https://qat.redports.org/buildarchive/r382287/

Log:
  Upgrade to 5.6.
  
  PR:		198914
  Submitted by:	maintainer

Added:
  head/x11-wm/cwm/files/patch-kbfunc.c   (contents, props changed)
Modified:
  head/x11-wm/cwm/Makefile
  head/x11-wm/cwm/distinfo
  head/x11-wm/cwm/files/patch-Makefile

Modified: head/x11-wm/cwm/Makefile
==============================================================================
--- head/x11-wm/cwm/Makefile	Thu Mar 26 01:42:40 2015	(r382286)
+++ head/x11-wm/cwm/Makefile	Thu Mar 26 01:57:14 2015	(r382287)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cwm
-PORTVERSION=	5.5
+PORTVERSION=	5.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://chneukirchen.org/releases/ \
 		http://github.com/chneukirchen/${PORTNAME}/archive/v${PORTVERSION}.tar.gz?dummy=/
@@ -21,8 +21,8 @@ PLIST_FILES=	bin/cwm \
 		man/man5/cwmrc.5.gz
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/cwm ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/cwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	@${INSTALL_MAN} ${WRKSRC}/cwmrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_PROGRAM} ${WRKSRC}/cwm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/cwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cwmrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>

Modified: head/x11-wm/cwm/distinfo
==============================================================================
--- head/x11-wm/cwm/distinfo	Thu Mar 26 01:42:40 2015	(r382286)
+++ head/x11-wm/cwm/distinfo	Thu Mar 26 01:57:14 2015	(r382287)
@@ -1,2 +1,2 @@
-SHA256 (cwm-5.5.tar.gz) = 99aa337f15b07e36ba3b03593c56f65b76f8bbef6f73daca73846f6b002f2187
-SIZE (cwm-5.5.tar.gz) = 50709
+SHA256 (cwm-5.6.tar.gz) = 006320bb1716cc0f93bac5634dcccd01f21d468263b5fc9d1be2dd11078a0625
+SIZE (cwm-5.6.tar.gz) = 50799

Modified: head/x11-wm/cwm/files/patch-Makefile
==============================================================================
--- head/x11-wm/cwm/files/patch-Makefile	Thu Mar 26 01:42:40 2015	(r382286)
+++ head/x11-wm/cwm/files/patch-Makefile	Thu Mar 26 01:57:14 2015	(r382287)
@@ -1,25 +1,11 @@
---- ./Makefile.orig	2014-03-17 03:52:56.000000000 +0100
-+++ ./Makefile	2014-03-17 04:05:08.000000000 +0100
-@@ -3,7 +3,7 @@
- 
- PROG=		cwm
- 
--PREFIX=         /usr/local
-+#PREFIX=         /usr/local
- 
- SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
- 		search.c util.c xutil.c conf.c xevents.c group.c \
-@@ -16,11 +16,11 @@
+--- 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
+-CFLAGS?=	-Wall -O2 -g -D_GNU_SOURCE
++CFLAGS?=	-Wall -g -pthread
  
  LDFLAGS+=	`pkg-config --libs fontconfig x11 xft xinerama xrandr`
  
--MANPREFIX=	${PREFIX}/share/man
-+#MANPREFIX=	${PREFIX}/share/man
- 
- all: ${PROG}
- 

Added: head/x11-wm/cwm/files/patch-kbfunc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/cwm/files/patch-kbfunc.c	Thu Mar 26 01:57:14 2015	(r382287)
@@ -0,0 +1,11 @@
+--- 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;