Attachment #122679 for bug #165913

View | Details | Raw Unified | Return to bug 165913
Collapse All | Expand All




# $FreeBSD: ports/x11-wm/vtwm/Makefile,v 1.21 2012/03/02 23:43:45 ak Exp $
#

PORTNAME=			vtwm
PORTVERSION=		5.5.0
PORTREVISION=		3
CATEGORIES=			x11-wm
MASTER_SITES=		SF
MASTER_SITE_SUBDIR=	vtwm
DISTNAME=			${PORTNAME}-${PORTVERSION}-rc7

MAINTAINER=	ak@FreeBSD.org
COMMENT=	Twm with a virtual desktop and optional Motif-like features

LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png

WRKSRC=			${WRKDIR}/vtwm-20120307

HAS_CONFIGURE=	yes
USE_XORG=		xpm xmu

MAN1=			vtwm.1
PLIST_FILES=	bin/vtwm bin/nexpm etc/system.vtwmrc

OPTIONS=		SOUND "Sound support (via rplay)" on
		NLS "Native language support" on

.include <bsd.port.pre.mk>

.if defined(WITH_SOUND)
LIB_DEPENDS+=		rplay.1:${PORTSDIR}/audio/rplay
CONFIGURE_ARGS+=	--enable-sound
.else
CONFIGURE_ARGS+=	--disable-sound
.endif

.if defined(WITHOUT_NLS)
CFLAGS+=	-DNO_I18N_SUPPORT
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (vtwm-5.4.7.tar.gz) = c62f692c42420666920a23cd489633e91789b379fed13561321b44d9ffa8c9e9	1	SHA256 (vtwm-5.5.0-rc7.tar.gz) = a10b187003b83121696cd63f96b6125db5b6ffa100a3133d4115e85f444bb325
2	SIZE (vtwm-5.4.7.tar.gz) = 1021160	2	SIZE (vtwm-5.5.0-rc7.tar.gz) = 1143452

Removed Link Here

(-)pkg-plist (-4 lines)
1	bin/vtwm
2	etc/system.vtwmrc
3	@unexec rm -f %D/lib/X11/twm/system.vtwmrc
4	@dirrmtry lib/X11/twm




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>




--- Makefile.in.orig	2012-03-06 16:57:20.000000000 -0600
+++ Makefile.in	2012-03-10 23:04:28.000000000 -0600
@@ -219,7 +219,7 @@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-bindir = @bindir@
+bindir = ${PREFIX}/bin
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
@@ -244,13 +244,13 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-mandir = @mandir@
+mandir = ${PREFIX}/man
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 png_CFLAGS = @png_CFLAGS@
 png_LIBS = @png_LIBS@
-prefix = @prefix@
+prefix = ${PREFIX}
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 regex_CFLAGS = @regex_CFLAGS@
@@ -275,7 +275,7 @@
 xrandr_CFLAGS = @xrandr_CFLAGS@
 xrandr_LIBS = @xrandr_LIBS@
 AM_YFLAGS = -d
-rcdir = ${datadir}/X11/vtwm
+rcdir = $prefix/etc
 dist_rc_DATA = system.vtwmrc
 pre_vtwm_CFLAGS = $(VWM_CFLAGS) -D_BSD_SOURCE -fno-strict-aliasing \
 	-DSYSTEM_VTWMRC=\"${rcdir}/system.vtwmrc\" \
@@ -1204,7 +1204,7 @@
 
 
 deftwmrc.c: system.vtwmrc
-	-$(RM) $@
+	-$(RM) -f $@
 	echo '/* ' >>$@
 	echo ' * This file is generated automatically from the default' >>$@
 	echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@
@@ -1223,7 +1223,7 @@
 
 FORCE:
 lastmake.c: FORCE
-	-$(RM) $@
+	-$(RM) -f $@
 	echo '/* ' >>$@
 	echo ' * This file is generated automatically by the VTWM Makefile.' >>$@
 	echo ' */' >>$@
@@ -1239,11 +1239,11 @@
 #	$(vtwm_LINK) -o $@ -Icontrib/nexpm $^ $(vtwm_LDADD) $(LIBS)
 
 system.vtwmrc:
-	-$(RM) $@
+	-$(RM) -f $@
 	$(CP) $@.$(SYS_VTWMRC_LOOK) $@
 
 vtwm.man: doc/vtwm.man
-	-$(RM) $@
+	-$(RM) -f $@
 	$(LN) doc/$@ $@
 
 clean-local:




--- util.c	2012-03-06 16:57:21.000000000 -0600
+++ ../../files/util.c	2012-03-10 19:48:42.000000000 -0600
@@ -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;
@@ -875,7 +875,7 @@
       free(basename2);
 	    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]);
+	    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);

Return to bug 165913

Lines 5-41 Link Here

(-)Makefile (-18 / +17 lines)
5	# $FreeBSD: ports/x11-wm/vtwm/Makefile,v 1.21 2012/03/02 23:43:45 ak Exp $	5	# $FreeBSD: ports/x11-wm/vtwm/Makefile,v 1.21 2012/03/02 23:43:45 ak Exp $
6	#	6	#
7		7
8	PORTNAME= vtwm	8	PORTNAME= vtwm
9	PORTVERSION= 5.4.7	9	PORTVERSION= 5.5.0
10	PORTREVISION= 3	10	PORTREVISION= 3
11	CATEGORIES= x11-wm	11	CATEGORIES= x11-wm
12	MASTER_SITES= http://www.vtwm.org/downloads/	12	MASTER_SITES= SF
		13	MASTER_SITE_SUBDIR= vtwm
		14	DISTNAME= ${PORTNAME}-${PORTVERSION}-rc7
13		15
14	MAINTAINER= ak@FreeBSD.org	16	MAINTAINER= ak@FreeBSD.org
15	COMMENT= Twm with a virtual desktop and optional Motif-like features	17	COMMENT= Twm with a virtual desktop and optional Motif-like features
16		18
17	USE_XORG= xpm xmu	19	LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
18		20
19	ETCDIR?= ${PREFIX}/etc	21	WRKSRC= ${WRKDIR}/vtwm-20120307
20		22
21	MAKEFILE= ${FILESDIR}/Makefile.bsd	23	HAS_CONFIGURE= yes
		24	USE_XORG= xpm xmu
22		25
23	MAN1= vtwm.1	26	MAN1= vtwm.1
		27	PLIST_FILES= bin/vtwm bin/nexpm etc/system.vtwmrc
24		28
25	OPTIONS= SOUND "Sound support" on \	29	OPTIONS= SOUND "Sound support (via rplay)" on
26	NLS "Native language support" on
27		30
28	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
29		32
30	.if defined(WITH_SOUND)	33	.if defined(WITH_SOUND)
31	LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay	34	LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay
32	MAKE_ENV+= SOUND=yes	35	CONFIGURE_ARGS+= --enable-sound
33	.else	36	.else
34	MAKE_ENV+= SOUND=no	37	CONFIGURE_ARGS+= --disable-sound
35	.endif
36
37	.if defined(WITHOUT_NLS)
38	CFLAGS+= -DNO_I18N_SUPPORT
39	.endif	38	.endif
40		39
41	.include <bsd.port.post.mk>	40	.include <bsd.port.post.mk>

Removed Link Here

(-)files/Makefile.bsd (-65 lines)
1	PREFIX?= /usr/local
2	BINDIR?= $(PREFIX)/bin
3	ETCDIR?= $(PREFIX)/etc
4	MANDIR?= $(PREFIX)/man/man
5
6	NO_MANCOMPRESS?= yes
7	MAN1= vtwm.1
8
9	SOUND?= yes
10
11	LN= ln -f
12	LFLAGS+= -l
13
14	# For the traditional look of TWM as the system fallback,
15	# change this to "2D"
16	SYS_VTWMRC_LOOK = 3D
17
18	CONFDEFINES= '-DSYSTEM_VTWMRC="'$(ETCDIR)'/system.vtwmrc"' \
19	'-DSYSTEM_TWMRC="'$(ETCDIR)'/system.twmrc"'
20	CFLAGS+= -I/usr/local/include $(CONFDEFINES)
21	LDADD+= -L/usr/local/lib -ll -lXpm -lXmu
22
23	.if ${SOUND} == "yes"
24	LDADD+= -lrplay
25	.else
26	CFLAGS+= -DNO_SOUND_SUPPORT
27	.endif
28
29	PROG= vtwm
30
31	SRCS= gram.y gram.h lex.l deftwmrc.c add_window.c gc.c list.c twm.c sound.c \
32	parse.c menus.c events.c resize.c util.c version.c iconmgr.c \
33	cursor.c regions.c applets.c icons.c desktop.c doors.c lastmake.c
34
35	FILES= system.vtwmrc
36	FILESDIR= $(ETCDIR)
37	FILESMODE= 644
38
39	deftwmrc.c: vtwm.man system.vtwmrc
40	echo '/* ' >$@
41	echo ' * This file is generated automatically from the default' >>$@
42	echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@
43	echo ' */' >>$@
44	echo '' >>$@
45	echo 'char *defTwmrc[] = {' >>deftwmrc.c
46	sed -e '/^$$/d' -e '/^#/d' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/",/' -e 's/[ ]\{1,\}/ /g' -e 's/^" /"/' system.vtwmrc >>$@
47	echo '(char *)0 };' >>$@
48
49	lastmake.c:
50	echo '/* ' >$@
51	echo ' * This file is generated automatically by the VTWM Makefile.' >>$@
52	echo ' */' >>$@
53	echo '' >>$@
54	echo 'char *lastmake[] = {' >>lastmake.c
55	echo ' "Platform: '`uname -r -s`'",' >>$@
56	echo ' "Build: '`date`'",' >>$@
57	echo ' "" };' >>$@
58
59	vtwm.man:
60	$(LN) doc/$@ vtwm.1
61
62	system.vtwmrc:
63	$(LN) $@.$(SYS_VTWMRC_LOOK) $@
64
65	.include <bsd.prog.mk>

Added Link Here

(-)files/patch-Makefile.in (+68 lines)
1	--- Makefile.in.orig 2012-03-06 16:57:20.000000000 -0600
2	+++ Makefile.in 2012-03-10 23:04:28.000000000 -0600
3	@@ -219,7 +219,7 @@
4	am__quote = @am__quote@
5	am__tar = @am__tar@
6	am__untar = @am__untar@
7	-bindir = @bindir@
8	+bindir = ${PREFIX}/bin
9	build = @build@
10	build_alias = @build_alias@
11	build_cpu = @build_cpu@
12	@@ -244,13 +244,13 @@
13	libexecdir = @libexecdir@
14	localedir = @localedir@
15	localstatedir = @localstatedir@
16	-mandir = @mandir@
17	+mandir = ${PREFIX}/man
18	mkdir_p = @mkdir_p@
19	oldincludedir = @oldincludedir@
20	pdfdir = @pdfdir@
21	png_CFLAGS = @png_CFLAGS@
22	png_LIBS = @png_LIBS@
23	-prefix = @prefix@
24	+prefix = ${PREFIX}
25	program_transform_name = @program_transform_name@
26	psdir = @psdir@
27	regex_CFLAGS = @regex_CFLAGS@
28	@@ -275,7 +275,7 @@
29	xrandr_CFLAGS = @xrandr_CFLAGS@
30	xrandr_LIBS = @xrandr_LIBS@
31	AM_YFLAGS = -d
32	-rcdir = ${datadir}/X11/vtwm
33	+rcdir = $prefix/etc
34	dist_rc_DATA = system.vtwmrc
35	pre_vtwm_CFLAGS = $(VWM_CFLAGS) -D_BSD_SOURCE -fno-strict-aliasing \
36	-DSYSTEM_VTWMRC=\"${rcdir}/system.vtwmrc\" \
37	@@ -1204,7 +1204,7 @@
38
39
40	deftwmrc.c: system.vtwmrc
41	- -$(RM) $@
42	+ -$(RM) -f $@
43	echo '/* ' >>$@
44	echo ' * This file is generated automatically from the default' >>$@
45	echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@
46	@@ -1223,7 +1223,7 @@
47
48	FORCE:
49	lastmake.c: FORCE
50	- -$(RM) $@
51	+ -$(RM) -f $@
52	echo '/* ' >>$@
53	echo ' * This file is generated automatically by the VTWM Makefile.' >>$@
54	echo ' */' >>$@
55	@@ -1239,11 +1239,11 @@
56	# $(vtwm_LINK) -o $@ -Icontrib/nexpm $^ $(vtwm_LDADD) $(LIBS)
57
58	system.vtwmrc:
59	- -$(RM) $@
60	+ -$(RM) -f $@
61	$(CP) $@.$(SYS_VTWMRC_LOOK) $@
62
63	vtwm.man: doc/vtwm.man
64	- -$(RM) $@
65	+ -$(RM) -f $@
66	$(LN) doc/$@ $@
67
68	clean-local:

Lines 1-30 Link Here

(-)files/patch-util.c (-27 / +26 lines)
1	Index: util.c	1	--- util.c 2012-03-06 16:57:21.000000000 -0600
2	@@ -1211,7 +1211,7 @@	2	+++ ../../files/util.c 2012-03-10 19:48:42.000000000 -0600
3	if (!font->name)	3	@@ -845,7 +845,7 @@
4	font->name = Scr->DefaultFont.name;	4	if (!font->name)
5	if ((basename2 = (char *)malloc(strlen(font->name) + 3)))	5	font->name = Scr->DefaultFont.name;
6	- sprintf(basename2, "%s,*", font->name);	6	if ((basename2 = (char *)malloc(strlen(font->name) + 3)))
7	+ sprintf(basename2, "%s*", font->name);	7	- sprintf(basename2, "%s,*", font->name);
8	else	8	+ sprintf(basename2, "%s", font->name);
9	basename2 = font->name;	9	else
10	if ((font->fontset = XCreateFontSet(dpy, basename2,	10	basename2 = font->name;
11	@@ -1223,7 +1223,7 @@	11	if ((font->fontset = XCreateFontSet(dpy, basename2,
		12	@@ -853,7 +853,7 @@
		13	{
12		14
13	if ((basename3 = (char *)realloc(basename2,	15	if ((basename3 = (char *)realloc(basename2, strlen(Scr->DefaultFont.name) + 3)))
14	strlen(Scr->DefaultFont.name) + 3)))	16	- sprintf(basename3, "%s,*", Scr->DefaultFont.name);
15	- sprintf(basename3, "%s,*", Scr->DefaultFont.name);	17	+ sprintf(basename3, "%s", Scr->DefaultFont.name);
16	+ sprintf(basename3, "%s*", Scr->DefaultFont.name);	18	else
17	else	19	{
18	{	20	basename3 = Scr->DefaultFont.name;
19	basename3 = Scr->DefaultFont.name;	21	@@ -875,7 +875,7 @@
20	@@ -1249,8 +1249,8 @@	22	free(basename2);
21	free(basename2);
22		23
23	for (i = 0; i < missing_charset_count_return; i++)	24	for (i = 0; i < missing_charset_count_return; i++)
24	- fprintf(stderr, "%s: font for charset %s is lacking\n",	25	- fprintf(stderr, "%s: font for charset %s is lacking\n", ProgramName, missing_charset_list_return[i]);
25	- ProgramName, missing_charset_list_return[i]);	26	+ fprintf(stderr, "%s: font \"%s\" for charset %s is lacking\n", ProgramName, font->name, missing_charset_list_return[i]);
26	+ fprintf(stderr, "%s: font(%s) for charset %s is lacking\n",
27	+ ProgramName, font->name, missing_charset_list_return[i]);
28		27
29	font_extents = XExtentsOfFontSet(font->fontset);	28	font_extents = XExtentsOfFontSet(font->fontset);
30	fnum = XFontsOfFontSet(font->fontset, &xfonts, &font_names);	29	fnum = XFontsOfFontSet(font->fontset, &xfonts, &font_names);