herbstluftwm: use cmake for building.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Wed Jan 1 16:11:49 2020 +0100
Changeset:	349e19b4e7bfff0e105aba2453977dd2c6642489

Modified Files:
	herbstluftwm/Makefile
	herbstluftwm/PLIST
	herbstluftwm/distinfo
Added Files:
	herbstluftwm/patches/patch-CMakeLists.txt

Log Message:
herbstluftwm: use cmake for building.

This removes a bunch of bespoke variables and such and uses
build infrastructure that's much closer to upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=349e19b4e7bfff0e105aba2453977dd2c6642489

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 herbstluftwm/Makefile                     | 15 ++++++---------
 herbstluftwm/PLIST                        |  8 --------
 herbstluftwm/distinfo                     |  1 +
 herbstluftwm/patches/patch-CMakeLists.txt | 28 ++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 17 deletions(-)

diffs:
diff --git a/herbstluftwm/Makefile b/herbstluftwm/Makefile
index abc453b91d..67d1eebfe7 100644
--- a/herbstluftwm/Makefile
+++ b/herbstluftwm/Makefile
@@ -9,18 +9,15 @@ HOMEPAGE=	http://herbstluftwm.org/
 COMMENT=	Manual tiling window manager for X11 using Xlib and Glib
 LICENSE=	modified-bsd
 
+USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES+=	c c++
-MAKEFLAGS+=	PREFIX=${PREFIX}
-MAKEFLAGS+=	SYSCONFDIR=${PREFIX}/share
-MAKEFLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
-
+CONFIGURE_DIRS=	build
+CMAKE_ARG_PATH=	..
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
-CFLAGS+=	-I${PREFIX}/include/glib/glib-2.0
-CFLAGS+=	-I${PREFIX}/lib/glib-2.0/include
-CFLAGS+=	${X11_LDFLAGS}
-CFLAGS+=	-L${PREFIX}/lib -lglib-2.0 -R${PREFIX}/lib
-LDFLAGS+=	-lglib-2.0 -L${PREFIX}/lib -R${PREFIX}/lib
+
+pre-configure:
+	${MKDIR} -p ${WRKSRC}/build
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
diff --git a/herbstluftwm/PLIST b/herbstluftwm/PLIST
index 60fdf636a2..40ef1e0e36 100644
--- a/herbstluftwm/PLIST
+++ b/herbstluftwm/PLIST
@@ -5,7 +5,6 @@ bin/herbstluftwm
 man/man1/herbstclient.1
 man/man1/herbstluftwm.1
 man/man7/herbstluftwm-tutorial.7
-share/bash_completion.d/herbstclient-completion
 share/doc/herbstluftwm/BUGS
 share/doc/herbstluftwm/INSTALL
 share/doc/herbstluftwm/LICENSE
@@ -15,25 +14,18 @@ share/doc/herbstluftwm/examples/dmenu.sh
 share/doc/herbstluftwm/examples/dumpbeautify.sh
 share/doc/herbstluftwm/examples/exec_on_tag.sh
 share/doc/herbstluftwm/examples/execwith.sh
-share/doc/herbstluftwm/examples/float-maximize.sh
 share/doc/herbstluftwm/examples/floatmon.sh
 share/doc/herbstluftwm/examples/herbstcommander.sh
 share/doc/herbstluftwm/examples/keychain.sh
 share/doc/herbstluftwm/examples/lasttag.sh
 share/doc/herbstluftwm/examples/layout.sh
 share/doc/herbstluftwm/examples/loadstate.sh
-share/doc/herbstluftwm/examples/maximize.sh
 share/doc/herbstluftwm/examples/q3terminal.sh
 share/doc/herbstluftwm/examples/savestate.sh
 share/doc/herbstluftwm/examples/scratchpad.sh
-share/doc/herbstluftwm/examples/toggledualhead.sh
-share/doc/herbstluftwm/examples/windowmenu.sh
 share/doc/herbstluftwm/examples/wselect.sh
 share/doc/herbstluftwm/herbstclient.html
 share/doc/herbstluftwm/herbstluftwm-tutorial.html
 share/doc/herbstluftwm/herbstluftwm.html
-share/xdg/herbstluftwm/autostart
-share/xdg/herbstluftwm/panel.sh
-share/xdg/herbstluftwm/restartpanels.sh
 share/xsessions/herbstluftwm.desktop
 share/zsh/functions/Completion/X/_herbstclient
diff --git a/herbstluftwm/distinfo b/herbstluftwm/distinfo
index b2c116ed8e..b07eb5a8ba 100644
--- a/herbstluftwm/distinfo
+++ b/herbstluftwm/distinfo
@@ -4,3 +4,4 @@ SHA1 (herbstluftwm-0.7.2.tar.gz) = b07b623fc675ae578a282ded84f38dfa6cd9436e
 RMD160 (herbstluftwm-0.7.2.tar.gz) = 1a61cafad3af500d51aa7cd39fb5413055e33178
 SHA512 (herbstluftwm-0.7.2.tar.gz) = abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 Size (herbstluftwm-0.7.2.tar.gz) = 245506 bytes
+SHA1 (patch-CMakeLists.txt) = a21df691245a5e1025a63ec5c3d239e7022fb41a
diff --git a/herbstluftwm/patches/patch-CMakeLists.txt b/herbstluftwm/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..e2b2a38169
--- /dev/null
+++ b/herbstluftwm/patches/patch-CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Do not clobber CFLAGS and set the correct MANDIR.
+
+--- CMakeLists.txt.orig	2019-05-09 09:04:33.000000000 +0000
++++ CMakeLists.txt
+@@ -34,12 +34,6 @@ set(SYSCONFDIR "${DESTDIR}/etc")
+ set(CONFIGDIR "${SYSCONFDIR}/xdg/herbstluftwm")
+ 
+ 
+-if(CMAKE_COMPILER_IS_GNUCC)
+-    set(CMAKE_C_FLAGS "-pedantic -Wall")
+-    set(CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-sign-compare -Wno-narrowing -Wno-deprecated-register")
+-endif()
+-
+-
+ # ----------------------------------------------------------------------------
+ # Find Libraries
+ 
+@@ -187,7 +181,7 @@ target_link_libraries(herbstclient ${LIB
+ 
+ set(BINDIR ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)
+ set(DATADIR ${DESTDIR}${CMAKE_INSTALL_PREFIX}/share)
+-set(MANDIR ${DATADIR}/man)
++set(MANDIR ${DESTDIR}${CMAKE_INSTALL_PREFIX}/man)
+ set(DOCDIR ${DATADIR}/doc/herbstluftwm)
+ set(EXAMPLESDIR ${DOCDIR}/examples)
+ set(LICENSEDIR ${DOCDIR})