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, bf2006a at yahoo.com, 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: Mon, 29 Oct 2007 14:48:43 +0200

 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 at 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
 + at unexec rm -f %D/lib/X11/twm/system.vtwmrc 
  @dirrmtry lib/X11/twm