ports/165913: [patch] x11-wm/vtwm: update to 5.5.0-rc7

Conrad J. Sabatier conrads at cox.net
Sun Mar 11 05:50:15 UTC 2012 

>Number:         165913
>Category:       ports
>Synopsis:       [patch] x11-wm/vtwm: update to 5.5.0-rc7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 11 05:50:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Conrad J. Sabatier
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD serene.no-ip.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Sun Feb 12 19:15:46 CST 2012 conrads at serene.no-ip.org:/usr/obj/usr/src/sys/CUSTOM amd64

>Description:
		Update x11-wm/vtwm to the recently released 5.5.0-rc7.
		This new release features new png support, plus some new
		keywords in the rc file.  Despite the "release 
		candidate" tag, it appears to be quite stable, and is a 
		very worthwhile upgrade.  Some of the new keywords are 
		quite useful (the "Immutable" keyword in particular).

		Note to maintainer: the patches of the "sprintf" 
		statements in util.c needed correcting (removing both 
		the comma and the "star"), and since the package now 
		includes a configure script, the Makefile.bsd you had 
		in the files directory is no longer necessary.  I also 
		removed the pkg-plist file and just added the files to
		PLIST_FILES in the Makefile.

		Incidentally, if you'd like me to take over as the 
		port's maintainer, just let me know.
>How-To-Repeat:
		N/A
>Fix:
		patch below

--- vtwm.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/vtwm/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2 Mar 2012 23:43:45 -0000	1.21
+++ Makefile	11 Mar 2012 05:05:48 -0000
@@ -5,37 +5,36 @@
 # $FreeBSD: ports/x11-wm/vtwm/Makefile,v 1.21 2012/03/02 23:43:45 ak Exp $
 #
 
-PORTNAME=	vtwm
-PORTVERSION=	5.4.7
-PORTREVISION=	3
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.vtwm.org/downloads/
+PORTNAME=			vtwm
+PORTVERSION=		5.5.0
+PORTREVISION=		3
+CATEGORIES=			x11-wm
+MASTER_SITES=		SF
+MASTER_SITE_SUBDIR=	vtwm
+DISTNAME=			${PORTNAME}-${PORTVERSION}-rc7
 
 MAINTAINER=	ak at FreeBSD.org
 COMMENT=	Twm with a virtual desktop and optional Motif-like features
 
-USE_XORG=	xpm xmu
+LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
-ETCDIR?=	${PREFIX}/etc
+WRKSRC=			${WRKDIR}/vtwm-20120307
 
-MAKEFILE=	${FILESDIR}/Makefile.bsd
+HAS_CONFIGURE=	yes
+USE_XORG=		xpm xmu
 
-MAN1=		vtwm.1
+MAN1=			vtwm.1
+PLIST_FILES=	bin/vtwm bin/nexpm etc/system.vtwmrc
 
-OPTIONS=	SOUND "Sound support" on \
-		NLS "Native language support" on
+OPTIONS=		SOUND "Sound support (via rplay)" on
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SOUND)
-LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
-MAKE_ENV+=	SOUND=yes
+LIB_DEPENDS+=		rplay.1:${PORTSDIR}/audio/rplay
+CONFIGURE_ARGS+=	--enable-sound
 .else
-MAKE_ENV+=	SOUND=no
-.endif
-
-.if defined(WITHOUT_NLS)
-CFLAGS+=	-DNO_I18N_SUPPORT
+CONFIGURE_ARGS+=	--disable-sound
 .endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-wm/vtwm/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	20 Mar 2011 12:54:42 -0000	1.8
+++ distinfo	10 Mar 2012 23:17:10 -0000
@@ -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: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	4 Jan 2008 15:27:59 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-bin/vtwm
-etc/system.vtwmrc
- at unexec rm -f %D/lib/X11/twm/system.vtwmrc
- at dirrmtry lib/X11/twm
Index: files/Makefile.bsd
===================================================================
RCS file: files/Makefile.bsd
diff -N files/Makefile.bsd
--- files/Makefile.bsd	4 Jan 2008 15:27:59 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in	11 Mar 2012 05:04:31 -0000
@@ -0,0 +1,68 @@
+--- 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:
Index: files/patch-util.c
===================================================================
RCS file: /home/ncvs/ports/x11-wm/vtwm/files/patch-util.c,v
retrieving revision 1.1
diff -u -r1.1 patch-util.c
--- files/patch-util.c	4 Jan 2008 15:27:59 -0000	1.1
+++ files/patch-util.c	11 Mar 2012 01:49:40 -0000
@@ -1,30 +1,29 @@
-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 @@
+--- 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;
-@@ -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);
--- vtwm.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list