svn commit: r469641 - in head/x11-wm/dwm: . files
Tobias Kortkamp
tobik at FreeBSD.org
Fri May 11 13:54:40 UTC 2018
Author: tobik
Date: Fri May 11 13:54:39 2018
New Revision: 469641
URL: https://svnweb.freebsd.org/changeset/ports/469641
Log:
x11-wm/dwm: Add option to enable volume control keys [0]
- Assign to 0mp [1]. The current maintainer hasn't responded to PRs
since 2012.
- While here rename SUPERASMODKEY patch for consistency with the new
volume keys patch
- Fix variable order
PR: 226924 [0], 226929 [1]
Submitted by: Ashish Gupta <ashmew2 at gmail.com> [0], 0mp [1]
Approved by: maintainer timeouts
Added:
head/x11-wm/dwm/files/superasmodkey-patch-config.def.h
- copied unchanged from r469640, head/x11-wm/dwm/files/extra-patch-config.def.h
head/x11-wm/dwm/files/volumecontrol-patch-config.def.h (contents, props changed)
Deleted:
head/x11-wm/dwm/files/extra-patch-config.def.h
Modified:
head/x11-wm/dwm/Makefile
Modified: head/x11-wm/dwm/Makefile
==============================================================================
--- head/x11-wm/dwm/Makefile Fri May 11 13:52:07 2018 (r469640)
+++ head/x11-wm/dwm/Makefile Fri May 11 13:54:39 2018 (r469641)
@@ -10,7 +10,7 @@ MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ \
PATCH_SITES= http://dwm.suckless.org/patches/
-MAINTAINER= schot at a-eskwadraat.nl
+MAINTAINER= 0mp at FreeBSD.org
COMMENT= Dynamic, small, fast and simple window manager
LICENSE= MIT
@@ -18,17 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
-OPTIONS_DEFINE= XINERAMA DOCS SUPERASMODKEY
-OPTIONS_DEFAULT=XINERAMA
-
-SUPERASMODKEY_DESC= Use Super instead of Alt for the dwm mod key
-
-XINERAMA_USE= XORG=xinerama
-XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS=
-
-SUPERASMODKEY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-config.def.h
-
USE_XORG= x11 xft
+
MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib"
@@ -36,6 +27,18 @@ PLIST_FILES= bin/dwm \
man/man1/dwm.1.gz
PORTDOCS= README
+OPTIONS_DEFINE= XINERAMA DOCS SUPERASMODKEY VOLUMECONTROL
+OPTIONS_DEFAULT=XINERAMA
+
+SUPERASMODKEY_DESC= Use Super instead of Alt for the dwm mod key
+VOLUMECONTROL_DESC= Use keys on keyboard to raise or lower volume
+
+SUPERASMODKEY_EXTRA_PATCHES= ${PATCHDIR}/superasmodkey-patch-config.def.h
+VOLUMECONTROL_EXTRA_PATCHES= ${PATCHDIR}/volumecontrol-patch-config.def.h
+
+XINERAMA_USE= XORG=xinerama
+XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS=
+
pre-everything::
@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"
@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
@@ -48,8 +51,10 @@ post-extract:
fi
post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dwm
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dwm
.include <bsd.port.mk>
Copied: head/x11-wm/dwm/files/superasmodkey-patch-config.def.h (from r469640, head/x11-wm/dwm/files/extra-patch-config.def.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/dwm/files/superasmodkey-patch-config.def.h Fri May 11 13:54:39 2018 (r469641, copy of r469640, head/x11-wm/dwm/files/extra-patch-config.def.h)
@@ -0,0 +1,11 @@
+--- config.def.h.orig 2018-01-16 16:05:12 UTC
++++ config.def.h
+@@ -42,7 +42,7 @@ static const Layout layouts[] = {
+ };
+
+ /* key definitions */
+-#define MODKEY Mod1Mask
++#define MODKEY Mod4Mask
+ #define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
Added: head/x11-wm/dwm/files/volumecontrol-patch-config.def.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/dwm/files/volumecontrol-patch-config.def.h Fri May 11 13:54:39 2018 (r469641)
@@ -0,0 +1,23 @@
+--- config.def.h.orig 2015-11-08 23:39:37.000000000 +0100
++++ config.def.h 2018-03-25 21:26:37.860145000 +0200
+@@ -56,7 +56,11 @@
+ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+ static const char *termcmd[] = { "st", NULL };
++static const char *incrvol[] = { "mixer", "vol", "+1:+1", NULL};
++static const char *decrvol[] = { "mixer", "vol", "-1:-1", NULL};
+
++#define XK_XF86AudioLowerVolume 0x1008ff11
++#define XK_XF86AudioRaiseVolume 0x1008ff13
+ static Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+@@ -92,6 +96,8 @@
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
++ { 0x0, XK_XF86AudioRaiseVolume, spawn, {.v = incrvol } },
++ { 0x0, XK_XF86AudioLowerVolume, spawn, {.v = decrvol } },
+ };
+
+ /* button definitions */
More information about the svn-ports-all
mailing list