[pkgsrc/trunk]: pkgsrc sysutils: Add dmenu-wld

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc sysutils: Add dmenu-wld
From: nia <nia%pkgsrc.org@localhost>
Date: Mon, 06 Apr 2020 12:49:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9158064bb727
branches:  trunk
changeset: 421142:9158064bb727
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Jan 11 16:18:15 2020 +0000

description:
sysutils: Add dmenu-wld

dmenu is an efficient dynamic menu for Wayland.

Note: this is a fork of the X11 version, which lives in x11/dmenu.

diffstat:

 sysutils/Makefile                           |   3 +-
 sysutils/dmenu-wld/DESCR                    |   3 ++
 sysutils/dmenu-wld/Makefile                 |  38 +++++++++++++++++++++++++++++
 sysutils/dmenu-wld/PLIST                    |   4 +++
 sysutils/dmenu-wld/distinfo                 |   8 ++++++
 sysutils/dmenu-wld/patches/patch-config.mk  |  19 ++++++++++++++
 sysutils/dmenu-wld/patches/patch-dmenu__run |  10 +++++++
 wm/velox/Makefile                           |   5 +++-
 wm/velox/distinfo                           |   4 +-
 wm/velox/patches/patch-velox.conf.sample    |  15 +++--------
 10 files changed, 94 insertions(+), 15 deletions(-)

diffs (197 lines):

diff -r e7e24d959c88 -r 9158064bb727 sysutils/Makefile
--- a/sysutils/Makefile Sat Jan 11 16:17:39 2020 +0000
+++ b/sysutils/Makefile Sat Jan 11 16:18:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.850 2019/12/31 11:16:49 ng0 Exp $
+# $NetBSD: Makefile,v 1.851 2020/01/11 16:18:15 nia Exp $
 #
 
 COMMENT=       System utilities
@@ -137,6 +137,7 @@
 SUBDIR+=       disk-filltest
 SUBDIR+=       diskscrub
 SUBDIR+=       dmassage
+SUBDIR+=       dmenu-wld
 SUBDIR+=       dmesg2gif
 SUBDIR+=       dmg2img
 SUBDIR+=       dmidecode
diff -r e7e24d959c88 -r 9158064bb727 sysutils/dmenu-wld/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dmenu-wld/DESCR  Sat Jan 11 16:18:15 2020 +0000
@@ -0,0 +1,3 @@
+dmenu is an efficient dynamic menu for Wayland.
+
+Note: this is a fork of the X11 version, which lives in x11/dmenu.
diff -r e7e24d959c88 -r 9158064bb727 sysutils/dmenu-wld/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dmenu-wld/Makefile       Sat Jan 11 16:18:15 2020 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2020/01/11 16:18:15 nia Exp $
+
+DISTNAME=      dmenu-wld-4.6.0.20191014
+CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=michaelforney/}
+GITHUB_PROJECT=        dmenu
+GITHUB_TAG=    f385d9d18813071b4b4257bf8d4d572daeda0e70
+
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/michaelforney/dmenu
+COMMENT=       Dynamic menu for Wayland
+LICENSE=       mit
+
+DEPENDS+=      dmenu-[0-9]*:../../x11/dmenu
+
+USE_TOOLS+=    gmake pkg-config
+
+MAKE_FLAGS+=   CC=${CC:Q}
+MAKE_FLAGS+=   PREFIX=${PREFIX}
+MAKE_FLAGS+=   MANPREFIX=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=   PIXMANINC=${BUILDLINK_DIR}/include/pixman-1
+MAKE_FLAGS+=   SWCPROTO=${PREFIX}/share/swc/swc.xml
+
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu-wld
+       ${MV} ${DESTDIR}${PREFIX}/bin/dmenu_run ${DESTDIR}${PREFIX}/bin/dmenu-wld_run
+       ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/dmenu.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/dmenu-wld.1
+       ${RM} -f ${DESTDIR}${PREFIX}/bin/dmenu_path
+       ${RM} -f ${DESTDIR}${PREFIX}/bin/stest
+       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/stest.1
+
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.include "../../graphics/wld/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.include "../../wm/swc/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e7e24d959c88 -r 9158064bb727 sysutils/dmenu-wld/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dmenu-wld/PLIST  Sat Jan 11 16:18:15 2020 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2020/01/11 16:18:15 nia Exp $
+bin/dmenu-wld
+bin/dmenu-wld_run
+man/man1/dmenu-wld.1
diff -r e7e24d959c88 -r 9158064bb727 sysutils/dmenu-wld/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dmenu-wld/distinfo       Sat Jan 11 16:18:15 2020 +0000
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2020/01/11 16:18:15 nia Exp $
+
+SHA1 (dmenu-wld-4.6.0.20191014-f385d9d18813071b4b4257bf8d4d572daeda0e70.tar.gz) = 246dde33fd7ae0f8e65d27a619ba8f483b457e18
+RMD160 (dmenu-wld-4.6.0.20191014-f385d9d18813071b4b4257bf8d4d572daeda0e70.tar.gz) = 2c9ed055f9b5f89583e7dcb8d7f7ff6df67c4405
+SHA512 (dmenu-wld-4.6.0.20191014-f385d9d18813071b4b4257bf8d4d572daeda0e70.tar.gz) = 
3c249ade9e02c81c162a83f65423864bd2cab20812b1f482cfd417bfe11dea13ec991c1645c0a95214f36298ccd83a5f24b06ae6b4015cfc5fc082d213a5cfd9
+Size (dmenu-wld-4.6.0.20191014-f385d9d18813071b4b4257bf8d4d572daeda0e70.tar.gz) = 15225 bytes
+SHA1 (patch-config.mk) = 29c628dd48ebc31cab5da7daa949e43984ca2298
+SHA1 (patch-dmenu__run) = f553dfb7e2b961ba7e31353d9ff0b611ffaee752
diff -r e7e24d959c88 -r 9158064bb727 sysutils/dmenu-wld/patches/patch-config.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dmenu-wld/patches/patch-config.mk        Sat Jan 11 16:18:15 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-config.mk,v 1.1 2020/01/11 16:18:15 nia Exp $
+
+Append instead of setting variables
+
+--- config.mk.orig     2017-04-16 16:28:50.000000000 +0000
++++ config.mk
+@@ -13,9 +13,9 @@ INCS = -I${PIXMANINC}
+ LIBS = -lwayland-client -lxkbcommon -lwld -lfontconfig
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\"
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS  = -s ${LIBS}
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\"
++CFLAGS   += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS  += -s ${LIBS}
+ 
+ # compiler and linker
+ CC = cc
diff -r e7e24d959c88 -r 9158064bb727 sysutils/dmenu-wld/patches/patch-dmenu__run
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dmenu-wld/patches/patch-dmenu__run       Sat Jan 11 16:18:15 2020 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-dmenu__run,v 1.1 2020/01/11 16:18:15 nia Exp $
+
+Avoid conflicts.
+
+--- dmenu_run.orig     2017-04-16 16:28:50.000000000 +0000
++++ dmenu_run
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &
++dmenu_path | dmenu-wld "$@" | ${SHELL:-"/bin/sh"} &
diff -r e7e24d959c88 -r 9158064bb727 wm/velox/Makefile
--- a/wm/velox/Makefile Sat Jan 11 16:17:39 2020 +0000
+++ b/wm/velox/Makefile Sat Jan 11 16:18:15 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2019/12/11 21:19:29 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/11 16:18:15 nia Exp $
 
 DISTNAME=      velox-0.0.3.20191211
+PKGREVISION=   1
 CATEGORIES=    wm
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=niacat/}
 GITHUB_PROJECT=        velox
@@ -13,6 +14,8 @@
 
 # Used by the panel, you get poor font rendering otherwise.
 DEPENDS+=      terminus-font-[0-9]*:../../fonts/terminus-font
+# Used for launching software.
+DEPENDS+=      dmenu-wld-[0-9]*:../../sysutils/dmenu-wld
 
 USE_TOOLS+=    gmake pkg-config
 
diff -r e7e24d959c88 -r 9158064bb727 wm/velox/distinfo
--- a/wm/velox/distinfo Sat Jan 11 16:17:39 2020 +0000
+++ b/wm/velox/distinfo Sat Jan 11 16:18:15 2020 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/12/11 21:19:29 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/01/11 16:18:15 nia Exp $
 
 SHA1 (velox-0.0.3.20191211-0c8f9cf8f46bdafff54cac5ae659c33904996a43.tar.gz) = 7029774ea7e033e411c1ead8a74bebbe25fcacca
 RMD160 (velox-0.0.3.20191211-0c8f9cf8f46bdafff54cac5ae659c33904996a43.tar.gz) = a4509879d23b5cd767efe1dc44028ba61e01d836
 SHA512 (velox-0.0.3.20191211-0c8f9cf8f46bdafff54cac5ae659c33904996a43.tar.gz) = 
5c85dc89d37796abc35ea8b5a2c7fb5386df27da7008511edc81d28cfa5557503df22e15d3b2d580de58ecb537c0d12bd3af67d192e1057de99d090a28d73ba2
 Size (velox-0.0.3.20191211-0c8f9cf8f46bdafff54cac5ae659c33904996a43.tar.gz) = 22786 bytes
-SHA1 (patch-velox.conf.sample) = e3e6cf139d084c4bf245c08393cdc7dee7e6ba79
+SHA1 (patch-velox.conf.sample) = 3654921b8ff4ef66d1b1d4a388f35218dc6cd468
diff -r e7e24d959c88 -r 9158064bb727 wm/velox/patches/patch-velox.conf.sample
--- a/wm/velox/patches/patch-velox.conf.sample  Sat Jan 11 16:17:39 2020 +0000
+++ b/wm/velox/patches/patch-velox.conf.sample  Sat Jan 11 16:18:15 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-velox.conf.sample,v 1.1 2019/12/11 21:19:29 nia Exp $
+$NetBSD: patch-velox.conf.sample,v 1.2 2020/01/11 16:18:15 nia Exp $
 
 Make the defaults a bit more sensible for pkgsrc.
 
---- velox.conf.sample.orig     2019-12-11 20:17:59.532009260 +0000
+--- velox.conf.sample.orig     2019-12-11 19:08:40.000000000 +0000
 +++ velox.conf.sample
 @@ -1,7 +1,7 @@
  # velox.conf
@@ -13,7 +13,7 @@
  set window.border_color_active      0xff338833
  set window.border_color_inactive    0xff888888
  set window.border_width             2
-@@ -19,9 +19,8 @@ set tag.8.name                      8
+@@ -19,9 +19,9 @@ set tag.8.name                      8
  set tag.9.name                      9
  
  #      name             type    arguments
@@ -21,15 +21,8 @@
 -action spawn_run        spawn   exec dmenu_run -b
 -action spawn_browser    spawn   exec netsurf
 +action spawn_terminal   spawn   exec sakura
++action spawn_run      spawn   exec dmenu-wld_run -fn Terminus:pixelsize=14 -nf '#999999' -nb '#1a1a1a' -sf '#ffffff' -sb '#338833'
 +action spawn_browser    spawn   exec netsurf-gtk3
  
  #   key         modifiers           action
  key j           mod                 focus_next
-@@ -42,7 +41,6 @@ key h           mod,ctrl            tall
- key l           mod,ctrl            tall.decrease_num_columns
- 
- key Return      mod,shift           spawn_terminal
--key r           mod                 spawn_run
- key b           mod                 spawn_browser
- 
- key 1           mod                 tag.1.activate
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/py-wcwidth py-wcwidth: updated to 0.1.8
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/py-pygit2 py-pygit2: updated to 1.0.2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-wcwidth py-wcwidth: updated to 0.1.8
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-pygit2 py-pygit2: updated to 1.0.2
Indexes:
Home | Main Index | Thread Index | Old Index