testing and comments welcome. oks too.

  f.-

Index: audio/audacious/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.13
diff -N -u -p audio/audacious/Makefile
--- audio/audacious/Makefile    10 Aug 2009 06:29:52 -0000      1.13
+++ audio/audacious/Makefile    26 Aug 2009 05:11:32 -0000
@@ -4,9 +4,8 @@ SHARED_ONLY =   Yes
 
 COMMENT =      gtk+2 media player based on BMP and XMMS
 
-DISTNAME =     audacious-1.5.1
-PKGNAME =      ${DISTNAME}p0
-SHARED_LIBS =  audclient       0.0
+DISTNAME =     audacious-2.1
+SHARED_LIBS =  audclient       1.0
 
 CATEGORIES =   audio multimedia
 
Index: audio/audacious/distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.5
diff -N -u -p audio/audacious/distinfo
--- audio/audacious/distinfo    25 Jan 2009 02:02:19 -0000      1.5
+++ audio/audacious/distinfo    26 Aug 2009 05:11:32 -0000
@@ -1,5 +1,5 @@
-MD5 (audacious-1.5.1.tgz) = PCBqbQbUnYpo8O3Zkz0iGQ==
-RMD160 (audacious-1.5.1.tgz) = acvTD/3jOeoFScYxdmpbhmzzLCk=
-SHA1 (audacious-1.5.1.tgz) = PDyzpPmZf1qzprSTcmCyiZyESAY=
-SHA256 (audacious-1.5.1.tgz) = rFlwwJ7SWsVtrBXgNTKFksrOUyHHiVIp5oLKySIB8dc=
-SIZE (audacious-1.5.1.tgz) = 1937747
+MD5 (audacious-2.1.tgz) = A6tqBi5ZCSFIQfkPdn8RRw==
+RMD160 (audacious-2.1.tgz) = unxWcmVONq5vo5pPaOJYNjzdrwU=
+SHA1 (audacious-2.1.tgz) = Ugxxksy4nGU1Pi2IQMzO+fEcakI=
+SHA256 (audacious-2.1.tgz) = MuFkEtRG8ydEy0d9W4oGZEfAyCb3E0fsZT6ajLXOdHw=
+SIZE (audacious-2.1.tgz) = 1852176
Index: audio/audacious/patches/patch-buildsys_mk_in
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-buildsys_mk_in,v
retrieving revision 1.1
diff -N -u -p audio/audacious/patches/patch-buildsys_mk_in
--- audio/audacious/patches/patch-buildsys_mk_in        2 Apr 2008 00:39:19 
-0000       1.1
+++ audio/audacious/patches/patch-buildsys_mk_in        26 Aug 2009 05:11:32 
-0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.1 2008/04/02 00:39:19 fgsch Exp $
---- buildsys.mk.in.orig        Thu Mar 13 22:19:27 2008
-+++ buildsys.mk.in     Sun Mar 23 05:55:30 2008
-@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
- OBJS += ${OBJS5:.m=.o}
- DEPS += ${OBJS:.o=.dep}
+--- buildsys.mk.in.orig        Mon Jul  6 23:39:11 2009
++++ buildsys.mk.in     Sat Aug  1 15:21:49 2009
+@@ -81,7 +81,7 @@ OBJS6 = ${OBJS5:.m=.o}
+ OBJS7 = ${OBJS6:.py=.pyc}
+ OBJS += ${OBJS7:.xpm=.o}
  
 -.SILENT:
 +#.SILENT:
- .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
+ .SUFFIXES:
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .o .py .pyc .xpm
  .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean
- 
Index: audio/audacious/patches/patch-m4_buildsys_m4
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-m4_buildsys_m4,v
retrieving revision 1.1
diff -N -u -p audio/audacious/patches/patch-m4_buildsys_m4
--- audio/audacious/patches/patch-m4_buildsys_m4        2 Apr 2008 00:39:19 
-0000       1.1
+++ audio/audacious/patches/patch-m4_buildsys_m4        26 Aug 2009 05:11:32 
-0000
@@ -1,20 +1,15 @@
-$OpenBSD: patch-m4_buildsys_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
---- m4/buildsys.m4.orig        Thu Mar 13 22:19:27 2008
-+++ m4/buildsys.m4     Wed Apr  2 01:35:47 2008
-@@ -106,14 +106,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
-                       AC_MSG_RESULT(POSIX)
+$OpenBSD$
+--- m4/buildsys.m4.orig        Sat Aug  1 15:26:59 2009
++++ m4/buildsys.m4     Sat Aug  1 15:27:59 2009
+@@ -88,9 +88,9 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+                       AC_MSG_RESULT(Solaris)
                        LIB_CPPFLAGS='-DPIC'
                        LIB_CFLAGS='-fPIC'
--                      LIB_LDFLAGS='-shared -fPIC 
-Wl,-soname,${LIB}.${LIB_MAJOR}'
+-                      LIB_LDFLAGS='-shared -fPIC'
 +                      LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}'
                        LIB_PREFIX='lib'
-                       LIB_SUFFIX='.so'
+-                      LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
++                      LIB_SUFFIX='.so'
                        PLUGIN_CPPFLAGS='-DPIC'
                        PLUGIN_CFLAGS='-fPIC'
                        PLUGIN_LDFLAGS='-shared -fPIC'
-                       PLUGIN_SUFFIX='.so'
--                      INSTALL_LIB='${INSTALL} -m 755 $$i 
${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f 
$$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} 
-f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-+                      INSTALL_LIB='${INSTALL} -m 755 $$i 
${DESTDIR}${libdir}/$$i'
-                       UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i 
${DESTDIR}${libdir}/$$i.${LIB_MAJOR} 
${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
-                       CLEAN_LIB=''
-                       ;;
Index: audio/audacious/patches/patch-src_libaudclient_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudclient_Makefile,v
retrieving revision 1.1
diff -N -u -p audio/audacious/patches/patch-src_libaudclient_Makefile
--- audio/audacious/patches/patch-src_libaudclient_Makefile     2 Apr 2008 
00:39:19 -0000       1.1
+++ audio/audacious/patches/patch-src_libaudclient_Makefile     26 Aug 2009 
05:11:32 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-src_libaudclient_Makefile,v 1.1 2008/04/02 00:39:19 fgsch Exp $
---- src/libaudclient/Makefile.orig     Wed Jan 30 01:51:39 2008
-+++ src/libaudclient/Makefile  Wed Jan 30 01:52:13 2008
+--- src/libaudclient/Makefile.orig     Mon Jul  6 23:39:12 2009
++++ src/libaudclient/Makefile  Sat Aug  1 15:20:12 2009
 @@ -1,4 +1,4 @@
 -LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
 +LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}.${LIBaudclient_VERSION}
- LIB_MAJOR = 1
+ LIB_MAJOR = 2
  LIB_MINOR = 0
  
Index: audio/audacious/patches/patch-src_libaudtag_util_h
===================================================================
RCS file: audio/audacious/patches/patch-src_libaudtag_util_h
diff -N -u -p audio/audacious/patches/patch-src_libaudtag_util_h
--- /dev/null   26 Aug 2009 05:11:32 -0000
+++ audio/audacious/patches/patch-src_libaudtag_util_h  26 Aug 2009 05:11:32 
-0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- src/libaudtag/util.h.orig  Sat Aug  1 15:43:39 2009
++++ src/libaudtag/util.h       Sat Aug  1 15:43:45 2009
+@@ -1,4 +1,4 @@
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ #include "libaudcore/tuple.h"
+ #include "libaudcore/vfs.h"
+ 
Index: audio/audacious/patches/patch-src_libaudtag_wma_guid_c
===================================================================
RCS file: audio/audacious/patches/patch-src_libaudtag_wma_guid_c
diff -N -u -p audio/audacious/patches/patch-src_libaudtag_wma_guid_c
--- /dev/null   26 Aug 2009 05:11:32 -0000
+++ audio/audacious/patches/patch-src_libaudtag_wma_guid_c      26 Aug 2009 
05:11:32 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- src/libaudtag/wma/guid.c.orig      Sat Aug  1 15:46:12 2009
++++ src/libaudtag/wma/guid.c   Sat Aug  1 15:46:17 2009
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ 
+ #include "libaudcore/vfs.h"
+ #include "guid.h"
Index: audio/audacious/patches/patch-src_libaudtag_wma_wma_c
===================================================================
RCS file: audio/audacious/patches/patch-src_libaudtag_wma_wma_c
diff -N -u -p audio/audacious/patches/patch-src_libaudtag_wma_wma_c
--- /dev/null   26 Aug 2009 05:11:32 -0000
+++ audio/audacious/patches/patch-src_libaudtag_wma_wma_c       26 Aug 2009 
05:11:32 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/libaudtag/wma/wma.c.orig       Sat Aug  1 15:46:41 2009
++++ src/libaudtag/wma/wma.c    Sat Aug  1 15:46:45 2009
+@@ -1,6 +1,6 @@
+ /* functions for WMA file handling */
+ 
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ #include "wma.h"
+ #include "guid.h"
+ #include "wma_fmt.h"
Index: audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h
===================================================================
RCS file: audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h
diff -N -u -p audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h
--- /dev/null   26 Aug 2009 05:11:32 -0000
+++ audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h   26 Aug 2009 
05:11:32 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/libaudtag/wma/wma_fmt.h.orig   Sat Aug  1 15:44:21 2009
++++ src/libaudtag/wma/wma_fmt.h        Sat Aug  1 15:44:25 2009
+@@ -1,7 +1,7 @@
+ #ifndef AUD_WMA_FMT_H
+ #define AUD_WMA_FMT_H
+ 
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ 
+ #define ASF_HEADER_OBJECT_GUID                                
"75B22630-668E-11CF-A6D900AA0062CE6C"
+ #define ASF_FILE_PROPERTIES_OBJECT_GUID                       
"8CABDCA1-A947-11CF-8EE400C00C205365"
Index: audio/audacious/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v
retrieving revision 1.6
diff -N -u -p audio/audacious/pkg/PLIST
--- audio/audacious/pkg/PLIST   25 Jan 2009 02:02:19 -0000      1.6
+++ audio/audacious/pkg/PLIST   26 Aug 2009 05:11:32 -0000
@@ -1,21 +1,25 @@
 @comment $OpenBSD: PLIST,v 1.6 2009/01/25 02:02:19 fgsch Exp $
-...@bin bin/audacious
-...@bin bin/audtool
+...@bin bin/audacious2
+...@bin bin/audtool2
 include/audacious/
 include/audacious/audconfig.h
 include/audacious/audctrl.h
 include/audacious/auddrct.h
+include/audacious/audtag.h
+include/audacious/audutil.h
 include/audacious/configdb.h
 include/audacious/custom_uri.h
 include/audacious/dbus-service.h
 include/audacious/dbus.h
 include/audacious/discovery.h
+include/audacious/equalizer_preset.h
 include/audacious/eventqueue.h
 include/audacious/flow.h
 include/audacious/hook.h
 include/audacious/i18n.h
 include/audacious/id3tag.h
 include/audacious/input.h
+include/audacious/interface.h
 include/audacious/main.h
 include/audacious/mime.h
 include/audacious/output.h
@@ -23,29 +27,37 @@ include/audacious/playback.h
 include/audacious/playlist.h
 include/audacious/playlist_container.h
 include/audacious/plugin.h
+include/audacious/preferences.h
 include/audacious/rcfile.h
-include/audacious/strings.h
-include/audacious/tuple.h
-include/audacious/tuple_compiler.h
-include/audacious/tuple_formatter.h
+include/audacious/scanner.h
 include/audacious/ui_fileinfopopup.h
 include/audacious/ui_plugin_menu.h
 include/audacious/ui_preferences.h
 include/audacious/util.h
-include/audacious/vfs.h
-include/audacious/vfs_buffer.h
-include/audacious/vfs_buffered_file.h
+include/audacious/vis_runner.h
 include/libSAD/
 include/libSAD/common.h
 include/libSAD/dither.h
 include/libSAD/libSAD.h
+include/libaudcore/
+include/libaudcore/audstrings.h
+include/libaudcore/tuple.h
+include/libaudcore/tuple_compiler.h
+include/libaudcore/tuple_formatter.h
+include/libaudcore/vfs.h
+include/libaudcore/vfs_buffer.h
+include/libaudcore/vfs_buffered_file.h
+lib/libSAD.so
 @lib lib/libaudclient.so.${LIBaudclient_VERSION}
+lib/libaudcore.so
 lib/libaudid3tag.so
+lib/libaudtag.so
+lib/libaudutil.so
 lib/pkgconfig/audacious.pc
 lib/pkgconfig/audclient.pc
-...@man man/man1/audacious.1
-...@man man/man1/audtool.1
-share/applications/audacious.desktop
+...@man man/man1/audacious2.1
+...@man man/man1/audtool2.1
+share/applications/audacious2.desktop
 share/audacious/
 share/audacious/Skins/
 share/audacious/Skins/Classic/
@@ -294,6 +306,7 @@ share/audacious/images/audacious_eq.xpm
 share/audacious/images/audacious_player.xpm
 share/audacious/images/audacious_playlist.xpm
 share/audacious/images/audio.png
+share/audacious/images/blue.png
 share/audacious/images/connectivity.png
 share/audacious/images/menu_playlist.png
 share/audacious/images/menu_plugin.png
@@ -308,6 +321,7 @@ share/audacious/ui/
 share/audacious/ui/carbon-menubar.ui
 share/audacious/ui/equalizer.ui
 share/audacious/ui/mainwin.ui
+share/audacious/ui/player.ui
 share/audacious/ui/playlist.ui
 share/locale/bg/LC_MESSAGES/audacious.mo
 share/locale/br/LC_MESSAGES/audacious.mo
@@ -318,6 +332,7 @@ share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
 share/locale/et/LC_MESSAGES/audacious.mo
+share/locale/eu/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
 share/locale/fr/LC_MESSAGES/audacious.mo
 share/locale/hi/LC_MESSAGES/audacious.mo
@@ -328,6 +343,7 @@ share/locale/ja/LC_MESSAGES/audacious.mo
 share/locale/ka/LC_MESSAGES/audacious.mo
 share/locale/ko/LC_MESSAGES/audacious.mo
 share/locale/lt/LC_MESSAGES/audacious.mo
+share/locale/lv/LC_MESSAGES/audacious.mo
 share/locale/mk/LC_MESSAGES/audacious.mo
 share/locale/nl/LC_MESSAGES/audacious.mo
 share/locale/pl/LC_MESSAGES/audacious.mo
@@ -345,6 +361,6 @@ share/locale/uk/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
 share/pixmaps/
-share/pixmaps/audacious.png
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database
+share/pixmaps/audacious2.png
Index: audio/audacious-plugins/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.17
diff -N -u -p audio/audacious-plugins/Makefile
--- audio/audacious-plugins/Makefile    10 Aug 2009 06:29:52 -0000      1.17
+++ audio/audacious-plugins/Makefile    26 Aug 2009 05:11:32 -0000
@@ -5,10 +5,10 @@ SHARED_ONLY = Yes
 COMMENT-main = input and output plugins for audacious
 COMMENT-jack = jack plugin for audacious
 
-V =            1.5.1
+V =            2.1
 DISTNAME =     audacious-plugins-$V
-PKGNAME-main = ${DISTNAME}p0
-PKGNAME-jack = audacious-jack-$Vp0
+PKGNAME-main = ${DISTNAME}
+PKGNAME-jack = audacious-jack-$V
 
 CATEGORIES =   audio multimedia
 
Index: audio/audacious-plugins/distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.6
diff -N -u -p audio/audacious-plugins/distinfo
--- audio/audacious-plugins/distinfo    25 Jan 2009 02:07:06 -0000      1.6
+++ audio/audacious-plugins/distinfo    26 Aug 2009 05:11:32 -0000
@@ -1,5 +1,5 @@
-MD5 (audacious-plugins-1.5.1.tgz) = BXuR8zqvBrtM3nJgF3wvXw==
-RMD160 (audacious-plugins-1.5.1.tgz) = S5/CnM9h0aUD8Q8GDL3uixSPKLg=
-SHA1 (audacious-plugins-1.5.1.tgz) = YwyTYCfGZkl5XKxzJ89qs1kNPkk=
-SHA256 (audacious-plugins-1.5.1.tgz) = 
rtM3MsVVZmBKJM0s0XUcJNFZ/47KUQZHxcPHiJ/YrhU=
-SIZE (audacious-plugins-1.5.1.tgz) = 2944448
+MD5 (audacious-plugins-2.1.tgz) = CH/LH2+4QpsmfxjtPjrLeg==
+RMD160 (audacious-plugins-2.1.tgz) = +3Pje1wFuvN237z5dE2WroXeDQI=
+SHA1 (audacious-plugins-2.1.tgz) = c1x3NojmXuV85yAFpypTu3ysx4s=
+SHA256 (audacious-plugins-2.1.tgz) = 
/nRB6e5quQP6cdIebuaxstOYVnpmGNUZy+tfoKbjoBM=
+SIZE (audacious-plugins-2.1.tgz) = 3610509
Index: audio/audacious-plugins/patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-aclocal_m4,v
retrieving revision 1.1
diff -N -u -p audio/audacious-plugins/patches/patch-aclocal_m4
--- audio/audacious-plugins/patches/patch-aclocal_m4    2 Apr 2008 00:39:19 
-0000       1.1
+++ audio/audacious-plugins/patches/patch-aclocal_m4    26 Aug 2009 05:11:32 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-aclocal_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
---- aclocal.m4.orig    Mon Mar 31 21:44:46 2008
-+++ aclocal.m4 Mon Mar 31 21:44:53 2008
-@@ -419,7 +419,6 @@ m4_include([m4/buildsys.m4])
+--- aclocal.m4.orig    Mon Jul  6 23:40:39 2009
++++ aclocal.m4 Sat Aug  1 16:52:50 2009
+@@ -461,7 +461,6 @@ m4_include([m4/buildsys.m4])
  m4_include([m4/gettext.m4])
  m4_include([m4/iconv.m4])
  m4_include([m4/isc-posix.m4])
Index: audio/audacious-plugins/patches/patch-buildsys_mk_in
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-buildsys_mk_in,v
retrieving revision 1.1
diff -N -u -p audio/audacious-plugins/patches/patch-buildsys_mk_in
--- audio/audacious-plugins/patches/patch-buildsys_mk_in        2 Apr 2008 
00:39:19 -0000       1.1
+++ audio/audacious-plugins/patches/patch-buildsys_mk_in        26 Aug 2009 
05:11:32 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.1 2008/04/02 00:39:19 fgsch Exp $
---- buildsys.mk.in.orig        Thu Mar 13 22:22:35 2008
-+++ buildsys.mk.in     Sun Mar 23 17:23:07 2008
-@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
- OBJS += ${OBJS5:.m=.o}
- DEPS += ${OBJS:.o=.dep}
+--- buildsys.mk.in.orig        Mon Jul  6 23:40:35 2009
++++ buildsys.mk.in     Sat Aug  1 16:53:19 2009
+@@ -81,7 +81,7 @@ OBJS6 = ${OBJS5:.m=.o}
+ OBJS7 = ${OBJS6:.py=.pyc}
+ OBJS += ${OBJS7:.xpm=.o}
  
 -.SILENT:
 +#.SILENT:
- .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
+ .SUFFIXES:
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .o .py .pyc .xpm
  .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean
- 
Index: audio/audacious-plugins/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-configure_ac,v
retrieving revision 1.2
diff -N -u -p audio/audacious-plugins/patches/patch-configure_ac
--- audio/audacious-plugins/patches/patch-configure_ac  25 Jan 2009 02:07:06 
-0000      1.2
+++ audio/audacious-plugins/patches/patch-configure_ac  26 Aug 2009 05:11:32 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_ac,v 1.2 2009/01/25 02:07:06 fgsch Exp $
---- configure.ac.orig  Fri May 23 23:44:19 2008
-+++ configure.ac       Wed Jan 21 00:43:22 2009
-@@ -811,13 +811,21 @@ AC_ARG_ENABLE( jack,
+--- configure.ac.orig  Mon Jul  6 23:40:35 2009
++++ configure.ac       Sat Aug  1 16:52:50 2009
+@@ -791,13 +791,21 @@ AC_ARG_ENABLE( jack,
                  [enable_jack="yes"])
  
  if test "x$enable_jack" = "xyes"; then
@@ -26,9 +26,9 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/01/25 02:07:06
        OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
  fi
  
-@@ -1549,6 +1557,20 @@ fi
- AC_SUBST(FILEWRITER_CFLAGS)
- AC_SUBST(FILEWRITER_LIBS)
+@@ -1555,6 +1563,20 @@ if test "x$have_bs2b" = "xyes"; then
+       EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
+ fi
  
 +dnl *** sndio
 +
@@ -47,18 +47,9 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/01/25 02:07:06
  dnl *** End of all plugin checks ***
  
  AC_SUBST(ARCH_DEFINES)
-@@ -1636,7 +1658,7 @@ echo "  Open Sound System (oss):                $have_
- echo "  Open Sound System v4 (oss4):            $have_oss4"
- echo "  Advanced Linux Sound Arch. (alsa):      $have_alsa"
- echo "  Enlightenment Sound Daemon (esd):       $have_esd"
--echo "  Jack Audio Connection Kit (jack):       $have_jack"
-+echo "  Jack Audio Connection Kit (jack):       $enable_jack"
- echo "  Analog Realtime Synthesizer (arts):     $have_arts"
- echo "  BSD/SUN audio output (sun):             $have_sun"
- echo "  PulseAudio sound server (pulse_audio):  $have_pulse"
-@@ -1646,6 +1668,7 @@ echo "    -> FileWriter MP3 output part:        $have_
- echo "    -> FileWriter Vorbis output part:     $have_vorbisenc"
+@@ -1652,6 +1674,7 @@ echo "    -> FileWriter Vorbis output part:     $have_
  echo "    -> FileWriter FLAC output part:       $have_writer_flac"
+ echo "  Icecast audio output (icecast):         $have_shout"
  echo "  Null Audio output (null):               yes"
 +echo "  Sndio Audio output (sndio):             $have_sndio"
  echo
Index: audio/audacious-plugins/patches/patch-src_aac_libmp4_c
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-src_aac_libmp4_c,v
retrieving revision 1.4
diff -N -u -p audio/audacious-plugins/patches/patch-src_aac_libmp4_c
--- audio/audacious-plugins/patches/patch-src_aac_libmp4_c      11 Mar 2009 
00:36:06 -0000      1.4
+++ audio/audacious-plugins/patches/patch-src_aac_libmp4_c      26 Aug 2009 
05:11:32 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-src_aac_libmp4_c,v 1.4 2009/03/11 00:36:06 fgsch Exp $
---- src/aac/libmp4.c.orig      Fri May 23 23:44:19 2008
-+++ src/aac/libmp4.c   Tue Mar 10 20:48:31 2009
+--- src/aac/libmp4.c.orig      Mon Jul  6 23:40:36 2009
++++ src/aac/libmp4.c   Sat Aug  1 16:52:50 2009
 @@ -10,6 +10,8 @@
  #include <audacious/output.h>
  #include <audacious/i18n.h>
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.4 2009/03/11 00:3
  #define MP4_VERSION VERSION
  #define SBR_DEC
  
-@@ -88,7 +90,7 @@ static guint32 mp4_read_callback(void *data, void *buf
+@@ -93,7 +95,7 @@ static guint32 mp4_read_callback(void *data, void *buf
      return aud_vfs_fread(buffer, 1, len, (VFSFile *) data);
  }
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.4 2009/03/11 00:3
  {
      if (data == NULL)
          return -1;
-@@ -626,7 +628,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
+@@ -648,7 +650,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
      faacDecHandle   decoder = 0;
      guchar      streambuffer[BUFFER_SIZE];
      gulong      bufferconsumed = 0;
@@ -27,4 +27,4 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.4 2009/03/11 00:3
 +    guint       samplerate = 0;
      guchar      channels = 0;
      gulong      buffervalid = 0;
-     gchar       *ttemp = NULL, *stemp = NULL;
+     gulong    ret = 0;
Index: audio/audacious-plugins/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST-main,v
retrieving revision 1.5
diff -N -u -p audio/audacious-plugins/pkg/PLIST-main
--- audio/audacious-plugins/pkg/PLIST-main      25 Jan 2009 02:07:06 -0000      
1.5
+++ audio/audacious-plugins/pkg/PLIST-main      26 Aug 2009 05:11:32 -0000
@@ -16,23 +16,27 @@ lib/audacious/General/
 lib/audacious/General/alarm.so
 lib/audacious/General/aosd.so
 lib/audacious/General/gnomeshortcuts.so
+lib/audacious/General/gtkui.so
 lib/audacious/General/hotkey.so
 lib/audacious/General/scrobbler.so
+lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 lib/audacious/General/statusicon.so
+lib/audacious/General/streambrowser.so
+lib/audacious/General/vfstrace.so
 lib/audacious/Input/
 lib/audacious/Input/aac.so
 lib/audacious/Input/alac.so
 lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
-lib/audacious/Input/cuesheet.so
+lib/audacious/Input/cuesheet_ng.so
 lib/audacious/Input/demac.so
 lib/audacious/Input/flacng.so
 lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
 lib/audacious/Input/modplug.so
 lib/audacious/Input/musepack.so
-lib/audacious/Input/sexypsf.so
+lib/audacious/Input/psf2.so
 lib/audacious/Input/sndfile.so
 lib/audacious/Input/timidity.so
 lib/audacious/Input/tonegen.so
@@ -41,15 +45,17 @@ lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
 lib/audacious/Input/wavpack.so
 lib/audacious/Input/wma.so
+lib/audacious/Input/xsf.so
 lib/audacious/Output/
+lib/audacious/Output/crossfade.so
 lib/audacious/Output/filewriter.so
 lib/audacious/Output/null.so
 lib/audacious/Output/sndio.so
 lib/audacious/Output/sun.so
 lib/audacious/Transport/
+lib/audacious/Transport/gio.so
 lib/audacious/Transport/lastfm.so
 lib/audacious/Transport/neon.so
-lib/audacious/Transport/stdio.so
 lib/audacious/Visualization/
 lib/audacious/Visualization/blur_scope.so
 lib/audacious/Visualization/paranormal.so
@@ -57,6 +63,11 @@ lib/audacious/Visualization/rocklight.so
 lib/audacious/Visualization/spectrum.so
 share/audacious/images/audioscrobbler.png
 share/audacious/images/audioscrobbler_badge.png
+share/audacious/images/bookmarks.png
+share/audacious/images/shoutcast.png
+share/audacious/images/streambrowser-16x16.png
+share/audacious/images/streambrowser-64x64.png
+share/audacious/images/xiph.png
 share/audacious/paranormal/
 share/audacious/paranormal/Presets/
 share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
@@ -100,6 +111,7 @@ share/locale/de/LC_MESSAGES/audacious-plugins.mo
 share/locale/et/LC_MESSAGES/audacious-plugins.mo
 share/locale/fr/LC_MESSAGES/audacious-plugins.mo
 share/locale/ja/LC_MESSAGES/audacious-plugins.mo
+share/locale/lv/LC_MESSAGES/audacious-plugins.mo
 share/locale/ro/LC_MESSAGES/audacious-plugins.mo
 share/locale/ru/LC_MESSAGES/audacious-plugins.mo
 share/locale/sk/LC_MESSAGES/audacious-plugins.mo

Reply via email to