[pkgsrc/trunk]: pkgsrc/wm/coma wm/coma: package revision.

[vins <vins%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56417011a406
branches:  trunk
changeset: 390441:56417011a406
user:      vins <vins%pkgsrc.org@localhost>
date:      Mon Dec 19 13:01:45 2022 +0000

description:
wm/coma: package revision.

* Drop patch: DESTDIR support can be handled with MAKE_FLAGS.
* Do not require pkg-config: define LDFLAGS using BUIDLINK_PREFIX.
* Use REPLACE_INTEPRETER in place of a SUBST routine.
* Bump PKGREVISION.
* Take maintainership.

diffstat:

 wm/coma/Makefile               |  32 ++++++++++++++++++++------------
 wm/coma/distinfo               |   3 +--
 wm/coma/patches/patch-Makefile |  29 -----------------------------
 3 files changed, 21 insertions(+), 43 deletions(-)

diffs (99 lines):

diff -r 10044926abd4 -r 56417011a406 wm/coma/Makefile
--- a/wm/coma/Makefile  Mon Dec 19 11:55:21 2022 +0000
+++ b/wm/coma/Makefile  Mon Dec 19 13:01:45 2022 +0000
@@ -1,31 +1,39 @@
-# $NetBSD: Makefile,v 1.9 2022/05/11 07:50:07 fcambus Exp $
+# $NetBSD: Makefile,v 1.10 2022/12/19 13:01:45 vins Exp $
 
 DISTNAME=      coma-1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm
 MASTER_SITES=  https://coma.one/releases/
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://coma.one/wm/
 COMMENT=       Keyboard driven tiling window manager
 LICENSE=       isc
 
-# Use sh instead of hardcoded zsh
-SUBST_CLASSES+=                shell
-SUBST_STAGE.shell=     pre-configure
-SUBST_MESSAGE.shell=   Use sh instead of hardcoded zsh
-SUBST_FILES.shell=     scripts/*
-SUBST_SED.shell+=      -e 's,zsh,sh,'
+USE_LANGUAGES= c99
+
+REPLACE_INTERPRETER+=  sh
+REPLACE.sh.old=                .*/bin/zsh
+REPLACE.sh.new=                ${SH:Q}
+REPLACE_FILES.sh+=     scripts/coma-cmd
+REPLACE_FILES.sh+=     scripts/coma-remote
 
-USE_LANGUAGES= c99
-USE_TOOLS+=    pkg-config
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
+LDFLAGS+=      -L${BUILDLINK_PREFIX.libX11}/lib -lX11 -lXft
 
-MAKE_FLAGS+=   MAN_DIR="${PREFIX}/${PKGMANDIR}"
+MAKE_FLAGS+=   CC=${CC:Q}
+MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
+MAKE_FLAGS+=   MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
 .  include "../../devel/libbsd/buildlink3.mk"
 .endif
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 10044926abd4 -r 56417011a406 wm/coma/distinfo
--- a/wm/coma/distinfo  Mon Dec 19 11:55:21 2022 +0000
+++ b/wm/coma/distinfo  Mon Dec 19 13:01:45 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:25:11 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/12/19 13:01:45 vins Exp $
 
 BLAKE2s (coma-1.1.tar.gz) = b5ff281480166bf01385e042e0a70f47556bcad93cb9775713a58e609b2f4023
 SHA512 (coma-1.1.tar.gz) = eb0e75a95d3ba0987851860eba19f432236de1949ae0eecd5d8141153b29179c128faa212a0a79e09123ad8b5f8b1c53de01ad08746f2605e182784605c73bd5
 Size (coma-1.1.tar.gz) = 16467 bytes
-SHA1 (patch-Makefile) = d8ac0caf8a5ec56b5bd734e7e1ae37c00aa49fc5
diff -r 10044926abd4 -r 56417011a406 wm/coma/patches/patch-Makefile
--- a/wm/coma/patches/patch-Makefile    Mon Dec 19 11:55:21 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-Makefile,v 1.4 2019/10/31 10:30:22 fcambus Exp $
-
-Adapt install target for pkgsrc.
-
---- Makefile.orig      2019-08-21 12:39:43.000000000 +0000
-+++ Makefile
-@@ -2,6 +2,7 @@
- 
- CC?=cc
- COMA=coma
-+DESTDIR?=
- PREFIX?=/usr/local
- INSTALL_DIR=$(PREFIX)/bin
- MAN_DIR=$(PREFIX)/share/man
-@@ -27,9 +28,11 @@ LDFLAGS+=`pkg-config --libs x11 xft`
- all: $(COMA)
- 
- install: $(COMA)
--      install -m 555 $(COMA) $(INSTALL_DIR)/$(COMA)
--      install -m 555 scripts/coma-* $(INSTALL_DIR)
--      install -m 644 coma.1 $(MAN_DIR)/man1/coma.1
-+      mkdir -p $(DESTDIR)$(INSTALL_DIR)
-+      mkdir -p $(DESTDIR)$(MAN_DIR)/man1
-+      install -m 555 $(COMA) $(DESTDIR)$(INSTALL_DIR)/$(COMA)
-+      install -m 555 scripts/coma-* $(DESTDIR)$(INSTALL_DIR)
-+      install -m 644 coma.1 $(DESTDIR)$(MAN_DIR)/man1/coma.1
- 
- $(COMA): $(OBJS)
-       $(CC) $(OBJS) $(LDFLAGS) -o $(COMA)