ports/94595: [maintainer-update] multimedia/audacious

[Stepan Zastupov [RedChrom]]

>Number:         94595
>Category:       ports
>Synopsis:       [maintainer-update] multimedia/audacious
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 17 09:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     RedChrom
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
RedChrom
>Environment:
System: FreeBSD asylum 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Mon Mar 13 18:58:54 IRKT 2006 root at asylum:/usr/obj/usr/src/sys/ASYLUM i386
>Description:
	Fixed some port problems (tnx to David Le Brun <david at dyn-ns.net>). Also removed flac plugin, because it's boken.
>How-To-Repeat:
	apply the patch
>Fix:

diff -urN audacious.old/Makefile audacious/Makefile
--- audacious.old/Makefile	Fri Mar 17 17:00:32 2006
+++ audacious/Makefile	Fri Mar 17 17:01:15 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/ \
 		${MASTER_SITE_LOCAL}
@@ -19,13 +20,11 @@
 
 LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		curl.3:${PORTSDIR}/ftp/curl \
-		FLAC:${PORTSDIR}/audio/flac
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gtk20 libglade2
-WANT_GNOME=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
@@ -34,18 +33,20 @@
 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CONFIGURE_ARGS=	--disable-jack --disable-flc --disable-adplug 
 
 MAN1=		audacious.1
 
 PORTDOCS=	README AUTHORS ChangeLog NEWS
 
 INPUT_PLUGINS=	cdaudio mpg123 wav tonegen wma console \
-		sexypsf aac timidity flac
+		sexypsf aac timidity
 OUTPUT_PLUGINS=	OSS disk_writer
 VISUALIZATION_PLUGINS=	blur_scope
 
 OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		MODPLUG	"Enable modplug input" off \
+		SID	"Enable sid input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
 		ID3V2	"Enable id3v2 editing" off \
@@ -71,6 +72,15 @@
 .else
 PLIST_SUB+=	MODPLUG="@comment "
 CONFIGURE_ARGS+=	--disable-modplug
+.endif
+
+.if !defined(WITHOUT_SID)
+INPUT_PLUGINS+=	sid
+PLIST_SUB+=	SIDPLUGIN=""
+LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
+.else
+PLIST_SUB+=	SIDPLUGIN="@comment "
+CONFIGURE_ARGS+=	--disable-sid
 .endif
 
 .if !defined(WITHOUT_MPC)
diff -urN audacious.old/pkg-plist audacious/pkg-plist
--- audacious.old/pkg-plist	Fri Mar 17 17:00:32 2006
+++ audacious/pkg-plist	Fri Mar 17 16:29:32 2006
@@ -23,9 +23,9 @@
 lib/audacious/Input/libaac.so
 lib/audacious/Input/libtimidity.so
 %%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
-lib/audacious/Input/libflac.so
 %%MODPLUG%%lib/audacious/Input/libmodplug.so
 %%MPCPLUGIN%%lib/audacious/Input/libmpc.so
+%%SIDPLUGIN%%lib/audacious/Input/libsid.so
 lib/audacious/Input/libwav.so
 lib/audacious/Input/libwma.so
 lib/audacious/Output/libOSS.so
>Release-Note:
>Audit-Trail:
>Unformatted: