5 files changed, 119 insertions, 149 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index bb3ab40fac60..e12963a4277f 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,139 +6,59 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.2
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://audacious-media-player.org/release/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	novel
-DISTNAME=	audacious-${PORTVERSION}
+MASTER_SITES=	http://audacious-media-player.org/release/
 EXTRACT_SUFX=.tgz
 
-MAINTAINER=	redchrom@gmail.com
+MAINTAINER=	oliver@FreeBSD.org
 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 \
-		tag.5:${PORTSDIR}/audio/taglib
-
-BROKEN=		Incomplete pkg-plist
-
-USE_GNOME=	gtk20 libglade2
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libglade2
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lstdc++" \
-		INPUT_PLUGINS="${INPUT_PLUGINS}" \
-		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
-		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
-CONFIGURE_ARGS=	--disable-jack --disable-adplug --disable-lirc \
---disable-alsa --disable-amidiplug --disable-arts --disable-wma
+USE_XLIB=	yes
 
-MAN1=		audacious.1
+MAN1=		audacious.1 audtool.1
 
 PORTDOCS=	README AUTHORS ChangeLog NEWS
 
-INPUT_PLUGINS=	cdaudio mpg123 wav tonegen wma console \
-		sexypsf aac timidity
-OUTPUT_PLUGINS=	OSS disk_writer
-VISUALIZATION_PLUGINS=	blur_scope
-
-OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
-		MODPLUG	"Enable modplug input" off \
-		FLAC	"Enable FLAC input" off \
-		SID	"Enable sid input" off \
-		MPC	"Enable mpc input" off \
-		ESOUND	"Enable Esound output"  off \
-		GNOME   "Build with gnomevfs/gconf support" off \
+OPTIONS=	GNOME	"Build with gconf support" off \
 		NLS	"Native Language Support" on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN="Does not build"
-.endif
-
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-INPUT_PLUGINS+=	vorbis
-PLIST_SUB+=	VORBISPLUGIN=""
-.else
-CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	VORBISPLUGIN="@comment "
-.endif
-
-.if !defined(WITHOUT_MODPLUG)
-INPUT_PLUGINS+=	modplug
-PLIST_SUB+=	MODPLUG=""
-LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
-.else
-PLIST_SUB+=	MODPLUG="@comment "
-CONFIGURE_ARGS+=	--disable-modplug
-.endif
-
-.if defined(WITH_FLAC)
-INPUT_PLUGINS+=	flac
-PLIST_SUB+=	FLACPLUGIN=""
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
-.else
-PLIST_SUB+=	FLACPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-flac
-.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)
-INPUT_PLUGINS+=	musepack
-PLIST_SUB+=	MPCPLUGIN=""
-LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec \
-	tag.5:${PORTSDIR}/audio/taglib
-.else
-PLIST_SUB+=	MPCPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-musepack
-.endif
-
-.if defined(WITH_ESOUND)
-USE_GNOME+=	esound
-OUTPUT_PLUGINS+=	esd
-PLIST_SUB+=	ESDPLUGIN=""
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
-.else
-PKGNAMESUFFIX=	-esound
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESDPLUGIN="@comment "
-.endif
-
 .if defined(WITH_GNOME)
-USE_GNOME+=	gnomevfs2
-CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
+USE_GNOME+=	gconf
+CONFIGURE_ARGS+=--enable-gconf
 .endif
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's|intl \\|intl|; /-Wno-strict-aliasing/d' \
+		${WRKSRC}/audacious/widgets/Makefile
+.endif
 	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 	@${CAT} ${PKGMESSAGE}
 .if defined(WITH_GNOME)
 	@${ECHO_MSG} ""
@@ -146,11 +66,6 @@ post-install:
 	@${ECHO_MSG} "ALL PRESETS will be stored in the gconf database."
 	@${ECHO_MSG} ""
 .endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
+	
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 9e5bc59bcbd1..e823ccbaae83 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.1.2.tgz) = 14aba1f9c42a48afeeb6ce5dcaf180c6
-SHA256 (audacious-1.1.2.tgz) = 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
-SIZE (audacious-1.1.2.tgz) = 3394364
+MD5 (audacious-1.2.2.tgz) = e774afbda04220e6e1b0a9bff350522e
+SHA256 (audacious-1.2.2.tgz) = 31ab516444279f5022764bea57c017fb140a5ba3c69b2ec8df64542917d36b0f
+SIZE (audacious-1.2.2.tgz) = 1708499
diff --git a/multimedia/audacious/pkg-descr b/multimedia/audacious/pkg-descr
index 16c885cd90e5..b3a016524545 100644
--- a/multimedia/audacious/pkg-descr
+++ b/multimedia/audacious/pkg-descr
@@ -2,4 +2,4 @@ Audacious is a fork of beep-media-player 0.9.7.1.
 The primary goals of this fork are keeping ideology of original BMP
 and merging miscellaneous plugins into Audacious
 
-WWW: http://audacious-media-player.org
+WWW: http://audacious-media-player.org/
diff --git a/multimedia/audacious/pkg-message b/multimedia/audacious/pkg-message
index d3a0b0cf6d5c..6554cd7cb32c 100644
--- a/multimedia/audacious/pkg-message
+++ b/multimedia/audacious/pkg-message
@@ -1,2 +1,10 @@
 audacious supports Gzipped and uncompressed skins.  If you would like to use
 Zip format skins you will need to ensure archivers/unzip is installed.
+
+
+ATTENTION!
+
+  You should now go and install multimedia/audacious-plugins. Without it,
+  audacious is useless!
+
+
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 3ecd72af0071..0d8c9348204c 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -2,7 +2,6 @@ bin/audacious
 bin/audtool
 include/audacious/beepctrl.h
 include/audacious/configdb.h
-include/audacious/configfile.h
 include/audacious/dirbrowser.h
 include/audacious/formatter.h
 include/audacious/plugin.h
@@ -14,32 +13,14 @@ 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
-lib/audacious/Effect/libvoice_removal.so
-lib/audacious/General/libsong_change.so
-lib/audacious/General/libscrobbler.so
-lib/audacious/Input/libcdaudio.so
-lib/audacious/Input/libconsole.so
-lib/audacious/Input/libmpg123.so
-lib/audacious/Input/libsexypsf.so
-lib/audacious/Input/libtonegen.so
-lib/audacious/Input/libaac.so
-lib/audacious/Input/libtimidity.so
-%%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
-%%MODPLUG%%lib/audacious/Input/libmodplug.so
-%%FLACPLUGIN%%lib/audacious/Input/libflac.so
-%%MPCPLUGIN%%lib/audacious/Input/libmpc.so
-%%SIDPLUGIN%%lib/audacious/Input/libsid.so
-lib/audacious/Input/libwav.so
-lib/audacious/Output/libOSS.so
-%%ESDPLUGIN%%lib/audacious/Output/libESD.so
-lib/audacious/Output/libdisk_writer.so
-lib/audacious/Visualization/libbscope.so
+include/audacious/xentry.h
+include/audacious/xconvert.h
+include/audacious/main.h
+include/audacious/playlist.h
+include/audacious/playlist_container.h
 lib/libaudacious.so
-lib/libaudacious.so.3
-lib/libaudacious.so.3.0.0
+lib/libaudacious.so.4
+lib/libaudacious.so.4.0.0
 libdata/pkgconfig/audacious.pc
 share/applications/audacious.desktop
 share/pixmaps/audacious.png
@@ -60,6 +41,74 @@ share/pixmaps/audacious.png
 %%DATADIR%%/Skins/Default/titlebar.png
 %%DATADIR%%/Skins/Default/viscolor.txt
 %%DATADIR%%/Skins/Default/volume.png
+%%DATADIR%%/Skins/Classic/balance.png
+%%DATADIR%%/Skins/Classic/cbuttons.png
+%%DATADIR%%/Skins/Classic/eq_ex.png
+%%DATADIR%%/Skins/Classic/eqmain.png
+%%DATADIR%%/Skins/Classic/main.png
+%%DATADIR%%/Skins/Classic/monoster.png
+%%DATADIR%%/Skins/Classic/nums_ex.png
+%%DATADIR%%/Skins/Classic/playpaus.png
+%%DATADIR%%/Skins/Classic/pledit.png
+%%DATADIR%%/Skins/Classic/posbar.png
+%%DATADIR%%/Skins/Classic/shufrep.png
+%%DATADIR%%/Skins/Classic/text.png
+%%DATADIR%%/Skins/Classic/titlebar.png
+%%DATADIR%%/Skins/Classic/volume.png
+%%DATADIR%%/Skins/Classic/pledit.txt
+%%DATADIR%%/Skins/Classic/viscolor.txt
+%%DATADIR%%/Skins/Classic/skin.hints
+%%DATADIR%%/Skins/TinyPlayer/balance.png
+%%DATADIR%%/Skins/TinyPlayer/cbuttons.png
+%%DATADIR%%/Skins/TinyPlayer/eq_ex.png
+%%DATADIR%%/Skins/TinyPlayer/eqmain.png
+%%DATADIR%%/Skins/TinyPlayer/main.png
+%%DATADIR%%/Skins/TinyPlayer/monoster.png
+%%DATADIR%%/Skins/TinyPlayer/nums_ex.png
+%%DATADIR%%/Skins/TinyPlayer/playpaus.png
+%%DATADIR%%/Skins/TinyPlayer/pledit.png
+%%DATADIR%%/Skins/TinyPlayer/posbar.png
+%%DATADIR%%/Skins/TinyPlayer/shufrep.png
+%%DATADIR%%/Skins/TinyPlayer/text.png
+%%DATADIR%%/Skins/TinyPlayer/titlebar.png
+%%DATADIR%%/Skins/TinyPlayer/volume.png
+%%DATADIR%%/Skins/TinyPlayer/pledit.txt
+%%DATADIR%%/Skins/TinyPlayer/viscolor.txt
+%%DATADIR%%/Skins/TinyPlayer/skin.hints
+%%DATADIR%%/Skins/Osmosis/balance.png
+%%DATADIR%%/Skins/Osmosis/cbuttons.png
+%%DATADIR%%/Skins/Osmosis/eq_ex.png
+%%DATADIR%%/Skins/Osmosis/eqmain.png
+%%DATADIR%%/Skins/Osmosis/main.png
+%%DATADIR%%/Skins/Osmosis/monoster.png
+%%DATADIR%%/Skins/Osmosis/nums_ex.png
+%%DATADIR%%/Skins/Osmosis/playpaus.png
+%%DATADIR%%/Skins/Osmosis/pledit.png
+%%DATADIR%%/Skins/Osmosis/posbar.png
+%%DATADIR%%/Skins/Osmosis/shufrep.png
+%%DATADIR%%/Skins/Osmosis/text.png
+%%DATADIR%%/Skins/Osmosis/titlebar.png
+%%DATADIR%%/Skins/Osmosis/volume.png
+%%DATADIR%%/Skins/Osmosis/pledit.txt
+%%DATADIR%%/Skins/Osmosis/viscolor.txt
+%%DATADIR%%/Skins/Osmosis/skin.hints
+%%DATADIR%%/Skins/Ivory/balance.png
+%%DATADIR%%/Skins/Ivory/cbuttons.png
+%%DATADIR%%/Skins/Ivory/eq_ex.png
+%%DATADIR%%/Skins/Ivory/eqmain.png
+%%DATADIR%%/Skins/Ivory/main.png
+%%DATADIR%%/Skins/Ivory/monoster.png
+%%DATADIR%%/Skins/Ivory/nums_ex.png
+%%DATADIR%%/Skins/Ivory/playpaus.png
+%%DATADIR%%/Skins/Ivory/pledit.png
+%%DATADIR%%/Skins/Ivory/posbar.png
+%%DATADIR%%/Skins/Ivory/shufrep.png
+%%DATADIR%%/Skins/Ivory/text.png
+%%DATADIR%%/Skins/Ivory/titlebar.png
+%%DATADIR%%/Skins/Ivory/volume.png
+%%DATADIR%%/Skins/Ivory/pledit.txt
+%%DATADIR%%/Skins/Ivory/viscolor.txt
+%%DATADIR%%/Skins/Ivory/skin.hints
 %%DATADIR%%/glade/addfiles.glade
 %%DATADIR%%/glade/prefswin.glade
 %%DATADIR%%/glade/fileinfo.glade
@@ -71,9 +120,8 @@ share/pixmaps/audacious.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
+%%DATADIR%%/images/audacious_player.xpm
 %%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/audacious.mo
@@ -102,16 +150,15 @@ share/pixmaps/audacious.png
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/Skins/Classic
 @dirrm %%DATADIR%%/Skins/Default
+@dirrm %%DATADIR%%/Skins/TinyPlayer
+@dirrm %%DATADIR%%/Skins/Osmosis
+@dirrm %%DATADIR%%/Skins/Ivory
 @dirrm %%DATADIR%%/Skins
 @dirrm %%DATADIR%%
-@dirrm lib/audacious/Visualization
-@dirrm lib/audacious/Output
-@dirrm lib/audacious/Input
-@dirrm lib/audacious/General
-@dirrm lib/audacious/Effect
-@dirrm lib/audacious
 @dirrm include/audacious
 @dirrmtry share/applications
 %%NLS%%@dirrmtry share/locale/br/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/br
+@dirrmtry share/pixmaps