Recent changes to the port makefile break make index, make describe (were they tested before being submitted/committed??): Generating INDEX-6 - please wait.."Makefile", line 39: Unassociated shell command "@${REINPLACE_CMD} -i "" -e 's:^XCOMM NO_I18N_SUPPORT: NO_I18N_SUPPORT:' ${WRKSRC}/Imakefile" make: fatal errors encountered -- cannot continue ===> x11-wm/vtwm failed *** Error code 1 1 error ******************************************************************** Before reporting this error, verify that you are running a supported version of FreeBSD (see http://www.FreeBSD.org/ports/) and that you have a complete and up-to-date ports collection. (INDEX builds are not supported with partial or out-of-date ports collections -- in particular, if you are using cvsup, you must cvsup the "ports-all" collection, and have no "refuse" files.) If that is the case, then report the failure to ports@FreeBSD.org together with relevant details of your ports configuration (including FreeBSD version, your architecture, your environment, and your /etc/make.conf settings, especially compiler flags and WITH/WITHOUT settings). Note: the latest pre-generated version of INDEX may be fetched automatically with "make fetchindex". ******************************************************************** *** Error code 1 Stop in /usr/ports. *** Error code 1 Stop in /usr/ports. Here is one way of fixing the problem (I'm sure there are others): Replace, in the port Makefile, the lines: post-patch: .if defined(WITHOUT_SOUND) @${REINPLACE_CMD} -i "" -e \ 's:^XCOMM NO_SOUND_SUPPORT: NO_SOUND_SUPPORT:; \ s:^SOUNDLIB:XCOMM SOUNDLIB:; \ s:^SOUNDINC:XCOMM SOUNDINC: ' ${WRKSRC}/Imakefile .else LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay .endif .if defined(WITHOUT_NLS) @${REINPLACE_CMD} -i "" -e \ 's:^XCOMM NO_I18N_SUPPORT: NO_I18N_SUPPORT:' ${WRKSRC}/Imakefile .endif with: .if defined(WITH_SOUND) LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay .endif post-patch: .if defined(WITHOUT_SOUND) @${REINPLACE_CMD} -i "" -e \ 's:^XCOMM NO_SOUND_SUPPORT: NO_SOUND_SUPPORT:; \ s:^SOUNDLIB:XCOMM SOUNDLIB:; \ s:^SOUNDINC:XCOMM SOUNDINC: ' ${WRKSRC}/Imakefile .endif .if defined(WITHOUT_NLS) @${REINPLACE_CMD} -i "" -e \ 's:^XCOMM NO_I18N_SUPPORT: NO_I18N_SUPPORT:' ${WRKSRC}/Imakefile .endif (Sorry, away from my computer and can't make a patch.)
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Hi > Recent changes to the port makefile break make index, make describe > (were they tested before being submitted/committed??): It seems that I missed a case when only WITHOUT_NLS option selected. Sorry for that. And thank you for the fix. Here is a patch for this problem: Index: x11-wm/vtwm/Makefile @@ -24,16 +24,17 @@ .include <bsd.port.pre.mk> +.if defined(WITH_SOUND) +LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay +.endif + post-patch: .if defined(WITHOUT_SOUND) @${REINPLACE_CMD} -i "" -e \ 's:^XCOMM NO_SOUND_SUPPORT: NO_SOUND_SUPPORT:; \ s:^SOUNDLIB:XCOMM SOUNDLIB:; \ s:^SOUNDINC:XCOMM SOUNDINC: ' ${WRKSRC}/Imakefile -.else -LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay .endif - .if defined(WITHOUT_NLS) @${REINPLACE_CMD} -i "" -e \ 's:^XCOMM NO_I18N_SUPPORT: NO_I18N_SUPPORT:' ${WRKSRC}/Imakefile
Hi Can you please test new patch? Changes: - fix bug described in this pr (bmake error in a case when only WITHOUT_NLS option selected). - drop imake dependency - move system.vtwmrc in more appropriate place: from ${PREFIX}/lib/X11/twm/system.vtwmrc to ${PREFIX}/etc/system.vtwmrc cd $PORTSDIR && mkdir x11-wm/vtwm/files && patch < vtwm.patch Index: x11-wm/vtwm/Makefile @@ -7,36 +7,35 @@ PORTNAME= vtwm PORTVERSION= 5.4.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://www.vtwm.org/downloads/ MAINTAINER= spam@rm-rf.kiev.ua COMMENT= Twm with a virtual desktop and optional Motif-like features -USE_IMAKE= yes USE_XORG= xpm +ETCDIR?= ${PREFIX}/etc + +MAKEFILE= ${FILESDIR}/Makefile.bsd + MAN1= vtwm.1 OPTIONS= SOUND "Sound support" on \ - NLS "Native language support" on + NLS "Native language support" on .include <bsd.port.pre.mk> -post-patch: -.if defined(WITHOUT_SOUND) - @${REINPLACE_CMD} -i "" -e \ - 's:^XCOMM NO_SOUND_SUPPORT: NO_SOUND_SUPPORT:; \ - s:^SOUNDLIB:XCOMM SOUNDLIB:; \ - s:^SOUNDINC:XCOMM SOUNDINC: ' ${WRKSRC}/Imakefile -.else +.if defined(WITH_SOUND) LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay +MAKE_ENV+= SOUND=yes +.else +MAKE_ENV+= SOUND=no .endif .if defined(WITHOUT_NLS) - @${REINPLACE_CMD} -i "" -e \ - 's:^XCOMM NO_I18N_SUPPORT: NO_I18N_SUPPORT:' ${WRKSRC}/Imakefile +CFLAGS+= -DNO_I18N_SUPPORT .endif .include <bsd.port.post.mk> Index: x11-wm/vtwm/files/Makefile.bsd @@ -0,0 +1,65 @@ +PREFIX?= /usr/local +BINDIR?= $(PREFIX)/bin +ETCDIR?= $(PREFIX)/etc +MANDIR?= $(PREFIX)/man/man + +NO_MANCOMPRESS?= yes +MAN1= vtwm.1 + +SOUND?= yes + +LN= ln -f +LFLAGS+= -l + +# For the traditional look of TWM as the system fallback, +# change this to "2D" +SYS_VTWMRC_LOOK = 3D + +CONFDEFINES= '-DSYSTEM_VTWMRC="'$(ETCDIR)'/system.vtwmrc"' \ + '-DSYSTEM_TWMRC="'$(ETCDIR)'/system.twmrc"' +CFLAGS+= -I/usr/local/include $(CONFDEFINES) +LDADD+= -L/usr/local/lib -ll -lXpm -lXmu + +.if ${SOUND} == "yes" +LDADD+= -lrplay +.else +CFLAGS+= -DNO_SOUND_SUPPORT +.endif + +PROG= vtwm + +SRCS= gram.y gram.h lex.l deftwmrc.c add_window.c gc.c list.c twm.c sound.c \ + parse.c menus.c events.c resize.c util.c version.c iconmgr.c \ + cursor.c regions.c applets.c icons.c desktop.c doors.c lastmake.c + +FILES= system.vtwmrc +FILESDIR= $(ETCDIR) +FILESMODE= 644 + +deftwmrc.c: vtwm.man system.vtwmrc + echo '/* ' >$@ + echo ' * This file is generated automatically from the default' >>$@ + echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@ + echo ' */' >>$@ + echo '' >>$@ + echo 'char *defTwmrc[] = {' >>deftwmrc.c + sed -e '/^$$/d' -e '/^#/d' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/",/' -e 's/[ ]\{1,\}/ /g' -e 's/^" /"/' system.vtwmrc >>$@ + echo '(char *)0 };' >>$@ + +lastmake.c: + echo '/* ' >$@ + echo ' * This file is generated automatically by the VTWM Makefile.' >>$@ + echo ' */' >>$@ + echo '' >>$@ + echo 'char *lastmake[] = {' >>lastmake.c + echo ' "Platform: '`uname -r -s`'",' >>$@ + echo ' "Build: '`date`'",' >>$@ + echo ' "" };' >>$@ + +vtwm.man: + $(LN) doc/$@ vtwm.1 + +system.vtwmrc: + $(LN) $@.$(SYS_VTWMRC_LOOK) $@ + +.include <bsd.prog.mk> Index: x11-wm/vtwm/pkg-plist @@ -1,3 +1,4 @@ bin/vtwm -lib/X11/twm/system.vtwmrc +etc/system.vtwmrc +@unexec rm -f %D/lib/X11/twm/system.vtwmrc @dirrmtry lib/X11/twm
Hi Originator confirmed in private mail that patch fixes problem. It can be commited. -- Adios
State Changed From-To: feedback->open Maintainer approved.
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);
Responsible Changed From-To: freebsd-ports-bugs->araujo I'll take it.
Hey maintainer! We has a error to build package with the patchs, could you check this problem? Look the error at: http://tb4.droso.net/errors/7-araujo/vtwm-5.4.7_3.log Best Regards. -- Marcelo Araujo (__) araujo@FreeBSD.org \\\'',) http://www.FreeBSD.org \/ \ ^ Power To Server. .\. /_)
State Changed From-To: open->closed We have many problems with the patch, because after applied the port not build. You can look at: http://tb3.droso.net/errors/7-araujo/vtwm-5.4.7_3.log
On Fri, Jan 04, 2008 at 12:12:52PM +0000, araujo@FreeBSD.org wrote: > Synopsis: x11-wm/vtwm: recent changes break make index, make describe on 6.2-Stable > > State-Changed-From-To: open->closed > State-Changed-By: araujo > State-Changed-When: Fri Jan 4 12:12:52 UTC 2008 > State-Changed-Why: > We have many problems with the patch, because after applied the port not > build. You can look at: > http://tb3.droso.net/errors/7-araujo/vtwm-5.4.7_3.log It seems that you don't receive my message dated 16/12/0. ----- Forwarded message from Alex Kozlov <spam@rm-rf.kiev.ua> ----- Date: Sun, 16 Dec 2007 20:00:00 +0200 From: Alex Kozlov <spam@rm-rf.kiev.ua> To: araujo@FreeBSD.org, spam@rm-rf.kiev.ua Subject: Re: ports/117438: x11-wm/vtwm: recent changes break make index, make describe on 6.2-Stable Sender: Alex Kozlov <kozlov@ravenloft.kiev.ua> On Sun, Dec 16, 2007 at 10:56:07AM -0200, Marcelo Araujo wrote: > Hey maintainer! > > We has a error to build package with the patchs, could you check this > problem? > > Look the error at: http://tb4.droso.net/errors/7-araujo/vtwm-5.4.7_3.log Please change USE_XORG=xpm to USE_XORG=xpm xmu -- Adios ----- End forwarded message ----- p.s. If you want check maillog, this may help: 2007-12-16 20:00:21 1J3xmn-0006FO-69 <= kozlov@ravenloft.kiev.ua H=localhost (ravenloft.kiev.ua) [12 7.0.0.1] P=esmtp S=1200 id=20071216180000.GA69225@ravenloft.kiev.ua 2007-12-16 20:00:23 1J3xmn-0006FO-69 == araujo@freebsd.org R=dnslookup T=remote_smtp defer (-44): SM TP error from remote mail server after RCPT TO:<araujo@FreeBSD.org>: host mx1.freebsd.org [69.147.83 .52]: 450 4.7.1 <araujo@FreeBSD.org>: Recipient address rejected: Service is unavailable 2007-12-16 20:56:41 1J3xmn-0006FO-69 => araujo@freebsd.org R=dnslookup T=remote_smtp H=mx1.freebsd.o rg [69.147.83.52] 2007-12-16 20:56:41 1J3xmn-0006FO-69 Completed -- Adios
State Changed From-To: closed->open I received maintainer's mail about 'USE_XORG=xpm xmu' to solve this problem.
araujo 2008-01-04 15:27:59 UTC FreeBSD ports repository Modified files: x11-wm/vtwm Makefile pkg-plist Added files: x11-wm/vtwm/files Makefile.bsd patch-util.c Log: - Fix bmake error in a case when only WITHOUT_NLS option are selected. [1] - Drop imake dependency. [2] - Move system.vtwmrc to another appropriate place. [2] - Fix font search algorithm. [2] - Bump PORTREVISION. [2] PR: ports/117438 Submitted by: bf <bf2006a@yahoo.com>, Alex Kozlov <spam@rm-rf.kiev.ua> (maintainer) Approved by: stas (mentor, implicit) Revision Changes Path 1.20 +12 -13 ports/x11-wm/vtwm/Makefile 1.1 +65 -0 ports/x11-wm/vtwm/files/Makefile.bsd (new) 1.1 +30 -0 ports/x11-wm/vtwm/files/patch-util.c (new) 1.5 +2 -1 ports/x11-wm/vtwm/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!