Re: [UPDATE] x11/dwm

[Joerg Jung]

On Tue, Nov 10, 2015 at 06:33:56PM -0500, Ted Unangst wrote:
> Joerg Jung wrote:
> > So this is not only needed by dwm but all suckless ports and leads to a
> > suckless bsd.port.mk module.
> 
> Now we're going a bit far afield. For today, I'm ok with the update as is,
> with the man page bits.

Ok, I committed it as is for now.  All other discussed non-trivial
changes might be tackled later.  Need to think about this for a while,
maybe someone else comes up with something meanwhile.
 
> I do like the consistency our port offers, 

I kept this consistency for now, old habbits... yalla yalla :)

> vs reflecting whatever the whim of
> the day is for upstream. If anything, having a patch in patches made it easier
> for me to change the font, since I can just edit the patch instead of trying
> to generate a new one.

This argument does not count, as you see only half of the config options
(the ones which we adjusted from vanilla).

> I'll note that anybody who does wish to override the terminal can easily put a
> symlink in ~/bin/uxterm that points anywhere they like.

Re: [UPDATE] x11/dwm

[Joerg Jung]

On Tue, Nov 10, 2015 at 11:44:20PM +0100, Joerg Jung wrote:
> On Tue, Nov 10, 2015 at 04:24:00PM -0500, Ted Unangst wrote:
> 
> > (All that said, since I had to build 6.1 by myself to test, I also changed 
> > the
> > font to ubuntu mono to match my xterms, so maybe I will just keep building 
> > it
> > myself the way I like, so my opinion doesn't count.)
> 
> I'm thinking about removing terminus font as dependency and instead keep
> upstreams "monospace" font setting as default.  Then you and others may
> not need to build it anymore and can just adjust ~/fonts.conf as needed. 

I decided to keep the terminus font and the same look & feel to stay in
sync with the other suckless ports.  I think users can easily override
the font without re-compiling the port, using something like the snippet
below in ~/.fonts.conf






Terminus


Inconsolata

Re: [UPDATE] x11/dwm

[Ted Unangst]

Joerg Jung wrote:
> 
> > On 09 Nov 2015, at 22:07, Ted Unangst  wrote:
> > Joerg Jung wrote:
> >> 
> >> please find below an update for x11/dwm to 6.1.  This release contains
> >> various fixes and improvements, see announcement [1] for more details.
> >> 
> >> OK?
> > 
> > so now that we finally changed the default xterm back to uxterm, they 
> > changed
> > it to st. needs another man page patch. :)
> 
> I wonder what dwm users think about the following proposal:
> 
> Remove the uxterm patch and keep st as the default terminal.
> If you are a dwm/dmenu suckless user on your desktop you are 
> probably also fine with using st. 
> 
> st has become rather stable and usable. A lot of issues are 
> fixed and most terminal applications seem to work just fine.
> 
> Other “desktop environments” also all start their own terminals 
> (e.g. gnome, kde, xfce, …).
> 
> Or does this go one step too far?!  What do you think?

I've never liked st. I don't love xterm, per se, but despite the mind numbing
code it mostly seems to work. In particular, I like scrollback and I don't
want to run 32 different tmux sessions to get the same effect. Maybe they're
fixed, but I also had some screen drawing glitches in st a year or so ago.

Now I'm also old and cranky and I think gterm, kterm, eterm, etc. are all
stupid ideas too, but I'm not using dwm because I want to buy into the
suckless desktop environment. I just want a window manager.

(All that said, since I had to build 6.1 by myself to test, I also changed the
font to ubuntu mono to match my xterms, so maybe I will just keep building it
myself the way I like, so my opinion doesn't count.)

Re: [UPDATE] x11/dwm

[Ted Unangst]

Joerg Jung wrote:
> So this is not only needed by dwm but all suckless ports and leads to a
> suckless bsd.port.mk module.

Now we're going a bit far afield. For today, I'm ok with the update as is,
with the man page bits.

I do like the consistency our port offers, vs reflecting whatever the whim of
the day is for upstream. If anything, having a patch in patches made it easier
for me to change the font, since I can just edit the patch instead of trying
to generate a new one.

I'll note that anybody who does wish to override the terminal can easily put a
symlink in ~/bin/uxterm that points anywhere they like.

Re: [UPDATE] x11/dwm

[Gleydson Soares]

On Tue, Nov 10, 2015 at 11:30:02AM +0100, Joerg Jung wrote:
> 
> > On 09 Nov 2015, at 22:07, Ted Unangst  wrote:
> > Joerg Jung wrote:
> >> 
> >> please find below an update for x11/dwm to 6.1.  This release contains
> >> various fixes and improvements, see announcement [1] for more details.
> >> 
> >> OK?
> > 
> > so now that we finally changed the default xterm back to uxterm, they 
> > changed
> > it to st. needs another man page patch. :)
> 
> I wonder what dwm users think about the following proposal:
> 
> Remove the uxterm patch and keep st as the default terminal.
> If you are a dwm/dmenu suckless user on your desktop you are 
> probably also fine with using st. 
> 
> st has become rather stable and usable. A lot of issues are 
> fixed and most terminal applications seem to work just fine.
> 
> Other “desktop environments” also all start their own terminals 
> (e.g. gnome, kde, xfce, …).
> 
> Or does this go one step too far?!  What do you think?

here is a proposal [1]
the idea of dwm is that user can edit your own def.h and rebuild it.

we should zap the patch and add our modified config.def.h to files/ directory
so others can to edit/override it with your own version
?

diff includes man page bit pointed out by ingo@

[1] - shutupandhack.org/~gsoares/openbsd/dwm-6.1_.diff

?
Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile25 Oct 2015 14:23:07 -  1.26
+++ Makefile10 Nov 2015 22:25:41 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-DISTNAME=  dwm-6.0
-REVISION=  1
+DISTNAME=  dwm-6.1
 
 CATEGORIES=x11
 
@@ -18,12 +17,16 @@ WANTLIB=X11 Xinerama c
 
 MASTER_SITES=  http://dl.suckless.org/dwm/
 
-RUN_DEPENDS=   x11/dmenu>=4.4 \
+RUN_DEPENDS=   x11/dmenu>=4.6 \
fonts/terminus-font
 
 MAKE_ENV=  LDFLAGS="${LDFLAGS}"
 FAKE_FLAGS=DESTDIR=""
 
 NO_TEST=   Yes
+
+pre-configure:
+   cd  ${WRKSRC}/ && cp config.def.h config.def.h.orig
+   cp ${FILESDIR}/config.def.h ${WRKSRC}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.18
+++ distinfo10 Nov 2015 22:25:41 -
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
-SIZE (dwm-6.0.tar.gz) = 20810
+SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
+SIZE (dwm-6.1.tar.gz) = 25887
Index: files/config.def.h
===
RCS file: files/config.def.h
diff -N files/config.def.h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ files/config.def.h  10 Nov 2015 22:25:41 -
@@ -0,0 +1,115 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const char *fonts[] = {
+   "terminus:size=8"
+};
+static const char dmenufont[]   = "terminus:size=8";
+static const char normbordercolor[] = "#404040";
+static const char normbgcolor[] = "#202020";
+static const char normfgcolor[] = "#c0c0c0";
+static const char selbordercolor[]  = "#ff";
+static const char selbgcolor[]  = "#404040";
+static const char selfgcolor[]  = "#f0f0f0";
+static const unsigned int borderpx  = 1;/* border pixel of windows */
+static const unsigned int snap  = 32;   /* snap pixel */
+static const int showbar= 1;/* 0 means no bar */
+static const int topbar = 1;/* 0 means bottom bar */
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+   /* xprop(1):
+*  WM_CLASS(STRING) = instance, class
+*  WM_NAME(STRING) = title
+*/
+   /* class  instancetitle   tags mask isfloating   
monitor */
+   { "Gimp", NULL,   NULL,   0,1,   -1 },
+   { "Firefox",  NULL,   NULL,   1 << 8,   0,   -1 },
+   { "Xonix",NULL,   NULL,   0,1,   -1 },
+   { NULL,   NULL,   "glxgears", 0,1,   -1 },
+};
+
+/* layout(s) */
+static const float mfact = 0.55; /* factor of master area size 
[0.05..0.95] */
+static const int nmaster = 1;/* number of clients in master area */
+static const int resizehints = 1;/* 1 means respect size hints in tiled 
resizals */
+
+static const Layout layouts[] = {
+   /* symbol arrange function */
+   { "[]=",  tile },/* first entry is default */
+   { "><>",  NULL },/* no layout function means floating behavior 
*/
+   { 

Re: [UPDATE] x11/dwm

[Stuart Henderson]

Seems like this program could do with a configuration file!

Re: [UPDATE] x11/dwm

[Joerg Jung]

On Tue, Nov 10, 2015 at 07:44:06PM -0300, Gleydson Soares wrote:
> On Tue, Nov 10, 2015 at 11:30:02AM +0100, Joerg Jung wrote:
> > 
> > > On 09 Nov 2015, at 22:07, Ted Unangst  wrote:
> > > Joerg Jung wrote:
> > >> 
> > >> please find below an update for x11/dwm to 6.1.  This release contains
> > >> various fixes and improvements, see announcement [1] for more details.
> > >> 
> > >> OK?
> > > 
> > > so now that we finally changed the default xterm back to uxterm, they 
> > > changed
> > > it to st. needs another man page patch. :)
> > 
> > I wonder what dwm users think about the following proposal:
> > 
> > Remove the uxterm patch and keep st as the default terminal.
> > If you are a dwm/dmenu suckless user on your desktop you are 
> > probably also fine with using st. 
> > 
> > st has become rather stable and usable. A lot of issues are 
> > fixed and most terminal applications seem to work just fine.
> > 
> > Other “desktop environments” also all start their own terminals 
> > (e.g. gnome, kde, xfce, …).
> > 
> > Or does this go one step too far?!  What do you think?
> 
> here is a proposal [1]
> the idea of dwm is that user can edit your own def.h and rebuild it.

Right. The same approach is used in others as well, e.g. 
tabbed, dmenu, surf, ... 

So this is not only needed by dwm but all suckless ports and leads to a
suckless bsd.port.mk module.

> we should zap the patch and add our modified config.def.h to files/ directory
> so others can to edit/override it with your own version
> ?

Mhhmmm... this way you have always M's in your tree, because 
config.def.h is committed.
Better not commit it to have '?' instead of 'M's?
And what about using patches instead, like this:

pre-configure:
cd ${WRKSRC} && patch -p0 < ${FILESDIR}/config.def.h.diff

However, I think this is a good starting point, but might be not enough. 
Think of package updates/upgrades: You will loose the customizations 
with them.

I already discussed a similar approach with czarkoff@ at u2k15, here are 
some of our thoughts:

1. first, we need a directory were root user can put (config.def.h)
   patches he wants to have applied on top of existing port
- should be something standardized like /usr/ports/mypatches or
  /etc/ports/patches or whatever... no matter, let's call this
  dir $PATCHES for now

2. secondly, we need a bsd.port.mk module which uses/applies these
   patches from $PATCHES folder
- so, sub-folders for ports are needed, e.g. $PATCHES/dwm
- the module might also "bump" the port, and introduce a
  "-custom flavor", e.g. dwm-6.0p1-custom.tgz

3. once the ports infrastructure is there and working, the pkg_* tools
   can be adjusted: e.g. if pkg_add -u finds a dwm -custom installed, it
   should issue a rebuild with user patches applied from ports tree

I think 1.+2. are easy and we should start with it.
The 3. is much more complicated and others like espie might not like it.

...

But maybe this all goes to far and is not worthwhile, and we should
instead just handle all suckless ports as you proposed below -- simply
put all own patches/files in files/ dir and force users to manually
rebuilt from port after upgrades... fine with me as well, as long as
all suckless ports treated similar.

> diff includes man page bit pointed out by ingo@
> 
> [1] - shutupandhack.org/~gsoares/openbsd/dwm-6.1_.diff
> 
> ?

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/dwm/Makefile,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 Makefile
> --- Makefile  25 Oct 2015 14:23:07 -  1.26
> +++ Makefile  10 Nov 2015 22:25:41 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= dynamic window manager
>  
> -DISTNAME=dwm-6.0
> -REVISION=1
> +DISTNAME=dwm-6.1
>  
>  CATEGORIES=  x11
>  
> @@ -18,12 +17,16 @@ WANTLIB=  X11 Xinerama c
>  
>  MASTER_SITES=http://dl.suckless.org/dwm/
>  
> -RUN_DEPENDS= x11/dmenu>=4.4 \
> +RUN_DEPENDS= x11/dmenu>=4.6 \
>   fonts/terminus-font
>  
>  MAKE_ENV=LDFLAGS="${LDFLAGS}"
>  FAKE_FLAGS=  DESTDIR=""
>  
>  NO_TEST= Yes
> +
> +pre-configure:
> + cd  ${WRKSRC}/ && cp config.def.h config.def.h.orig
> + cp ${FILESDIR}/config.def.h ${WRKSRC}
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/dwm/distinfo,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 distinfo
> --- distinfo  18 Jan 2015 03:15:53 -  1.18
> +++ distinfo  10 Nov 2015 22:25:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
> -SIZE (dwm-6.0.tar.gz) = 20810
> +SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
> +SIZE (dwm-6.1.tar.gz) = 25887
> Index: files/config.def.h
> 

Re: [UPDATE] x11/dwm

[Joerg Jung]

> On 10 Nov 2015, at 02:48, Ingo Schwarze  wrote:
> 
> From .Xr, mandoc -Tman produces just "uxterm(1)" without any
> markup.  The man(7) manual recommends ".BR uxterm ( 1 ).",
> i.e. keeping the punctuation out of bold face.  But for
> consistency with the rest of the page, you probably want
> 
>  .BR uxterm (1).

Ok, I will adjust it and add the space before I commit. 

Re: [UPDATE] x11/dwm

[Joerg Jung]

> On 09 Nov 2015, at 22:07, Ted Unangst  wrote:
> Joerg Jung wrote:
>> 
>> please find below an update for x11/dwm to 6.1.  This release contains
>> various fixes and improvements, see announcement [1] for more details.
>> 
>> OK?
> 
> so now that we finally changed the default xterm back to uxterm, they changed
> it to st. needs another man page patch. :)

I wonder what dwm users think about the following proposal:

Remove the uxterm patch and keep st as the default terminal.
If you are a dwm/dmenu suckless user on your desktop you are 
probably also fine with using st. 

st has become rather stable and usable. A lot of issues are 
fixed and most terminal applications seem to work just fine.

Other “desktop environments” also all start their own terminals 
(e.g. gnome, kde, xfce, …).

Or does this go one step too far?!  What do you think?

Re: [UPDATE] x11/dwm

[Dmitrij D. Czarkoff]

Joerg Jung said:
> Remove the uxterm patch and keep st as the default terminal.

Although I am not dwm user any more, this makes sense to me.

FWIW I used to have a local patch that made dwm inspect env variable
TERMINAL and call whatever it contains.

-- 
Dmitrij D. Czarkoff

Re: [UPDATE] x11/dwm

[Joerg Jung]

> On 10 Nov 2015, at 14:58, Jack J. Woehr  wrote:
> 
> Joerg Jung wrote:
>> I wonder what dwm users think about the following proposal: Remove the 
>> uxterm patch and keep st as the default terminal
> 
> dwm user here.
> 
> Since we can always change that in seconds and recompile, hardly matters.

Ok, noted.

> OT, have you tried to run NetBeans 6.9.1 under dwm? It loads but is invisible 
> on my dwm setup.

Sorry, but no :)

Java applications are well known for having problems with dwm (and
other tiling window managers).

There are various workarounds and fixes you can try, see BUGS 
section in dwm(1) or http://tools.suckless.org/wmname.

> -- 
> Jack J. Woehr # Science is more than a body of knowledge. It's a way of
> www.well.com/~jax # thinking, a way of skeptically interrogating the universe
> www.softwoehr.com # with a fine understanding of human fallibility. - Carl 
> Sagan
> 

Re: [UPDATE] x11/dwm

[Jack J. Woehr]

Joerg Jung wrote:

I wonder what dwm users think about the following proposal: Remove the uxterm 
patch and keep st as the default terminal


dwm user here.

Since we can always change that in seconds and recompile, hardly matters.

OT, have you tried to run NetBeans 6.9.1 under dwm? It loads but is invisible 
on my dwm setup.

--
Jack J. Woehr # Science is more than a body of knowledge. It's a way of
www.well.com/~jax # thinking, a way of skeptically interrogating the universe
www.softwoehr.com # with a fine understanding of human fallibility. - Carl Sagan

Re: [UPDATE] x11/dwm

[Ted Unangst]

Joerg Jung wrote:
> Hi,
> 
> please find below an update for x11/dwm to 6.1.  This release contains
> various fixes and improvements, see announcement [1] for more details.
> 
> OK?

so now that we finally changed the default xterm back to uxterm, they changed
it to st. needs another man page patch. :)

Re: [UPDATE] x11/dwm

[Joerg Jung]

On Mon, Nov 09, 2015 at 04:07:56PM -0500, Ted Unangst wrote:
> Joerg Jung wrote:
> > Hi,
> > 
> > please find below an update for x11/dwm to 6.1.  This release contains
> > various fixes and improvements, see announcement [1] for more details.
> > 
> > OK?
> 
> so now that we finally changed the default xterm back to uxterm, they changed
> it to st. needs another man page patch. :)

You are right. Updated diff including man page patch below.


Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile25 Oct 2015 14:23:07 -  1.26
+++ Makefile9 Nov 2015 21:30:56 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-DISTNAME=  dwm-6.0
-REVISION=  1
+DISTNAME=  dwm-6.1
 
 CATEGORIES=x11
 
@@ -18,7 +17,7 @@ WANTLIB=  X11 Xinerama c
 
 MASTER_SITES=  http://dl.suckless.org/dwm/
 
-RUN_DEPENDS=   x11/dmenu>=4.4 \
+RUN_DEPENDS=   x11/dmenu>=4.6 \
fonts/terminus-font
 
 MAKE_ENV=  LDFLAGS="${LDFLAGS}"
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.18
+++ distinfo9 Nov 2015 21:30:56 -
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
-SIZE (dwm-6.0.tar.gz) = 20810
+SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
+SIZE (dwm-6.1.tar.gz) = 25887
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_def_h
--- patches/patch-config_def_h  25 Oct 2015 14:23:07 -  1.10
+++ patches/patch-config_def_h  9 Nov 2015 21:30:56 -
@@ -1,18 +1,21 @@
 $OpenBSD: patch-config_def_h,v 1.10 2015/10/25 14:23:07 jung Exp $
 config.def.h.orig  Mon Dec 19 16:02:46 2011
-+++ config.def.h   Thu Oct  8 20:58:14 2015
-@@ -1,13 +1,13 @@
- /* See LICENSE file for copyright and license details. */
+--- config.def.h.orig  Sun Nov  8 23:39:37 2015
 config.def.h   Mon Nov  9 21:23:42 2015
+@@ -2,15 +2,15 @@
  
  /* appearance */
--static const char font[]= 
"-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
+ static const char *fonts[] = {
+-  "monospace:size=10"
++  "terminus:size=8"
+ };
+-static const char dmenufont[]   = "monospace:size=10";
 -static const char normbordercolor[] = "#44";
 -static const char normbgcolor[] = "#22";
 -static const char normfgcolor[] = "#bb";
 -static const char selbordercolor[]  = "#005577";
 -static const char selbgcolor[]  = "#005577";
 -static const char selfgcolor[]  = "#ee";
-+static const char font[]= 
"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*";
++static const char dmenufont[]   = "terminus:size=8";
 +static const char normbordercolor[] = "#404040";
 +static const char normbgcolor[] = "#202020";
 +static const char normfgcolor[] = "#c0c0c0";
@@ -21,13 +24,22 @@ $OpenBSD: patch-config_def_h,v 1.10 2015
 +static const char selfgcolor[]  = "#f0f0f0";
  static const unsigned int borderpx  = 1;/* border pixel of windows */
  static const unsigned int snap  = 32;   /* snap pixel */
- static const Bool showbar   = True; /* False means no bar */
-@@ -20,6 +20,8 @@ static const Rule rules[] = {
+ static const int showbar= 1;/* 0 means no bar */
+@@ -27,6 +27,8 @@ static const Rule rules[] = {
/* class  instancetitle   tags mask isfloating   
monitor */
-   { "Gimp", NULL,   NULL,   0,True,-1 },
-   { "Firefox",  NULL,   NULL,   1 << 8,   False,   -1 },
-+  { "Xonix",NULL,   NULL,   0,True,-1 },
-+  { NULL,   NULL,   "glxgears", 0,True,-1 },
+   { "Gimp", NULL,   NULL,   0,1,   -1 },
+   { "Firefox",  NULL,   NULL,   1 << 8,   0,   -1 },
++  { "Xonix",NULL,   NULL,   0,1,   -1 },
++  { NULL,   NULL,   "glxgears", 0,1,   -1 },
  };
  
  /* layout(s) */
+@@ -55,7 +57,7 @@ static const Layout layouts[] = {
+ /* commands */
+ 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 *termcmd[]  = { "uxterm", NULL };
+ 
+ static Key keys[] = {
+   /* 

Re: [UPDATE] x11/dwm

[Ingo Schwarze]

Hi Joerg,

Joerg Jung wrote on Mon, Nov 09, 2015 at 10:31:10PM +0100:

> Index: patches/patch-dwm_1
> ===
> RCS file: patches/patch-dwm_1
> diff -N patches/patch-dwm_1
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-dwm_1   9 Nov 2015 21:30:56 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- dwm.1.orig   Mon Nov  9 22:25:40 2015
>  dwm.1Mon Nov  9 22:26:32 2015
> +@@ -57,7 +57,7 @@ click on a tag label adds/removes that tag to/from the
> + .TP
> + .B Mod1\-Shift\-Return
> + Start
> +-.BR st(1).
> ++.BR uxterm(1).

The line

  .BR uxterm(1).

makes no sense.  You don't need a font alternation macro if you
just have one single argument.

>From .Xr, mandoc -Tman produces just "uxterm(1)" without any
markup.  The man(7) manual recommends ".BR uxterm ( 1 ).",
i.e. keeping the punctuation out of bold face.  But for
consistency with the rest of the page, you probably want

  .BR uxterm (1).

Oh well, there is no consistent style for man(7) manuals, anyway.

This is not a comment on the port update - the words "man page patch"
just triggered my curiosity.  :-)

Yours,
  Ingo


> + .TP
> + .B Mod1\-,
> + Focus previous screen, if any.
> +@@ -151,7 +151,7 @@ dwm is customized by creating a custom config.h and (r
> + code. This keeps it fast, secure and simple.
> + .SH SEE ALSO
> + .BR dmenu (1),
> +-.BR st (1)
> ++.BR uxterm (1)
> + .SH BUGS
> + Java applications which use the XToolkit/XAWT backend may draw grey windows
> + only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 
> and early
> 

Re: UPDATE x11/dwm to 6.0

[Jim Razmus]

I'll test this evening.

Thanks,
jim@

* Joerg Zinke m...@umaxx.net [120708 04:22]:
 On Sat, Jul 07, 2012 at 10:37:47PM +0200, Joerg Zinke wrote:
 
  please find below an update for x11/dwm to version 6.0.
  
  Any objections, OKs?
 
 Previous diff got mangled, new one below.
  
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/dwm/Makefile,v
 retrieving revision 1.22
 diff -u -p -r1.22 Makefile
 --- Makefile  13 Sep 2011 14:02:53 -  1.22
 +++ Makefile  8 Jul 2012 09:11:19 -
 @@ -2,7 +2,7 @@
  
  COMMENT= dynamic window manager
  
 -DISTNAME=dwm-5.9
 +DISTNAME=dwm-6.0
  
  CATEGORIES=  x11
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/x11/dwm/distinfo,v
 retrieving revision 1.16
 diff -u -p -r1.16 distinfo
 --- distinfo  13 Sep 2011 14:02:53 -  1.16
 +++ distinfo  8 Jul 2012 09:11:19 -
 @@ -1,5 +1,5 @@
 -MD5 (dwm-5.9.tar.gz) = J5n4hcBYF8oRLVIbskf3lw==
 -RMD160 (dwm-5.9.tar.gz) = kq8nhZfbcG+ypLY6qRaaPvYSzSw=
 -SHA1 (dwm-5.9.tar.gz) = RdARtwzuAgjEO3VmUMb3NuDIZhs=
 -SHA256 (dwm-5.9.tar.gz) = Lc3VoqIzw4Xvd2AXJjFkooiIZWG2v01rmEVi9fAv4jI=
 -SIZE (dwm-5.9.tar.gz) = 20517
 +MD5 (dwm-6.0.tar.gz) = i7ANQUIlm+sR4TRzuBwIVw==
 +RMD160 (dwm-6.0.tar.gz) = bs0DovyKb5/UNuj1je3DBcSlu/c=
 +SHA1 (dwm-6.0.tar.gz) = NTRvhzon8hmuJmWUs2kEB/ldBu8=
 +SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
 +SIZE (dwm-6.0.tar.gz) = 20810
 Index: patches/patch-config_def_h
 ===
 RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
 retrieving revision 1.8
 diff -u -p -r1.8 patch-config_def_h
 --- patches/patch-config_def_h27 Jun 2010 01:03:55 -  1.8
 +++ patches/patch-config_def_h8 Jul 2012 09:11:19 -
 @@ -1,17 +1,17 @@
  $OpenBSD: patch-config_def_h,v 1.8 2010/06/27 01:03:55 jim Exp $
  config.def.h.origFri Jun  4 06:39:15 2010
 -+++ config.def.h Sat Jun 26 20:24:09 2010
 +--- config.def.h.origMon Dec 19 16:02:46 2011
  config.def.h Sat Jul  7 22:28:18 2012
  @@ -1,13 +1,13 @@
   /* See LICENSE file for copyright and license details. */
   
   /* appearance */
  -static const char font[]= 
 -*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*;
 --static const char normbordercolor[] = #cc;
 --static const char normbgcolor[] = #cc;
 --static const char normfgcolor[] = #00;
 --static const char selbordercolor[]  = #0066ff;
 --static const char selbgcolor[]  = #0066ff;
 --static const char selfgcolor[]  = #ff;
 +-static const char normbordercolor[] = #44;
 +-static const char normbgcolor[] = #22;
 +-static const char normfgcolor[] = #bb;
 +-static const char selbordercolor[]  = #005577;
 +-static const char selbgcolor[]  = #005577;
 +-static const char selfgcolor[]  = #ee;
  +static const char font[]= 
 -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*;
  +static const char normbordercolor[] = #404040;
  +static const char normbgcolor[] = #202020;
 @@ -31,7 +31,7 @@ $OpenBSD: patch-config_def_h,v 1.8 2010/
   };
   
   /* layout(s) */
 -@@ -46,7 +48,7 @@ static const Layout layouts[] = {
 +@@ -47,7 +49,7 @@ static const Layout layouts[] = {
   
   /* commands */
   static const char *dmenucmd[] = { dmenu_run, -fn, font, -nb, 
 normbgcolor, -nf, normfgcolor, -sb, selbgcolor, -sf, selfgcolor, NULL };
 Index: patches/patch-config_mk
 ===
 RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
 retrieving revision 1.8
 diff -u -p -r1.8 patch-config_mk
 --- patches/patch-config_mk   13 Sep 2011 14:02:53 -  1.8
 +++ patches/patch-config_mk   8 Jul 2012 09:11:19 -
 @@ -1,7 +1,7 @@
  $OpenBSD: patch-config_mk,v 1.8 2011/09/13 14:02:53 gsoares Exp $
  config.mk.orig   Sun Jul 10 17:24:25 2011
 -+++ config.mkTue Jul 26 10:44:28 2011
 -@@ -4,30 +4,30 @@ VERSION = 5.9
 +--- config.mk.orig   Mon Dec 19 16:02:46 2011
  config.mkSat Jul  7 22:28:18 2012
 +@@ -4,30 +4,30 @@ VERSION = 6.0
   # Customize below to fit your system
   
   # paths
 

Re: UPDATE x11/dwm to 6.0

[Joerg Zinke]

On Sat, Jul 07, 2012 at 10:37:47PM +0200, Joerg Zinke wrote:

 please find below an update for x11/dwm to version 6.0.
 
 Any objections, OKs?

Previous diff got mangled, new one below.
 
Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile13 Sep 2011 14:02:53 -  1.22
+++ Makefile8 Jul 2012 09:11:19 -
@@ -2,7 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-DISTNAME=  dwm-5.9
+DISTNAME=  dwm-6.0
 
 CATEGORIES=x11
 
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo13 Sep 2011 14:02:53 -  1.16
+++ distinfo8 Jul 2012 09:11:19 -
@@ -1,5 +1,5 @@
-MD5 (dwm-5.9.tar.gz) = J5n4hcBYF8oRLVIbskf3lw==
-RMD160 (dwm-5.9.tar.gz) = kq8nhZfbcG+ypLY6qRaaPvYSzSw=
-SHA1 (dwm-5.9.tar.gz) = RdARtwzuAgjEO3VmUMb3NuDIZhs=
-SHA256 (dwm-5.9.tar.gz) = Lc3VoqIzw4Xvd2AXJjFkooiIZWG2v01rmEVi9fAv4jI=
-SIZE (dwm-5.9.tar.gz) = 20517
+MD5 (dwm-6.0.tar.gz) = i7ANQUIlm+sR4TRzuBwIVw==
+RMD160 (dwm-6.0.tar.gz) = bs0DovyKb5/UNuj1je3DBcSlu/c=
+SHA1 (dwm-6.0.tar.gz) = NTRvhzon8hmuJmWUs2kEB/ldBu8=
+SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
+SIZE (dwm-6.0.tar.gz) = 20810
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_def_h
--- patches/patch-config_def_h  27 Jun 2010 01:03:55 -  1.8
+++ patches/patch-config_def_h  8 Jul 2012 09:11:19 -
@@ -1,17 +1,17 @@
 $OpenBSD: patch-config_def_h,v 1.8 2010/06/27 01:03:55 jim Exp $
 config.def.h.orig  Fri Jun  4 06:39:15 2010
-+++ config.def.h   Sat Jun 26 20:24:09 2010
+--- config.def.h.orig  Mon Dec 19 16:02:46 2011
 config.def.h   Sat Jul  7 22:28:18 2012
 @@ -1,13 +1,13 @@
  /* See LICENSE file for copyright and license details. */
  
  /* appearance */
 -static const char font[]= 
-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*;
--static const char normbordercolor[] = #cc;
--static const char normbgcolor[] = #cc;
--static const char normfgcolor[] = #00;
--static const char selbordercolor[]  = #0066ff;
--static const char selbgcolor[]  = #0066ff;
--static const char selfgcolor[]  = #ff;
+-static const char normbordercolor[] = #44;
+-static const char normbgcolor[] = #22;
+-static const char normfgcolor[] = #bb;
+-static const char selbordercolor[]  = #005577;
+-static const char selbgcolor[]  = #005577;
+-static const char selfgcolor[]  = #ee;
 +static const char font[]= 
-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*;
 +static const char normbordercolor[] = #404040;
 +static const char normbgcolor[] = #202020;
@@ -31,7 +31,7 @@ $OpenBSD: patch-config_def_h,v 1.8 2010/
  };
  
  /* layout(s) */
-@@ -46,7 +48,7 @@ static const Layout layouts[] = {
+@@ -47,7 +49,7 @@ static const Layout layouts[] = {
  
  /* commands */
  static const char *dmenucmd[] = { dmenu_run, -fn, font, -nb, 
normbgcolor, -nf, normfgcolor, -sb, selbgcolor, -sf, selfgcolor, NULL };
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mk
--- patches/patch-config_mk 13 Sep 2011 14:02:53 -  1.8
+++ patches/patch-config_mk 8 Jul 2012 09:11:19 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-config_mk,v 1.8 2011/09/13 14:02:53 gsoares Exp $
 config.mk.orig Sun Jul 10 17:24:25 2011
-+++ config.mk  Tue Jul 26 10:44:28 2011
-@@ -4,30 +4,30 @@ VERSION = 5.9
+--- config.mk.orig Mon Dec 19 16:02:46 2011
 config.mk  Sat Jul  7 22:28:18 2012
+@@ -4,30 +4,30 @@ VERSION = 6.0
  # Customize below to fit your system
  
  # paths

Re: UPDATE: x11/dwm

[Jim Razmus]

* Stanley Lieber stanley.lie...@gmail.com [100606 20:49]:
 Update dwm to 5.8.2. Uses the updated dmenu 4.1 previously posted to
 the mailing list.
 
 Tested on i386 running the June 5 snapshot of 4.7-CURRENT. Please test
 and comment.
 
 -sl
 

I'll handle this one.  Thanks for the patch.

jim

 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/dwm/Makefile,v
 retrieving revision 1.15
 diff -u -p Makefile
 --- Makefile ?? ??11 Oct 2009 13:30:38 - ?? ?? ??1.15
 +++ Makefile ?? ??7 Jun 2010 00:42:56 -
 @@ -2,7 +2,7 @@
 
 ??COMMENT= ?? ?? ?? ?? ?? ?? ?? dynamic window manager
 
 -DISTNAME= ?? ?? ?? ?? ?? ?? ??dwm-5.7.2
 +DISTNAME= ?? ?? ?? ?? ?? ?? ??dwm-5.8.2
 
 ??CATEGORIES= ?? ?? ?? ?? ?? ??x11
 
 @@ -20,7 +20,7 @@ WANTLIB= ?? ?? ?? ?? ?? ?? ??X11 Xinerama c
 
 ??MASTER_SITES= ?? ?? ?? ?? ??http://dl.suckless.org/dwm/
 
 -RUN_DEPENDS= ?? ?? ?? ?? ?? :dmenu-=3.9:x11/dmenu \
 +RUN_DEPENDS= ?? ?? ?? ?? ?? :dmenu-=4.1:x11/dmenu \
 ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ??::x11/terminus-font
 
 ??MAKE_ENV= ?? ?? ?? ?? ?? ?? ??LDFLAGS=${LDFLAGS}
 Index: distinfo
 ===
 RCS file: /cvs/ports/x11/dwm/distinfo,v
 retrieving revision 1.14
 diff -u -p distinfo
 --- distinfo ?? ??11 Oct 2009 13:30:38 - ?? ?? ??1.14
 +++ distinfo ?? ??7 Jun 2010 00:42:56 -
 @@ -1,5 +1,5 @@
 -MD5 (dwm-5.7.2.tar.gz) = oLinmd3FA03YqBjJvXbzow==
 -RMD160 (dwm-5.7.2.tar.gz) = j8bMEMprDGrmn98PYSLgFbhJx6E=
 -SHA1 (dwm-5.7.2.tar.gz) = 83SrFQM1ACduq2GsUAKyzQX4y8c=
 -SHA256 (dwm-5.7.2.tar.gz) = Mr/+M9XanOxV3n5rIVVo/5lQzCS5Ospy5wl0N6K/zeA=
 -SIZE (dwm-5.7.2.tar.gz) = 19989
 +MD5 (dwm-5.8.2.tar.gz) = 8LQiv+qoEtZsbdFcPMkqaw==
 +RMD160 (dwm-5.8.2.tar.gz) = XNwir3t9Ij75Ndxl6ufI82MLK3Y=
 +SHA1 (dwm-5.8.2.tar.gz) = 7k/s7mtASWmIQIjK+6FNU4x3ufk=
 +SHA256 (dwm-5.8.2.tar.gz) = xSQ7x5Lj/zuxnwtfpF9vmLQCVK+HV6AQ0WQKTZ04m2Y=
 +SIZE (dwm-5.8.2.tar.gz) = 20326
 ? patch-port
 Index: patches/patch-Makefile
 ===
 RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
 retrieving revision 1.4
 diff -u -p patches/patch-Makefile
 --- patches/patch-Makefile ?? ?? ??16 Jul 2009 15:12:39 - ?? ?? ??1.4
 +++ patches/patch-Makefile ?? ?? ??7 Jun 2010 00:42:56 -
 @@ -1,17 +1,15 @@
 -$OpenBSD: patch-Makefile,v 1.4 2009/07/16 15:12:39 jim Exp $
  Makefile.orig ?? ?? ??Thu Apr ??3 22:57:01 2008
 -+++ Makefile ?? Wed Apr ??9 21:49:02 2008
 -@@ -15,8 +15,7 @@ options:
 - ?? ?? ?? @echo CC ?? ?? ?? = ${CC}
 +--- Makefile.orig ?? ?? ??Sun Jun ??6 19:33:13 2010
  Makefile ?? Sun Jun ??6 19:34:55 2010
 +@@ -16,7 +16,7 @@
 
 ??.c.o:
 -- ?? ?? ?...@echo CC $
 + ?? ?? ?? @echo CC $
 ??- ?? ?? ?...@${cc} -c ${CFLAGS} $
 ??+ ?? ?? ??${CC} -c ${CFLAGS} $
 
 ??${OBJ}: config.h config.mk
 
 -@@ -25,8 +24,7 @@ config.h:
 +@@ -25,8 +25,7 @@
 ?? ?? ?? ?...@cp config.def.h $@
 
 ??dwm: ${OBJ}
 @@ -21,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/07/16 15:12:39 jim
 
 ??clean:
 ?? ?? ?? ?...@echo cleaning
 -@@ -42,14 +40,12 @@ dist: clean
 +@@ -42,14 +41,12 @@
 ?? ?? ?? ?...@rm -rf dwm-${VERSION}
 
 ??install: all
 Index: patches/patch-config_def_h
 ===
 RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
 retrieving revision 1.7
 diff -u -p patches/patch-config_def_h
 --- patches/patch-config_def_h ??16 Jul 2009 15:12:39 - ?? ?? ??1.7
 +++ patches/patch-config_def_h ??7 Jun 2010 00:42:56 -
 @@ -1,18 +1,15 @@
 -$OpenBSD: patch-config_def_h,v 1.7 2009/07/16 15:12:39 jim Exp $
  config.def.h.orig ??Tue Jul 14 14:07:55 2009
 -+++ config.def.h ?? ?? ?? Wed Jul 15 15:54:40 2009
 -@@ -1,13 +1,13 @@
 - /* See LICENSE file for copyright and license details. */
 +--- config.def.h.orig ??Sun Jun ??6 19:35:33 2010
  config.def.h ?? ?? ?? Sun Jun ??6 19:37:02 2010
 +@@ -2,12 +2,12 @@
 
 ??/* appearance */
 --static const char font[] ?? ?? ?? ?? ?? ??= 
 -*-*-medium-*-*-*-14-*-*-*-*-*-*-*;
 + static const char font[] ?? ?? ?? ?? ?? ??=
 -*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*;
 ??-static const char normbordercolor[] = #cc;
 ??-static const char normbgcolor[] ?? ?? = #cc;
 ??-static const char normfgcolor[] ?? ?? = #00;
 ??-static const char selbordercolor[] ??= #0066ff;
 ??-static const char selbgcolor[] ?? ?? ??= #0066ff;
 ??-static const char selfgcolor[] ?? ?? ??= #ff;
 -+static const char font[] ?? ?? ?? ?? ?? ??=
 -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*;
 ??+static const char normbordercolor[] = #404040;
 ??+static const char normbgcolor[] ?? ?? = #202020;
 ??+static const char normfgcolor[] ?? ?? = #c0c0c0;
 @@ -22,7 +19,7 @@ $OpenBSD: patch-config_def_h,v 1.7 2009/07/16 15:12:39
 ??static const unsigned int borderpx ??= 1; ?? ?? ?? ??/* border pixel of 
 windows */
 ??static const unsigned int snap ?? ?? ??= 32; ?? ?? ?? /* snap pixel */
 ??static const Bool showbar ?? ?? ?? ?? ?? = 

Re: UPDATE: x11/dwm

[markus ploner]

builds and works well on amd64.

Re: UPDATE: x11/dwm

[Mike Erdely]

On Tue, Apr 08, 2008 at 09:40:06AM -0400, Jim Razmus wrote:
 Uplift dwm to 4.9.  Fixes several bugs.  This update is dependent on
 Tobias update to dmenu.
 
 I've been using it daily since 4.9 was tagged.  Please test.

Jim,

How about the diff below?  It honors our CFLAGS and drops the $V
variable (as you don't use the version more than once now).

Works for me on i386 and amd64.
Builds on macppc, alpha, sparc64.

-ME

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile8 Apr 2008 15:54:35 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -24,11 +23,7 @@ MASTER_SITES=http://www.suckless.org/d
 RUN_DEPENDS=   ::x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo8 Apr 2008 15:50:42 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ patches/patch-Makefile  8 Apr 2008 15:50:42 -
@@ -1,21 +1,22 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
-@@ -15,8 +15,7 @@ options:
-   @echo CC   = ${CC}
+$OpenBSD$
+--- Makefile.orig  Fri Apr  4 16:03:22 2008
 Makefile   Fri Apr  4 16:04:30 2008
+@@ -16,9 +16,9 @@ options:
  
  .c.o:
--  @echo CC $
+   @echo CC $
 -  @${CC} -c ${CFLAGS} $
 +  ${CC} -c ${CFLAGS} $
  
- ${OBJ}: config.h config.mk
+-${OBJ}: config.h config.mk
++#${OBJ}: config.h config.mk
  
-@@ -25,8 +24,7 @@ config.h:
-   @cp config.def.h $@
+ config.h:
+   @echo creating $@ from config.def.h
+@@ -26,7 +26,7 @@ config.h:
  
  dwm: ${OBJ}
--  @echo CC -o $@
+   @echo CC -o $@
 -  @${CC} -o $@ ${OBJ} ${LDFLAGS}
 +  ${CC} -o $@ ${OBJ} ${LDFLAGS}
  
Index: patches/patch-config_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_h
--- patches/patch-config_h  25 Nov 2007 12:07:06 -  1.3
+++ patches/patch-config_h  8 Apr 2008 15:50:42 -
@@ -1,15 +1,18 @@
 config.h.orig  Sat Nov 24 23:23:08 2007
-+++ config.h   Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOSBarTop /* BarBot, BarOff */
+$OpenBSD$
+--- config.h.orig  Sat Apr  5 09:30:54 2008
 config.h   Sat Apr  5 09:35:44 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
  #define BORDERPX  1
- #define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
 -#define NORMBORDERCOLOR   #cc
 -#define NORMBGCOLOR   #cc
 -#define NORMFGCOLOR   #00
 -#define SELBORDERCOLOR#0066ff
 -#define SELBGCOLOR#0066ff
 -#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
 +#define NORMBORDERCOLOR   #404040
 +#define NORMBGCOLOR   #202020
 +#define NORMFGCOLOR   #c0c0c0
@@ -18,13 +21,20 @@
 +#define SELFGCOLOR#f0f0f0
  
  /* tagging */
- const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 
www };
-@@ -39,7 +39,7 @@ Key keys[] = {
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle  

Re: UPDATE: x11/dwm

[Mike Erdely]

On Tue, Apr 08, 2008 at 12:15:23PM -0400, Mike Erdely wrote:
 How about the diff below?  It honors our CFLAGS and drops the $V
 variable (as you don't use the version more than once now).

As jasper@ pointed out to me, the dwm diff does not require the updated
dmenu diff:

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile8 Apr 2008 16:31:28 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -21,14 +20,10 @@ WANTLIB=X11 c
 
 MASTER_SITES=  http://www.suckless.org/download/
 
-RUN_DEPENDS=   ::x11/dmenu \
+RUN_DEPENDS=   :dmenu-=3.6:x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo8 Apr 2008 15:50:42 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ patches/patch-Makefile  8 Apr 2008 15:50:42 -
@@ -1,21 +1,22 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
-@@ -15,8 +15,7 @@ options:
-   @echo CC   = ${CC}
+$OpenBSD$
+--- Makefile.orig  Fri Apr  4 16:03:22 2008
 Makefile   Fri Apr  4 16:04:30 2008
+@@ -16,9 +16,9 @@ options:
  
  .c.o:
--  @echo CC $
+   @echo CC $
 -  @${CC} -c ${CFLAGS} $
 +  ${CC} -c ${CFLAGS} $
  
- ${OBJ}: config.h config.mk
+-${OBJ}: config.h config.mk
++#${OBJ}: config.h config.mk
  
-@@ -25,8 +24,7 @@ config.h:
-   @cp config.def.h $@
+ config.h:
+   @echo creating $@ from config.def.h
+@@ -26,7 +26,7 @@ config.h:
  
  dwm: ${OBJ}
--  @echo CC -o $@
+   @echo CC -o $@
 -  @${CC} -o $@ ${OBJ} ${LDFLAGS}
 +  ${CC} -o $@ ${OBJ} ${LDFLAGS}
  
Index: patches/patch-config_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_h
--- patches/patch-config_h  25 Nov 2007 12:07:06 -  1.3
+++ patches/patch-config_h  8 Apr 2008 15:50:42 -
@@ -1,15 +1,18 @@
 config.h.orig  Sat Nov 24 23:23:08 2007
-+++ config.h   Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOSBarTop /* BarBot, BarOff */
+$OpenBSD$
+--- config.h.orig  Sat Apr  5 09:30:54 2008
 config.h   Sat Apr  5 09:35:44 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
  #define BORDERPX  1
- #define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
 -#define NORMBORDERCOLOR   #cc
 -#define NORMBGCOLOR   #cc
 -#define NORMFGCOLOR   #00
 -#define SELBORDERCOLOR#0066ff
 -#define SELBGCOLOR#0066ff
 -#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
 +#define NORMBORDERCOLOR   #404040
 +#define NORMBGCOLOR   #202020
 +#define NORMFGCOLOR   #c0c0c0
@@ -18,13 +21,20 @@
 +#define SELFGCOLOR#f0f0f0
  
  /* tagging */
- const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 
www };
-@@ -39,7 +39,7 @@ Key keys[] = {
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle   tags ref
isfloating */
++  { Firefox,NULL, 

Re: UPDATE: x11/dwm

[Tobias Ulmer]

On Tue, Apr 08, 2008 at 12:34:07PM -0400, Mike Erdely wrote:
 On Tue, Apr 08, 2008 at 12:15:23PM -0400, Mike Erdely wrote:
  How about the diff below?  It honors our CFLAGS and drops the $V
  variable (as you don't use the version more than once now).
 
 As jasper@ pointed out to me, the dwm diff does not require the updated
 dmenu diff:
 

It does, dmenu_run is new. We could replace it with the old
dmenu_path | dmenu construct, but that would be silly.

My 2 cents:
- remove pre-patch target
- remove patch-Makefile, doesn't do anything except eye candy
- patch config.def.h directly, also use tags[8] instead of 9, like the
  the rest of the config.
- remove patch-config_h
- for config.mk, don't += LDFLAGS, they're  not supposed to be
  configurable like CFLAGS in a port.
- Don't hardcode CC

updated diff:

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile8 Apr 2008 17:14:36 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -21,20 +20,13 @@
 
 MASTER_SITES=  http://www.suckless.org/download/
 
-RUN_DEPENDS=   ::x11/dmenu \
+RUN_DEPENDS=   :dmenu-=3.6:x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
 NO_REGRESS=Yes
-
-pre-patch:
-   @cp ${WRKSRC}/config.def.h ${WRKSRC}/config.h
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo8 Apr 2008 17:14:36 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
-@@ -15,8 +15,7 @@ options:
-   @echo CC   = ${CC}
- 
- .c.o:
--  @echo CC $
--  @${CC} -c ${CFLAGS} $
-+  ${CC} -c ${CFLAGS} $
- 
- ${OBJ}: config.h config.mk
- 
-@@ -25,8 +24,7 @@ config.h:
-   @cp config.def.h $@
- 
- dwm: ${OBJ}
--  @echo CC -o $@
--  @${CC} -o $@ ${OBJ} ${LDFLAGS}
-+  ${CC} -o $@ ${OBJ} ${LDFLAGS}
- 
- clean:
-   @echo cleaning
Index: patches/patch-config_def_h
===
RCS file: patches/patch-config_def_h
diff -N patches/patch-config_def_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-config_def_h  8 Apr 2008 17:14:36 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- config.def.h.orig  Thu Apr  3 22:57:01 2008
 config.def.h   Tue Apr  8 19:02:10 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
+ #define BORDERPX  1
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
+-#define NORMBORDERCOLOR   #cc
+-#define NORMBGCOLOR   #cc
+-#define NORMFGCOLOR   #00
+-#define SELBORDERCOLOR#0066ff
+-#define SELBGCOLOR#0066ff
+-#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
++#define NORMBORDERCOLOR   #404040
++#define NORMBGCOLOR   #202020
++#define NORMFGCOLOR   #c0c0c0
++#define SELBORDERCOLOR#ff
++#define SELBGCOLOR#404040
++#define SELFGCOLOR#f0f0f0
+ 
+ /* tagging */
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle   tags ref
isfloating */
++  { Firefox,NULL,   NULL,   tags[8],False },

Re: UPDATE: x11/dwm

[Mike Erdely]

On Tue, Apr 08, 2008 at 07:37:50PM +0200, Tobias Ulmer wrote:
 On Tue, Apr 08, 2008 at 12:34:07PM -0400, Mike Erdely wrote:
  As jasper@ pointed out to me, the dwm diff does not require the updated
  dmenu diff:
 
 It does, dmenu_run is new. We could replace it with the old
 dmenu_path | dmenu construct, but that would be silly.

Ugh.  I had a misplaced not in my sentence.

 My 2 cents:
 - remove pre-patch target
 - remove patch-Makefile, doesn't do anything except eye candy
 - patch config.def.h directly, also use tags[8] instead of 9, like the
   the rest of the config.
 - remove patch-config_h
 - for config.mk, don't += LDFLAGS, they're  not supposed to be
   configurable like CFLAGS in a port.

I don't know how that slipped in there.  That was a mistake.

 - Don't hardcode CC

This diff looks good and works for me.  ok?

-ME

Re: UPDATE: x11/dwm

[Matthias Kilian]

On Tue, Apr 08, 2008 at 07:37:50PM +0200, Tobias Ulmer wrote:
 - remove patch-Makefile, doesn't do anything except eye candy

Well, this (and probably other dwm stuff) is initially from me, and
I don't think it's eye candy. I prefer to see every single command
run from make, with all arguments, and not just some

CC foo.c

To be exact, Makefiles with lots of commands shielded by @ are
highly suspicious, and the dwm Makefile seems to be tuned for a
nice output instead of just doing its job.

But it's Jims port, it's late here, and I need some zzz, so just read
this mail as what it is -- a late night rant after a long day ;-)

Ciao,
Kili

ps: I'm aware that the dwm Makefile dumps CC, CFLAGS and LDFLAGS to
stdout (in the options target), but it's still stupid.

-- 
_|_ is pronounced 'bottom', and is the greatest lower bound of a
complete lattice.
-- Nick Williams in comp.lang.functional

Re: UPDATE: x11/dwm

[Stuart Henderson]

On 2008/04/09 02:37, Matthias Kilian wrote:
 On Tue, Apr 08, 2008 at 07:37:50PM +0200, Tobias Ulmer wrote:
  - remove patch-Makefile, doesn't do anything except eye candy
 
 Well, this (and probably other dwm stuff) is initially from me, and
 I don't think it's eye candy. I prefer to see every single command
 run from make, with all arguments, and not just some
 
   CC foo.c

I agree. Apart from anything else, hiding these makes it harder
to check whether a port honours CFLAGS/CC and gets -pthread right
(rather than -lpthread).

Re: UPDATE: x11/dwm

[Mike Erdely]

On Wed, Apr 09, 2008 at 02:37:05AM +0200, Matthias Kilian wrote:
 On Tue, Apr 08, 2008 at 07:37:50PM +0200, Tobias Ulmer wrote:
  - remove patch-Makefile, doesn't do anything except eye candy
 
 Well, this (and probably other dwm stuff) is initially from me, and
 I don't think it's eye candy. I prefer to see every single command
 run from make, with all arguments, and not just some
 
   CC foo.c

Taking this into account.. new diff attached.

-ME

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile9 Apr 2008 01:18:15 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -21,20 +20,13 @@ WANTLIB=X11 c
 
 MASTER_SITES=  http://www.suckless.org/download/
 
-RUN_DEPENDS=   ::x11/dmenu \
+RUN_DEPENDS=   :dmenu-=3.6:x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
 NO_REGRESS=Yes
-
-pre-patch:
-   @cp ${WRKSRC}/config.def.h ${WRKSRC}/config.h
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo9 Apr 2008 01:18:15 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ patches/patch-Makefile  9 Apr 2008 01:19:33 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
+$OpenBSD$
+--- Makefile.orig  Tue Apr  8 21:19:10 2008
 Makefile   Tue Apr  8 21:19:28 2008
 @@ -15,8 +15,7 @@ options:
@echo CC   = ${CC}
  
Index: patches/patch-config_def_h
===
RCS file: patches/patch-config_def_h
diff -N patches/patch-config_def_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-config_def_h  9 Apr 2008 01:18:15 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- config.def.h.orig  Thu Apr  3 22:57:01 2008
 config.def.h   Tue Apr  8 19:02:10 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
+ #define BORDERPX  1
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
+-#define NORMBORDERCOLOR   #cc
+-#define NORMBGCOLOR   #cc
+-#define NORMFGCOLOR   #00
+-#define SELBORDERCOLOR#0066ff
+-#define SELBGCOLOR#0066ff
+-#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
++#define NORMBORDERCOLOR   #404040
++#define NORMBGCOLOR   #202020
++#define NORMFGCOLOR   #c0c0c0
++#define SELBORDERCOLOR#ff
++#define SELBGCOLOR#404040
++#define SELFGCOLOR#f0f0f0
+ 
+ /* tagging */
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle   tags ref
isfloating */
++  { Firefox,NULL,   NULL,   tags[8],False },
+   { Gimp,   NULL,   NULL,   NULL,   True },
+ };
+ 
+@@ -46,7 +47,7 @@ Key keys[] = {
+   /* modifier key function
argument */
+   { MODKEY,   XK_p,   spawn,
+   exec dmenu_run -fn 'FONT' -nb 'NORMBGCOLOR' -nf 
'NORMFGCOLOR' -sb 'SELBGCOLOR' -sf 'SELFGCOLOR' },
+-  { MODKEY|ShiftMask, XK_Return,  spawn,  exec 
uxterm },
++  { 

Re: UPDATE: x11/dwm

[Jim Razmus]

* Gleydson Soares [EMAIL PROTECTED] [080328 16:58]:
 4.7 - 4.8

 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/dwm/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile  25 Nov 2007 12:07:06 -  1.6
 +++ Makefile  28 Mar 2008 19:06:46 -
 @@ -2,7 +2,7 @@
  
  COMMENT= dynamic window manager
  
 -V=   4.7
 +V=   4.8
  DISTNAME=dwm-$V
  
  CATEGORIES=  x11
 Index: distinfo
 ===
 RCS file: /cvs/ports/x11/dwm/distinfo,v
 retrieving revision 1.6
 diff -u -r1.6 distinfo
 --- distinfo  25 Nov 2007 12:07:06 -  1.6
 +++ distinfo  28 Mar 2008 19:07:25 -
 @@ -1,5 +1,5 @@
 -MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
 -RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
 -SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
 -SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
 -SIZE (dwm-4.7.tar.gz) = 17693
 +MD5 (dwm-4.8.tar.gz) = dfSZl8SvRXB2iPdk9gTBGQ==
 +RMD160 (dwm-4.8.tar.gz) = XV/fEzR7PNJtbjsH/wPch8tbnoI=
 +SHA1 (dwm-4.8.tar.gz) = 6o5LpkZM28YM6HlJkCSJJtWpm+g=
 +SHA256 (dwm-4.8.tar.gz) = QxtnZ+CQ1LgLQuKt/2pqXH00TG4i6T4N0CLc7CueIRg=
 +SIZE (dwm-4.8.tar.gz) = 17879
 Index: patches/patch-config_h
 ===
 RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
 retrieving revision 1.3
 diff -u -r1.3 patch-config_h
 --- patches/patch-config_h25 Nov 2007 12:07:06 -  1.3
 +++ patches/patch-config_h28 Mar 2008 19:07:44 -
 @@ -1,9 +1,10 @@
  config.h.origSat Nov 24 23:23:08 2007
 -+++ config.h Sat Nov 24 23:23:09 2007
 -@@ -4,12 +4,12 @@
 - #define BARPOS  BarTop /* BarBot, BarOff */
 +$OpenBSD$
 +--- config.h.origFri Mar 28 15:50:27 2008
  config.h Fri Mar 28 15:50:30 2008
 +@@ -3,12 +3,12 @@
 + /* appearance */
   #define BORDERPX1
 - #define FONT
 -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
 + #define FONT
 -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
  -#define NORMBORDERCOLOR #cc
  -#define NORMBGCOLOR #cc
  -#define NORMFGCOLOR #00
 @@ -18,13 +19,13 @@
  +#define SELFGCOLOR  #f0f0f0
   
   /* tagging */
 - const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 
 www };
 + const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 
 9 };
  @@ -39,7 +39,7 @@ Key keys[] = {
 + /* modifier key function
 argument */
   { MODKEY,   XK_p,   spawn,
 - exe=`dmenu_path | dmenu -fn 'FONT' -nb 'NORMBGCOLOR' -nf 
 'NORMFGCOLOR'
 -  -sb 'SELBGCOLOR' -sf 'SELFGCOLOR'`  exec $exe },
 + exec dmenu_run -fn 'FONT' -nb 'NORMBGCOLOR' -nf 
 'NORMFGCOLOR' -sb 'SELBGCOLOR' -sf 'SELFGCOLOR' },
  -{ MODKEY|ShiftMask, XK_Return,  spawn, exec uxterm },
  +{ MODKEY|ShiftMask, XK_Return,  spawn, exec xterm },
 - { MODKEY,   XK_space,   setlayout,  NULL },
 - { MODKEY,   XK_b,   togglebar,  NULL },
   { MODKEY,   XK_j,   focusnext,  NULL },
 + { MODKEY,   XK_k,   focusprev,  NULL },
 + { MODKEY,   XK_r,   reapply,NULL },

Please hold off on this.  I have a slightly different patch in my tree
that's dependent on Tobias and dmenu.  Frankly, I learned a bit from
Tobias port and applied it to dwm.  Also, it looks like 4.9 is imminent
and fixes some issues related to multi-head setups.

Thanks,
Jim

Jim

Re: UPDATE: x11/dwm

[Mike Erdely]

On Tue, Oct 16, 2007 at 08:48:36AM -0400, Jim Razmus wrote:
 Uplift dwm to version 4.5.  Adds a patch for config.h to encourage dwm
 to respect Xresources when starting an xterm.  Lastly, folds in my color
 preferences so I don't have to maintain my own one off in my tree.
 
 Tested on three i386 machines that I use daily.
 
 Questions?  Concerns?
 Jim

Committed.  Thanks.

-ME