From nobody@FreeBSD.org  Thu Mar 14 20:59:41 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id E5625821
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Mar 2013 20:59:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id BD3F8AFD
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Mar 2013 20:59:41 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2EKxejV076085
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Mar 2013 20:59:40 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r2EKxe5c076084;
	Thu, 14 Mar 2013 20:59:40 GMT
	(envelope-from nobody)
Message-Id: <201303142059.r2EKxe5c076084@red.freebsd.org>
Date: Thu, 14 Mar 2013 20:59:40 GMT
From: Green Dog <fiziologus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [audio/sdl_sound] fix depend
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176969
>Category:       ports
>Synopsis:       audio/sdl_sound: fix depend
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mva
>State:          feedback
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 14 21:00:00 UTC 2013
>Closed-Date:    
>Last-Modified:  Mon Sep 16 21:28:57 UTC 2013
>Originator:     Green Dog
>Release:        
>Organization:
>Environment:
>Description:
[audio/sdl_sound]
remove timidity as dependensy (SDL_Sound used internal timidity)
add audio/eawpats as RUN_DEPEND for MIDI options
add CONFIGURE_ARGS for enable-prog options (default all on): less trouble in future.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN sdl_sound.orig/Makefile sdl_sound/Makefile
--- sdl_sound.orig/Makefile	2013-03-12 20:43:08.000000000 +0400
+++ sdl_sound/Makefile	2013-03-15 00:51:22.000000000 +0400
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://offload1.icculus.org:9090/SDL_sound/downloads/ \
 		http://offload2.icculus.org:9090/SDL_sound/downloads/
@@ -29,50 +29,57 @@
 
 .if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+CONFIGURE_ARGS+=--enable-flac
 .else
 CONFIGURE_ARGS+=--disable-flac
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
 LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+=--enable-mikmod
 .else
 CONFIGURE_ARGS+=--disable-mikmod
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
 LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+=--enable-modplug
 .else
 CONFIGURE_ARGS+=--disable-modplug
 .endif
 
 .if ${PORT_OPTIONS:MPHYSFS}
 LIB_DEPENDS+=	physfs:${PORTSDIR}/devel/physfs
+CONFIGURE_ARGS+=--enable-physfs
 .else
 CONFIGURE_ARGS+=--disable-physfs
 .endif
 
 .if ${PORT_OPTIONS:MSMPEG}
 LIB_DEPENDS+=	smpeg:${PORTSDIR}/multimedia/smpeg
-CONFIGURE_ARGS+=--disable-mpglib
+CONFIGURE_ARGS+=--disable-mpglib --enable-smpeg
 .else
 CONFIGURE_ARGS+=--disable-smpeg
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
 LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
+CONFIGURE_ARGS+=--enable-speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if ${PORT_OPTIONS:MMIDI}
-RUN_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
-BUILD_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
+# Internal Timidity can use guspats and eawpats patches, not eawplus
+RUN_DEPENDS+=	${LOCALBASE}/share/eawpats/acbass.pat:${PORTSDIR}/audio/eawpats
+CONFIGURE_ARGS+=--enable-midi
 .else
 CONFIGURE_ARGS+=--disable-midi
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--enable-ogg
 .else
 CONFIGURE_ARGS+=--disable-ogg
 .endif
diff -ruN sdl_sound.orig/files/patch-decoders-timidity-options.h sdl_sound/files/patch-decoders-timidity-options.h
--- sdl_sound.orig/files/patch-decoders-timidity-options.h	2012-12-28 15:57:33.000000000 +0400
+++ sdl_sound/files/patch-decoders-timidity-options.h	2013-03-15 00:30:45.000000000 +0400
@@ -5,7 +5,7 @@
  
  /* The TiMidity configuration file */
 -#define CONFIG_FILE "timidity.cfg"
-+#define CONFIG_FILE "%%PREFIX%%/share/timidity/timidity.cfg"
++#define CONFIG_FILE "%%PREFIX%%/share/timidity/timidity.cfg-eawpats"
  
  /* These affect general volume */
  #define GUARD_BITS 3


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mva 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Mar 14 21:00:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176969 
State-Changed-From-To: open->feedback 
State-Changed-By: mva 
State-Changed-When: Mon Sep 16 21:28:56 UTC 2013 
State-Changed-Why:  
As for ports/176968 I currently miss the problem with timidity++. Can 
you provide a test case for that? Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176969 
>Unformatted:
