ports/118234: [PATCH] x11-wm/vtwm, Fix port bug

[Martin Tournoij]

>Number:         118234
>Category:       ports
>Synopsis:       [PATCH] x11-wm/vtwm, Fix port bug
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 24 14:20:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Tournoij
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD phong.rwxrwxrwx.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Aug 24 07:26:43 CEST 2007 carpetsmoker at phong.rwxrwxrwx.net:/usr/obj/usr/src/sys/GENERIC i386

>Description:
Port will fail to build if WITHOUT_NLS is defined and WITHOUT_SOUND
isn't.

>How-To-Repeat:

>Fix:

--- vtwm.diff begins here ---
--- Makefile.orig	2007-11-04 03:40:58.000000000 +0100
+++ Makefile	2007-11-24 15:03:39.000000000 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	vtwm
 PORTVERSION=	5.4.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.vtwm.org/downloads/
 
@@ -22,7 +22,9 @@
 OPTIONS=	SOUND "Sound support" on \
 			NLS "Native language support" on
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_SOUND)
+LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
+.endif
 
 post-patch:
 .if defined(WITHOUT_SOUND)
@@ -30,8 +32,6 @@
 		's:^XCOMM NO_SOUND_SUPPORT: NO_SOUND_SUPPORT:; \
 		s:^SOUNDLIB:XCOMM SOUNDLIB:; \
 		s:^SOUNDINC:XCOMM SOUNDINC: ' ${WRKSRC}/Imakefile
-.else
-LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
 .endif
 
 .if defined(WITHOUT_NLS)
@@ -39,4 +39,4 @@
 		's:^XCOMM  NO_I18N_SUPPORT: NO_I18N_SUPPORT:' ${WRKSRC}/Imakefile
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- vtwm.diff ends here ---

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