Attachment 122680 Details for Bug 165913 – patch.txt

patch.txt

patch.txt (text/plain; charset=us-ascii), 5.90 KB, created by Alex Kozlov on 2012-03-11 10:51:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kozlov

Created: 2012-03-11 10:51:30 UTC

Size: 5.90 KB

patch

obsolete

>Index: ports/x11-wm/vtwm/Makefile
>@@ -6,36 +6,40 @@
> #
> 
> PORTNAME=	vtwm
>-PORTVERSION=	5.4.7
>-PORTREVISION=	3
>+PORTVERSION=	5.5.0r7.20120307
> CATEGORIES=	x11-wm
>-MASTER_SITES=	http://www.vtwm.org/downloads/
>+MASTER_SITES=	SF
>+MASTER_SITE_SUBDIR=	vtwm
>+DISTNAME=	${PORTNAME}-${DISTVERISON}
> 
> MAINTAINER=	ak@FreeBSD.org
> COMMENT=	Twm with a virtual desktop and optional Motif-like features
> 
>+LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
>+
>+GNU_CONFIGURE=	yes
> USE_XORG=	xpm xmu
> 
>-ETCDIR?=	${PREFIX}/etc
>+DISTVERISON=	5.5.0-rc7
>+
>+WRKSRC=		${WRKDIR}/vtwm-20120307
> 
>-MAKEFILE=	${FILESDIR}/Makefile.bsd
>+PLIST_FILES=	bin/vtwm bin/nexpm etc/system.vtwmrc
> 
> MAN1=		vtwm.1
> 
>-OPTIONS=	SOUND "Sound support" on \
>-		NLS "Native language support" on
>+OPTIONS=	SOUND "Sound support (via rplay)" on
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if defined(WITH_SOUND)
> LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
>-MAKE_ENV+=	SOUND=yes
>+CONFIGURE_ARGS+=	--enable-sound
> .else
>-MAKE_ENV+=	SOUND=no
>+CONFIGURE_ARGS+=	--disable-sound
> .endif
> 
>-.if defined(WITHOUT_NLS)
>-CFLAGS+=	-DNO_I18N_SUPPORT
>-.endif
>+pre-patch:
>+	@${REINPLACE_CMD} -e 's|\$${datadir}/X11/vtwm|\$${prefix}/etc|' ${WRKSRC}/Makefile.in
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: ports/x11-wm/vtwm/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (vtwm-5.4.7.tar.gz) = c62f692c42420666920a23cd489633e91789b379fed13561321b44d9ffa8c9e9
>-SIZE (vtwm-5.4.7.tar.gz) = 1021160
>+SHA256 (vtwm-5.5.0-rc7.tar.gz) = a10b187003b83121696cd63f96b6125db5b6ffa100a3133d4115e85f444bb325
>+SIZE (vtwm-5.5.0-rc7.tar.gz) = 1143452
>Index: ports/x11-wm/vtwm/files/Makefile.bsd
>@@ -1,65 +0,0 @@
>-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: ports/x11-wm/vtwm/files/patch-sound.c
>@@ -0,0 +1,9 @@
>+Index: sound.c
>+@@ -33,6 +33,7 @@
>+ #ifdef SOUND_SUPPORT
>+ 
>+ #include <X11/Xmu/CharSet.h>
>++#include <unistd.h>
>+ #include <string.h>
>+ #include <stdlib.h>
>+ #include "gram.h"
>Index: ports/x11-wm/vtwm/files/patch-util.c
>@@ -1,30 +1,28 @@
> 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 @@
>+@@ -845,7 +845,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,
>+@@ -853,7 +853,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);
>+       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;
>+@@ -875,7 +875,7 @@
>+       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]);
>+     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);
>+     font_extents = XExtentsOfFontSet(font->fontset);
>+     fnum = XFontsOfFontSet(font->fontset, &xfonts, &font_names);
>Index: ports/x11-wm/vtwm/pkg-plist
>@@ -1,4 +0,0 @@
>-bin/vtwm
>-etc/system.vtwmrc
>-@unexec rm -f %D/lib/X11/twm/system.vtwmrc
>-@dirrmtry lib/X11/twm

Actions: View

Attachments on bug 165913: 122679 | 122680 | 122681