svn commit: r324157 - in head/x11-wm/vtwm: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Aug  2 09:53:22 2013
New Revision: 324157
URL: http://svnweb.freebsd.org/changeset/ports/324157

Log:
  - Try to unbreak parallel (-jX) builds
  - Define LICENSE (MIT), augment MASTER_SITES
  - Cleanup Makefile and port description

Modified:
  head/x11-wm/vtwm/Makefile
  head/x11-wm/vtwm/files/Makefile.bsd
  head/x11-wm/vtwm/pkg-descr

Modified: head/x11-wm/vtwm/Makefile
==============================================================================
--- head/x11-wm/vtwm/Makefile	Fri Aug  2 09:23:44 2013	(r324156)
+++ head/x11-wm/vtwm/Makefile	Fri Aug  2 09:53:22 2013	(r324157)
@@ -1,21 +1,21 @@
-# Created by:	bmah at ca.sandia.gov
+# Created by: Bruce A. Mah <bmah at ca.sandia.gov>
 # $FreeBSD$
 
 PORTNAME=	vtwm
 PORTVERSION=	5.4.7
 PORTREVISION=	4
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.vtwm.org/downloads/
+MASTER_SITES=	SF http://www.vtwm.org/downloads/
 
 MAINTAINER=	ak at FreeBSD.org
-COMMENT=	Twm with a virtual desktop and optional Motif-like features
+COMMENT=	Virtual tab window manager
 
-USE_XORG=	xpm xmu
-
-ETCDIR?=	${PREFIX}/etc
+LICENSE=	MIT
 
+USE_XORG=	xpm xmu
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
+ETCDIR?=	${PREFIX}/etc
 MAN1=		vtwm.1
 
 OPTIONS_DEFINE=	SOUND NLS
@@ -24,13 +24,13 @@ OPTIONS_DEFAULT=	SOUND NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOUND}
-LIB_DEPENDS+=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS+=	librplay.so:${PORTSDIR}/audio/rplay
 MAKE_ENV+=	SOUND=yes
 .else
 MAKE_ENV+=	SOUND=no
 .endif
 
-.if empty(PORT_OPTIONS:MNLS)
+.if ! ${PORT_OPTIONS:MNLS}
 CFLAGS+=	-DNO_I18N_SUPPORT
 .endif
 

Modified: head/x11-wm/vtwm/files/Makefile.bsd
==============================================================================
--- head/x11-wm/vtwm/files/Makefile.bsd	Fri Aug  2 09:23:44 2013	(r324156)
+++ head/x11-wm/vtwm/files/Makefile.bsd	Fri Aug  2 09:53:22 2013	(r324157)
@@ -5,7 +5,7 @@ MANDIR?=		$(PREFIX)/man/man
 
 NO_MANCOMPRESS?=	yes
 MAN1=			vtwm.1
-			
+
 SOUND?=			yes
 
 LN=			ln -f
@@ -36,7 +36,7 @@ FILES=	system.vtwmrc	
 FILESDIR= $(ETCDIR)
 FILESMODE= 644
 
-deftwmrc.c:	vtwm.man system.vtwmrc
+deftwmrc.c:	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.' >>$@
@@ -56,8 +56,8 @@ lastmake.c:
 	echo '    "Build:  '`date`'",' >>$@
 	echo '    "" };' >>$@
 
-vtwm.man:
-	$(LN) doc/$@ vtwm.1
+$(MAN1):
+	$(LN) doc/vtwm.man $@
 
 system.vtwmrc:
 	$(LN) $@.$(SYS_VTWMRC_LOOK) $@

Modified: head/x11-wm/vtwm/pkg-descr
==============================================================================
--- head/x11-wm/vtwm/pkg-descr	Fri Aug  2 09:23:44 2013	(r324156)
+++ head/x11-wm/vtwm/pkg-descr	Fri Aug  2 09:53:22 2013	(r324157)
@@ -1,6 +1,5 @@
-vtwm is a twm variant with a virtual desktop.  Unlike its older cousin
+Vtwm is a twm variant with a virtual desktop.  Unlike its older cousin
 tvtwm, vtwm is under active development, and supports a number of
 relatively new features, such as configurable Motif-like decorations.
-The homepage for this program is:
 
 WWW: http://www.vtwm.org/