From fd33eac3bf1d8f66c3a05360c51a79f76e5412bd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 2 Oct 2018 11:16:22 -0300 Subject: [PATCH] mcwm: stop vendoring config.h files --- srcpkgs/mcwm/files/config.h | 98 ------------------------------------- srcpkgs/mcwm/template | 8 +-- 2 files changed, 4 insertions(+), 102 deletions(-) delete mode 100644 srcpkgs/mcwm/files/config.h diff --git a/srcpkgs/mcwm/files/config.h b/srcpkgs/mcwm/files/config.h deleted file mode 100644 index 0bfb3c3c765..00000000000 --- a/srcpkgs/mcwm/files/config.h +++ /dev/null @@ -1,98 +0,0 @@ -/* User configurable stuff. */ - -/* - * Move this many pixels when moving or resizing with keyboard unless - * the window has hints saying otherwise. - */ -#define MOVE_STEP 32 - -/* - * Use this modifier combined with other keys to control wm from - * keyboard. Default is Mod4, which on my keyboard is the Alt key but - * is usually the Windows key on more normal keyboard layouts. - */ -#define MODKEY XCB_MOD_MASK_4 - -/* Extra modifier for resizing. Default is Shift. */ -#define SHIFTMOD XCB_MOD_MASK_SHIFT - -/* - * Modifier key to use with mouse buttons. Default Mod1, Meta on my - * keyboard. - */ -#define MOUSEMODKEY XCB_MOD_MASK_1 - -/* - * Start this program when pressing MODKEY + USERKEY_TERMINAL. Needs - * to be in $PATH. - * - * Change to "xterm" if you're feeling conservative. - * - * Can be set from command line with "-t program". - */ -#define TERMINAL "urxvt" - -/* - * Do we allow windows to be iconified? Set to true if you want this - * behaviour to be default. Can also be set by calling mcwm with -i. - */ -#define ALLOWICONS false - -/* - * Start these programs when pressing MOUSEMODKEY and mouse buttons on - * root window. - */ -#define MOUSE1 "" -#define MOUSE2 "" -#define MOUSE3 "mcmenu" - -/* - * Default colour on border for focused windows. Can be set from - * command line with "-f colour". - */ -#define FOCUSCOL "chocolate1" - -/* Ditto for unfocused. Use "-u colour". */ -#define UNFOCUSCOL "grey40" - -/* Ditto for fixed windows. Use "-x colour". */ -#define FIXEDCOL "grey90" - -/* Default width of border window, in pixels. Used unless -b width. */ -#define BORDERWIDTH 1 - -/* - * Keysym codes for window operations. Look in X11/keysymdefs.h for - * actual symbols. Use XK_VoidSymbol to disable a function. - */ -#define USERKEY_FIX XK_F -#define USERKEY_MOVE_LEFT XK_H -#define USERKEY_MOVE_DOWN XK_J -#define USERKEY_MOVE_UP XK_K -#define USERKEY_MOVE_RIGHT XK_L -#define USERKEY_MAXVERT XK_M -#define USERKEY_RAISE XK_R -#define USERKEY_TERMINAL XK_Return -#define USERKEY_MAX XK_X -#define USERKEY_CHANGE XK_Tab -#define USERKEY_BACKCHANGE XK_VoidSymbol -#define USERKEY_WS1 XK_1 -#define USERKEY_WS2 XK_2 -#define USERKEY_WS3 XK_3 -#define USERKEY_WS4 XK_4 -#define USERKEY_WS5 XK_5 -#define USERKEY_WS6 XK_6 -#define USERKEY_WS7 XK_7 -#define USERKEY_WS8 XK_8 -#define USERKEY_WS9 XK_9 -#define USERKEY_WS10 XK_0 -#define USERKEY_PREVWS XK_C -#define USERKEY_NEXTWS XK_V -#define USERKEY_TOPLEFT XK_Y -#define USERKEY_TOPRIGHT XK_U -#define USERKEY_BOTLEFT XK_B -#define USERKEY_BOTRIGHT XK_N -#define USERKEY_DELETE XK_End -#define USERKEY_PREVSCREEN XK_comma -#define USERKEY_NEXTSCREEN XK_period -#define USERKEY_ICONIFY XK_I diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template index 538c0b29e67..08688e6c993 100644 --- a/srcpkgs/mcwm/template +++ b/srcpkgs/mcwm/template @@ -2,8 +2,8 @@ pkgname=mcwm _distver=20130209 _patchver=2 -wrksrc=${pkgname}-${_distver}-${_patchver} -version=${_distver}.${_patchver} +wrksrc="${pkgname}-${_distver}-${_patchver}" +version="${_distver}.${_patchver}" revision=6 build_style=gnu-makefile conflicts="2bwm>=0" @@ -12,11 +12,11 @@ short_desc="A minimalist stacking X window manager based on XCB" maintainer='Juan RP ' license="ISC" homepage="http://hack.org/mc/projects/mcwm/" -distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-${_distver}-${_patchver}.tar.bz2" +distfiles="http://hack.org/mc/hacks/${pkgname}/${pkgname}-${_distver}-${_patchver}.tar.bz2" checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be do_build() { - cp ${FILESDIR}/config.h config.h + [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h sed -i 's/man\/man1/share\/man\/man1/g' Makefile make CC=$CC ${makejobs} }