ports/117438: x11-wm/vtwm: recent changes break make index, make describe on 6.2-Stable

[Alex Kozlov]

The following reply was made to PR ports/117438; it has been noted by GNATS.

From: Alex Kozlov <spam at rm-rf.kiev.ua>
To: bug-followup at FreeBSD.org, spam at rm-rf.kiev.ua
Cc:  
Subject: Re: ports/117438: x11-wm/vtwm: recent changes break make index,
	make describe on 6.2-Stable
Date: Sat, 24 Nov 2007 05:16:10 +0200

 Hi
 
 Please also add this patch. It corrects font search algorithm,
 eliminating huge delay on startup, when not full set of fonts installed. 
 
 
 Index: x11-wm/vtwm/files/patch-util.c
 @@ -0,0 +1,30 @@
 +Index: util.c
 +@@ -1211,7 +1211,7 @@
 + 	if (!font->name)
 + 	    font->name = Scr->DefaultFont.name;
 + 	if ((basename2 = (char *)malloc(strlen(font->name) + 3)))
 +-	    sprintf(basename2, "%s,*", font->name);
 ++	    sprintf(basename2, "%s*", font->name);
 + 	else
 + 	    basename2 = font->name;
 + 	if ((font->fontset = XCreateFontSet(dpy, basename2,
 +@@ -1223,7 +1223,7 @@
 + 
 + 	    if ((basename3 = (char *)realloc(basename2,
 + 					strlen(Scr->DefaultFont.name) + 3)))
 +-		sprintf(basename3, "%s,*", Scr->DefaultFont.name);
 ++		sprintf(basename3, "%s*", Scr->DefaultFont.name);
 + 	    else
 + 	    {
 + 		basename3 = Scr->DefaultFont.name;
 +@@ -1249,8 +1249,8 @@
 + 	    free(basename2);
 + 
 + 	for (i = 0; i < missing_charset_count_return; i++)
 +-	    fprintf(stderr, "%s: font for charset %s is lacking\n",
 +-		   ProgramName, missing_charset_list_return[i]);
 ++	    fprintf(stderr, "%s: font(%s) for charset %s is lacking\n",
 ++		   ProgramName, font->name, missing_charset_list_return[i]);
 + 
 + 	font_extents = XExtentsOfFontSet(font->fontset);
 + 	fnum = XFontsOfFontSet(font->fontset, &xfonts, &font_names);