cwm: update to 6.3

From Sunil Nimmagadda in pkgsrc-wip, PR pkg/53624.

4 files changed, 30 insertions, 27 deletions

diff --git a/wm/cwm/DESCR b/wm/cwm/DESCR
index a42736de680..64ff2f8d538 100644
--- a/wm/cwm/DESCR
+++ b/wm/cwm/DESCR
@@ -1,6 +1,8 @@
-cwm is a window manager for X11.  It was originally inspired by evilwm,
-but was rewritten from scratch due to limitations in the evilwm codebase.
-The from-scratch rewrite borrowed some code from 9wm.  cwm contains many
-new features which all concentrate on the efficiency and transparency of
-window management.  cwm also aims to maintain the most simplest and
-pleasant aesthetic.
+This is a port of OpenBSD's excellent cwm[0] to Linux and other Unices.
+
+cwm is a window manager for X11 which contains many features that
+concentrate on the efficiency and transparency of window management.  cwm
+also aims to maintain the simplest and most pleasant aesthetic.
+
+This version actively tracks changes in the OpenBSD CVS repository.
+Releases are roughly coordinated.
diff --git a/wm/cwm/Makefile b/wm/cwm/Makefile
index bfd12a96093..5a4ced312c5 100644
--- a/wm/cwm/Makefile
+++ b/wm/cwm/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.19 2018/03/12 11:17:42 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.20 2018/09/22 06:32:11 maya Exp $
 
-DISTNAME=	cwm-3
-PKGREVISION=	7
+DISTNAME=	cwm-6.3
 CATEGORIES=	wm
-MASTER_SITES=	https://monkey.org/~marius/cwm/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=chneukirchen/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://monkey.org/~marius/cwm/
-COMMENT=	Window manager for X11 initially inspired by evilwm
+MAINTAINER=	cfkoch@edgebsd.org
+HOMEPAGE=	https://github.com/chneukirchen/cwm
+COMMENT=	Portable version of the window manager from OpenBSD
+LICENSE=	isc
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
+EXTRACT_USING=	gtar
+USE_TOOLS+=	pkg-config yacc
 
-LDFLAGS.Darwin+=	-lfontconfig
-LDFLAGS.DragonFly+=	-lfontconfig
-LDFLAGS.SunOS+=		-lfontconfig
+NO_CONFIGURE=	yes
+INSTALL_ENV+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
 
-.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/cwm/PLIST b/wm/cwm/PLIST
index 4267a174c9f..5732e2efbf6 100644
--- a/wm/cwm/PLIST
+++ b/wm/cwm/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/09/04 04:56:04 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/09/22 06:32:11 maya Exp $
 bin/cwm
 man/man1/cwm.1
+man/man5/cwmrc.5
diff --git a/wm/cwm/distinfo b/wm/cwm/distinfo
index 6c7c9b1ba72..f415e3b0ad2 100644
--- a/wm/cwm/distinfo
+++ b/wm/cwm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/02 23:42:51 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/09/22 06:32:11 maya Exp $
 
-SHA1 (cwm-3.tar.gz) = 04490462ba74de2f388bbb4cb04c0f1d7c2b2921
-RMD160 (cwm-3.tar.gz) = c533065d7d8a5044f03418aea38c295450c54af1
-SHA512 (cwm-3.tar.gz) = fe984d695b16769f92a4b981495bd7bb55200a342e972dce9b320701fed59307021dab9fa8b937347bb7cfb76aa0eb0288deb0b35eadbb7f13595df455471892
-Size (cwm-3.tar.gz) = 137437 bytes
+SHA1 (cwm-6.3.tar.gz) = 343ea5b587c77535fb28c701971a50b78e1034be
+RMD160 (cwm-6.3.tar.gz) = cd2b8bf50d47446bf82f5da3a5ec931b9fe8298e
+SHA512 (cwm-6.3.tar.gz) = 12f5c28ce2fa8e5310c49dd6d4fb58140a514943a93b8cab1c0c604bb50535a5e6b00b10f21c8d4500440f7ae7b14d2cb23c65eb201578fc01ab09f2bbc1e91f
+Size (cwm-6.3.tar.gz) = 52419 bytes