pkg/45206: pkgsrc-2011Q2 - x11/xlockmore - Forced unnecessary dependency on esound

[Matthew Mondor <mm_lists%pulsar-zone.net@localhost>]

>Number:         45206
>Category:       pkg
>Synopsis:       pkgsrc-2011Q2 - x11/xlockmore - Forced unnecessary dependency 
>on esound
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 02 01:45:01 +0000 2011
>Originator:     Matthew Mondor
>Release:        NetBSD 5.1_STABLE
>Organization:
>Environment:
System: NetBSD behemoth.xisop 5.1_STABLE NetBSD 5.1_STABLE (GENERIC_MM) #0: Mon 
Aug 1 12:19:58 EDT 2011 
root@behemoth.xisop:/usr/obj/sys/arch/i386/compile/GENERIC_MM i386
Architecture: i386
Machine: i386
>Description:

The x11/xlockmore package somehow depended on esound, without an
option.mk for it, so was the only software I built attempting to bring
esound along (I have -esound as part of my global options).

Either options.mk should be used to make esound optional, or the
support for esound should be disabled by default.  Since esound is old
(and suboptimal :) I went for the latter option in my diff.

>How-To-Repeat:

Build x11/xlockmore despite -esound in global mk.conf options.

>Fix:
Apply the attached diff

--MP_/ll1Wqp7WKb2ibTGGe7fs5_A
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=x11-xlockmore-diff.txt

Index: x11/xlockmore/Makefile
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/x11/xlockmore/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- x11/xlockmore/Makefile      22 Apr 2011 13:45:16 -0000      1.87
+++ x11/xlockmore/Makefile      30 Jul 2011 02:29:23 -0000
@@ -8,6 +8,7 @@ COMMENT=        Like the XLock session-locker/s
 CONFIGURE_ARGS+=       --with-opengl
 CONFIGURE_ARGS+=       --with-mesa
 CONFIGURE_ARGS+=       --without-ttf
+CONFIGURE_ARGS+=       --without-esound
 XPM_ENV=       no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include 
xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
 CONFIGURE_ENV+=        ac_cv_path_xpm=${XPM_ENV:Q}
 OPENGL_ENV=    no_opengl= 
ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include 
ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
@@ -23,7 +24,6 @@ PLIST_SUBST+=    LITE=""
 
 USE_TOOLS+=    pkg-config
 
-.include "../../audio/esound/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"

--MP_/ll1Wqp7WKb2ibTGGe7fs5_A--

>Unformatted:
 --MP_/ll1Wqp7WKb2ibTGGe7fs5_A
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline