aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2015-03-26 09:57:14 +0800
committervanilla <vanilla@FreeBSD.org>2015-03-26 09:57:14 +0800
commitf08029489e91afa910d14eae8f4f064fd129734d (patch)
tree696b9aa586b4bbb926ff535f652b8322de9090f4 /x11-wm
parentfe6f780396b6c326a75d39190b2c1f804916a85a (diff)
downloadfreebsd-ports-gnome-f08029489e91afa910d14eae8f4f064fd129734d.tar.gz
freebsd-ports-gnome-f08029489e91afa910d14eae8f4f064fd129734d.tar.zst
freebsd-ports-gnome-f08029489e91afa910d14eae8f4f064fd129734d.zip
Upgrade to 5.6.
PR: 198914 Submitted by: maintainer
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/cwm/Makefile8
-rw-r--r--x11-wm/cwm/distinfo4
-rw-r--r--x11-wm/cwm/files/patch-Makefile24
-rw-r--r--x11-wm/cwm/files/patch-kbfunc.c11
4 files changed, 22 insertions, 25 deletions
diff --git a/x11-wm/cwm/Makefile b/x11-wm/cwm/Makefile
index 232cd2d3c415..fcc81cdfde38 100644
--- a/x11-wm/cwm/Makefile
+++ b/x11-wm/cwm/Makefile
@@ -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>
diff --git a/x11-wm/cwm/distinfo b/x11-wm/cwm/distinfo
index 71fc74d2c78d..a0c21c3a18e2 100644
--- a/x11-wm/cwm/distinfo
+++ b/x11-wm/cwm/distinfo
@@ -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
diff --git a/x11-wm/cwm/files/patch-Makefile b/x11-wm/cwm/files/patch-Makefile
index 2c4ad0d98807..d4993a575254 100644
--- a/x11-wm/cwm/files/patch-Makefile
+++ b/x11-wm/cwm/files/patch-Makefile
@@ -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}
-
diff --git a/x11-wm/cwm/files/patch-kbfunc.c b/x11-wm/cwm/files/patch-kbfunc.c
new file mode 100644
index 000000000000..b8d1e8b8cc28
--- /dev/null
+++ b/x11-wm/cwm/files/patch-kbfunc.c
@@ -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;