Update to 1.1.1.

PR:		100853
Submitted by:	RedChrom <redchrom@gmail.com> (maintainer)

6 files changed, 38 insertions, 66 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 6af5f16da946..5d2f9781774c 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +19,8 @@ COMMENT=	A media player based on BMP and XMMS
 
 LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl \
+		tag.5:${PORTSDIR}/audio/taglib
 
 USE_GNOME=	gtk20 libglade2
 USE_GETTEXT=	yes
@@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
 CONFIGURE_ARGS=	--disable-jack --disable-flc --disable-adplug \
-	--disable-lirc --disable-alsa --disable-amidiplug --disable-arts
+	--disable-lirc --disable-alsa --disable-amidiplug --disable-arts --disable-wma
 
 MAN1=		audacious.1
 
@@ -50,9 +50,6 @@ OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		SID	"Enable sid input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
-		ID3V2	"Enable id3v2 editing" off \
-		SIMD	"Build with x86 SIMD(3DNow!/MMX) instructions support" on \
-		SDL	"Enable SDL support" off \
 		GNOME   "Build with gnomevfs/gconf support" off
 
 .include <bsd.port.pre.mk>
@@ -112,32 +109,14 @@ CONFIGURE_ARGS+=	--disable-esd
 PLIST_SUB+=	ESDPLUGIN="@comment "
 .endif
 
-.if defined(WITH_ID3V2)
-LIB_DEPENDS+=	id3-3.8.3:${PORTSDIR}/audio/id3lib
-.endif
-
-.if ${ARCH} != "i386"
-WITHOUT_SIMD=	yes
-.endif
-
-.if !defined(WITHOUT_SIMD) && ${OSVERSION} >= 400021
-CONFIGURE_ARGS+=	--enable-simd
-.endif
-
-.if defined(WITH_SDL)
-USE_SDL=	sdl
-.endif
-
 .if defined(WITH_GNOME)
-USE_GNOME+=	gconf2 gnomevfs2
+USE_GNOME+=	gnomevfs2
 CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
-		${WRKSRC}/configure
+		${WRKSRC}/Makefile
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 514734c46da5..2ca032d5652f 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.0.0.tgz) = a3e0f49be74eecb3c27a5a901cff0b66
-SHA256 (audacious-1.0.0.tgz) = c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb
-SIZE (audacious-1.0.0.tgz) = 3248602
+MD5 (audacious-1.1.1.tgz) = e9108f71725cf8336f7b965424c285f8
+SHA256 (audacious-1.1.1.tgz) = 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
+SIZE (audacious-1.1.1.tgz) = 3387162
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 08642fba7fff..3694bb5a8932 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,4 +1,5 @@
 bin/audacious
+bin/audtool
 include/audacious/beepctrl.h
 include/audacious/configdb.h
 include/audacious/configfile.h
@@ -12,6 +13,7 @@ include/audacious/vfs.h
 include/audacious/input.h
 include/audacious/output.h
 include/audacious/xml_document.h
+include/audacious/prefswin.h
 lib/audacious/Effect/libaudiocompress.so
 lib/audacious/Effect/libladspa.so
 lib/audacious/Effect/libstereo.so
@@ -30,14 +32,13 @@ lib/audacious/Input/libtimidity.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
 %%ESDPLUGIN%%lib/audacious/Output/libESD.so
 lib/audacious/Output/libdisk_writer.so
 lib/audacious/Visualization/libbscope.so
 lib/libaudacious.so
-lib/libaudacious.so.2
-lib/libaudacious.so.2.0.0
+lib/libaudacious.so.3
+lib/libaudacious.so.3.0.0
 libdata/pkgconfig/audacious.pc
 share/applications/audacious.desktop
 share/pixmaps/audacious.png
@@ -60,12 +61,18 @@ share/pixmaps/audacious.png
 %%DATADIR%%/Skins/Default/volume.png
 %%DATADIR%%/glade/addfiles.glade
 %%DATADIR%%/glade/prefswin.glade
+%%DATADIR%%/glade/fileinfo.glade
+%%DATADIR%%/glade/fileinfo_popup.glade
 %%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/appearance.png
 %%DATADIR%%/images/eq.png
 %%DATADIR%%/images/mouse.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/plugins.png
+%%DATADIR%%/images/audio.png
+%%DATADIR%%/images/audioscrobbler.png
+%%DATADIR%%/images/audioscrobbler_badge.png
+%%DATADIR%%/images/connectivity.png
 share/locale/br/LC_MESSAGES/audacious.mo
 share/locale/cs/LC_MESSAGES/audacious.mo
 share/locale/cy/LC_MESSAGES/audacious.mo
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 6af5f16da946..5d2f9781774c 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +19,8 @@ COMMENT=	A media player based on BMP and XMMS
 
 LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl \
+		tag.5:${PORTSDIR}/audio/taglib
 
 USE_GNOME=	gtk20 libglade2
 USE_GETTEXT=	yes
@@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
 CONFIGURE_ARGS=	--disable-jack --disable-flc --disable-adplug \
-	--disable-lirc --disable-alsa --disable-amidiplug --disable-arts
+	--disable-lirc --disable-alsa --disable-amidiplug --disable-arts --disable-wma
 
 MAN1=		audacious.1
 
@@ -50,9 +50,6 @@ OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		SID	"Enable sid input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
-		ID3V2	"Enable id3v2 editing" off \
-		SIMD	"Build with x86 SIMD(3DNow!/MMX) instructions support" on \
-		SDL	"Enable SDL support" off \
 		GNOME   "Build with gnomevfs/gconf support" off
 
 .include <bsd.port.pre.mk>
@@ -112,32 +109,14 @@ CONFIGURE_ARGS+=	--disable-esd
 PLIST_SUB+=	ESDPLUGIN="@comment "
 .endif
 
-.if defined(WITH_ID3V2)
-LIB_DEPENDS+=	id3-3.8.3:${PORTSDIR}/audio/id3lib
-.endif
-
-.if ${ARCH} != "i386"
-WITHOUT_SIMD=	yes
-.endif
-
-.if !defined(WITHOUT_SIMD) && ${OSVERSION} >= 400021
-CONFIGURE_ARGS+=	--enable-simd
-.endif
-
-.if defined(WITH_SDL)
-USE_SDL=	sdl
-.endif
-
 .if defined(WITH_GNOME)
-USE_GNOME+=	gconf2 gnomevfs2
+USE_GNOME+=	gnomevfs2
 CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
-		${WRKSRC}/configure
+		${WRKSRC}/Makefile
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 514734c46da5..2ca032d5652f 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.0.0.tgz) = a3e0f49be74eecb3c27a5a901cff0b66
-SHA256 (audacious-1.0.0.tgz) = c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb
-SIZE (audacious-1.0.0.tgz) = 3248602
+MD5 (audacious-1.1.1.tgz) = e9108f71725cf8336f7b965424c285f8
+SHA256 (audacious-1.1.1.tgz) = 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
+SIZE (audacious-1.1.1.tgz) = 3387162
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 08642fba7fff..3694bb5a8932 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,4 +1,5 @@
 bin/audacious
+bin/audtool
 include/audacious/beepctrl.h
 include/audacious/configdb.h
 include/audacious/configfile.h
@@ -12,6 +13,7 @@ include/audacious/vfs.h
 include/audacious/input.h
 include/audacious/output.h
 include/audacious/xml_document.h
+include/audacious/prefswin.h
 lib/audacious/Effect/libaudiocompress.so
 lib/audacious/Effect/libladspa.so
 lib/audacious/Effect/libstereo.so
@@ -30,14 +32,13 @@ lib/audacious/Input/libtimidity.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
 %%ESDPLUGIN%%lib/audacious/Output/libESD.so
 lib/audacious/Output/libdisk_writer.so
 lib/audacious/Visualization/libbscope.so
 lib/libaudacious.so
-lib/libaudacious.so.2
-lib/libaudacious.so.2.0.0
+lib/libaudacious.so.3
+lib/libaudacious.so.3.0.0
 libdata/pkgconfig/audacious.pc
 share/applications/audacious.desktop
 share/pixmaps/audacious.png
@@ -60,12 +61,18 @@ share/pixmaps/audacious.png
 %%DATADIR%%/Skins/Default/volume.png
 %%DATADIR%%/glade/addfiles.glade
 %%DATADIR%%/glade/prefswin.glade
+%%DATADIR%%/glade/fileinfo.glade
+%%DATADIR%%/glade/fileinfo_popup.glade
 %%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/appearance.png
 %%DATADIR%%/images/eq.png
 %%DATADIR%%/images/mouse.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/plugins.png
+%%DATADIR%%/images/audio.png
+%%DATADIR%%/images/audioscrobbler.png
+%%DATADIR%%/images/audioscrobbler_badge.png
+%%DATADIR%%/images/connectivity.png
 share/locale/br/LC_MESSAGES/audacious.mo
 share/locale/cs/LC_MESSAGES/audacious.mo
 share/locale/cy/LC_MESSAGES/audacious.mo