Index: head/x11-wm/dwm/Makefile =================================================================== --- head/x11-wm/dwm/Makefile (revision 469640) +++ head/x11-wm/dwm/Makefile (revision 469641) @@ -1,55 +1,60 @@ # Created by: Jeroen Schot # $FreeBSD$ PORTNAME= dwm PORTVERSION= 6.1 PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ \ http://schot.a-eskwadraat.nl/files/ PATCH_SITES= http://dwm.suckless.org/patches/ -MAINTAINER= schot@a-eskwadraat.nl +MAINTAINER= 0mp@FreeBSD.org COMMENT= Dynamic, small, fast and simple window manager LICENSE= MIT 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" 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" @${ECHO_MSG} "Note: Pre-${PORTVERSION} config.h-files may not work." post-extract: @if [ -e "${DWM_CONF}" ]; then \ ${ECHO_MSG} "Creating symlink: config.h -> ${DWM_CONF}"; \ ${LN} -fs "${DWM_CONF}" ${WRKSRC}/config.h; \ 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 Index: head/x11-wm/dwm/files/extra-patch-config.def.h =================================================================== --- head/x11-wm/dwm/files/extra-patch-config.def.h (revision 469640) +++ head/x11-wm/dwm/files/extra-patch-config.def.h (nonexistent) @@ -1,11 +0,0 @@ ---- 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} }, \ Property changes on: head/x11-wm/dwm/files/extra-patch-config.def.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/dwm/files/superasmodkey-patch-config.def.h =================================================================== --- head/x11-wm/dwm/files/superasmodkey-patch-config.def.h (nonexistent) +++ head/x11-wm/dwm/files/superasmodkey-patch-config.def.h (revision 469641) @@ -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} }, \ Property changes on: head/x11-wm/dwm/files/superasmodkey-patch-config.def.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/dwm/files/volumecontrol-patch-config.def.h =================================================================== --- head/x11-wm/dwm/files/volumecontrol-patch-config.def.h (nonexistent) +++ head/x11-wm/dwm/files/volumecontrol-patch-config.def.h (revision 469641) @@ -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 */ Property changes on: head/x11-wm/dwm/files/volumecontrol-patch-config.def.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property