diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index cb33a4c8d84e..2a40ed52ae9b 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -6,32 +6,41 @@ # PORTNAME= xmms -PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTVERSION= 1.2.5 CATEGORIES+= audio -MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ +MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \ + http://www.xmms.org/files/1.2.x/ \ + ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/ MAINTAINER?= esk@ira.uka.de LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml +USE_BZIP2= yes USE_X_PREFIX= yes USE_GTK= yes WANT_ESOUND= yes WANT_GNOME= yes +USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFILES= configure libxmms/configure INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ - HAVE_MIKMOD="${HAVE_MIKMOD}" \ - HAVE_VORBIS="${HAVE_VORBIS}" + INPUT_PLUGINS="${INPUT_PLUGINS}" \ + OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \ + VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" +MAN1= gnomexmms.1 wmxmms.1 xmms.1 + +INPUT_PLUGINS= cdaudio,idcin,mpg123,tonegen,wav +OUTPUT_PLUGINS= OSS,disk_writer +VISUALIZATION_PLUGINS= blur_scope,sanalyzer .include .if !defined(WITHOUT_MIKMOD) LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod -HAVE_MIKMOD= yes +INPUT_PLUGINS+= mikmod PLIST_SUB+= MIKMODPLUGIN:="" .else PLIST_SUB+= MIKMODPLUGIN:="@comment " @@ -39,7 +48,7 @@ PLIST_SUB+= MIKMODPLUGIN:="@comment " .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.0:${PORTSDIR}/audio/libvorbis -HAVE_VORBIS= yes +INPUT_PLUGINS+= vorbis PLIST_SUB+= VORBISPLUGIN:="" .else PLIST_SUB+= VORBISPLUGIN:="@comment " @@ -53,6 +62,7 @@ CONFIGURE_ARGS= --without-gnome .if defined(HAVE_ESOUND) USE_ESOUND= yes +OUTPUT_PLUGINS+= esd PLIST_SUB+= ESDPLUGIN:="" .else PLIST_SUB+= ESDPLUGIN:="@comment " @@ -87,9 +97,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/aclocal|\$\(prefix\)/share/aclocal|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo index 4c09375234a2..cbcdd02f8263 100644 --- a/audio/xmms/distinfo +++ b/audio/xmms/distinfo @@ -1 +1 @@ -MD5 (xmms-1.2.4.tar.gz) = df1081cc01628cd8b97cb5f3ca80e063 +MD5 (xmms-1.2.5.tar.bz2) = bb856ff278a4ccee3d2578e3ddea8686 diff --git a/audio/xmms/files/patch-ab b/audio/xmms/files/patch-ab deleted file mode 100644 index a4895b94c00e..000000000000 --- a/audio/xmms/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Visualization/Makefile.in.orig Mon Jan 31 10:44:44 2000 -+++ Visualization/Makefile.in Sun Feb 27 01:37:39 2000 -@@ -125,7 +125,7 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = blur_scope sanalyzer opengl_spectrum -+SUBDIRS = blur_scope sanalyzer - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad index 638bfcf41154..6de233e90423 100644 --- a/audio/xmms/files/patch-ad +++ b/audio/xmms/files/patch-ad @@ -1,55 +1,17 @@ ---- configure.orig Tue Nov 28 16:12:16 2000 -+++ configure Tue Nov 28 16:12:52 2000 -@@ -4033,6 +4033,9 @@ - fi - - -+if [ x"${HAVE_ESOUND}" != x"yes" ]; then -+ have_esd=no -+fi - - if test "x$have_esd" = xyes; then - HAVE_ESD_TRUE= -@@ -4314,6 +4317,9 @@ - rm -f conf.mikmodtest - - -+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then -+ have_mikmod=no -+fi - - if test "x$have_mikmod" = xyes; then - HAVE_MIKMOD_TRUE= -@@ -4574,6 +4580,11 @@ - - rm -f conf.vorbistest - -+if [ x"${HAVE_VORBIS}" != x"yes" ]; then -+ have_ogg=no -+ have_vorbis=no -+fi -+ - have_oggvorbis=no - if test "x$have_ogg" = xyes - then -@@ -7551,14 +7562,14 @@ - - if test -n "$GCC" - then -- CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math" -+ CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -finline-functions -ffast-math" - fi - - arch_type=other + +$FreeBSD$ + +--- configure.orig Mon Jun 18 22:53:50 2001 ++++ configure Thu Jun 21 18:24:01 2001 +@@ -8062,7 +8062,6 @@ ARCH_DEFINES="" case "$host" in i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*) - CFLAGS="$CFLAGS -m486" -+ CFLAGS="$CFLAGS" ARCH_DEFINES="-DI386_ASSEM" arch_type=ix86 ;; -@@ -8315,10 +8326,6 @@ +@@ -8858,10 +8857,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/audio/xmms/files/patch-ae b/audio/xmms/files/patch-ae deleted file mode 100644 index e013d1c99109..000000000000 --- a/audio/xmms/files/patch-ae +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.in.orig Tue Nov 28 14:55:51 2000 -+++ Makefile.in Tue Nov 28 14:57:22 2000 -@@ -152,7 +152,10 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po -+SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po -+.ifdef HAVE_GNOME -+SUBDIRS += gnomexmms -+.endif - - bin_SCRIPTS = xmms-config - -@@ -211,9 +214,9 @@ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi --$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -- cd $(top_srcdir) && $(AUTOHEADER) -- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null -+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -+# cd $(top_srcdir) && $(AUTOHEADER) -+# @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - - mostlyclean-hdr: - diff --git a/audio/xmms/files/patch-af b/audio/xmms/files/patch-af deleted file mode 100644 index eccc666a3f35..000000000000 --- a/audio/xmms/files/patch-af +++ /dev/null @@ -1,14 +0,0 @@ ---- Output/Makefile.in.orig Tue Nov 28 14:58:15 2000 -+++ Output/Makefile.in Tue Nov 28 14:58:46 2000 -@@ -152,7 +152,10 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = OSS esd disk_writer -+SUBDIRS = OSS disk_writer -+.if defined(HAVE_ESOUND) || defined(HAVE_GNOME) -+SUBDIRS += esd -+.endif - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/audio/xmms/files/patch-ba b/audio/xmms/files/patch-ba deleted file mode 100644 index 0a38064365f6..000000000000 --- a/audio/xmms/files/patch-ba +++ /dev/null @@ -1,81 +0,0 @@ -*** /usr/local/src/CVS/MM/xmms/xmms/Input/cdaudio/cdaudio.c Wed Aug 2 02:15:13 2000 ---- Input/cdaudio/cdaudio.c Tue Sep 5 12:46:29 2000 -*************** -*** 183,194 **** - - static gboolean is_mounted(gchar * device_name) - { -! #ifdef HAVE_MNTENT_H -! FILE *mounts; -! struct mntent *mnt; - char devname[256]; - struct stat st; -! - if (lstat(device_name, &st) < 0) - return -1; - ---- 183,199 ---- - - static gboolean is_mounted(gchar * device_name) - { -! #if defined (HAVE_MNTENT_H) || defined (__FreeBSD__) - char devname[256]; - struct stat st; -! #if defined (HAVE_MNTENT_H) -! FILE *mounts; -! struct mntent *mnt; -! #elif defined (__FreeBSD__) -! struct statfs *fsp; -! int entries; -! #endif -! - if (lstat(device_name, &st) < 0) - return -1; - -*************** -*** 197,202 **** ---- 202,208 ---- - else - strncpy(devname, device_name, 256); - -+ #if defined (HAVE_MNTENT_H) - if ((mounts = setmntent(MOUNTED, "r")) == NULL) - return TRUE; - -*************** -*** 209,214 **** ---- 215,231 ---- - } - } - endmntent(mounts); -+ #elif defined (__FreeBSD__) -+ entries = getmntinfo (&fsp, MNT_NOWAIT); -+ if (entries < 0) -+ return NULL; -+ -+ while (entries-- > 0) { -+ if (!strcmp(fsp->f_mntfromname, devname)) -+ return TRUE; -+ fsp++; -+ } -+ #endif - #endif - return FALSE; - } -*** /usr/local/src/CVS/MM/xmms/xmms/Input/cdaudio/cdaudio.h Thu Jun 15 00:51:44 2000 ---- Input/cdaudio/cdaudio.h Tue Sep 5 13:49:37 2000 -*************** -*** 46,51 **** ---- 46,57 ---- - #include - #endif - -+ #ifdef __FreeBSD__ -+ #include -+ #include -+ #include -+ #endif -+ - #ifndef CD_FRAMES - #define CD_FRAMES 75 - #endif diff --git a/audio/xmms/pkg-message b/audio/xmms/pkg-message index d5080b5fd0a2..852df17c577e 100644 --- a/audio/xmms/pkg-message +++ b/audio/xmms/pkg-message @@ -1,2 +1,2 @@ -Xmms supports Gzipped and uncompressed skins. If you would like to use +Xmms supports Gzipped and uncompressed skins. If you would like to use Zip format skins you will need to ensure archivers/unzip is installed. diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist index d64f2a0ebef5..1667d8dfbf68 100644 --- a/audio/xmms/pkg-plist +++ b/audio/xmms/pkg-plist @@ -5,16 +5,16 @@ bin/xmms-config %%GNOME:%%etc/CORBA/servers/gnomexmms.gnorba %%GNOME:%%share/gnome/applets/Multimedia/gnomexmms.desktop include/xmms/configfile.h -include/xmms/dga.h include/xmms/dirbrowser.h include/xmms/formatter.h include/xmms/fullscreen.h include/xmms/plugin.h +include/xmms/titlestring.h include/xmms/util.h include/xmms/xmmsctrl.h lib/libxmms.a lib/libxmms.so -lib/libxmms.so.1 +lib/libxmms.so.2 lib/xmms/Effect/libecho.so lib/xmms/Effect/libstereo.so lib/xmms/Effect/libvoice.so @@ -46,8 +46,10 @@ share/locale/eo/LC_MESSAGES/xmms.mo share/locale/es/LC_MESSAGES/xmms.mo share/locale/fr/LC_MESSAGES/xmms.mo share/locale/ga/LC_MESSAGES/xmms.mo +share/locale/gl/LC_MESSAGES/xmms.mo share/locale/hr/LC_MESSAGES/xmms.mo share/locale/hu/LC_MESSAGES/xmms.mo +share/locale/id/LC_MESSAGES/xmms.mo share/locale/it/LC_MESSAGES/xmms.mo share/locale/ja/LC_MESSAGES/xmms.mo share/locale/ko/LC_MESSAGES/xmms.mo @@ -56,16 +58,18 @@ share/locale/lv/LC_MESSAGES/xmms.mo share/locale/nl/LC_MESSAGES/xmms.mo share/locale/no/LC_MESSAGES/xmms.mo share/locale/pl/LC_MESSAGES/xmms.mo +share/locale/pt/LC_MESSAGES/xmms.mo share/locale/pt_BR/LC_MESSAGES/xmms.mo share/locale/ro/LC_MESSAGES/xmms.mo share/locale/ru/LC_MESSAGES/xmms.mo share/locale/sk/LC_MESSAGES/xmms.mo +share/locale/sr/LC_MESSAGES/xmms.mo share/locale/sv/LC_MESSAGES/xmms.mo share/locale/tr/LC_MESSAGES/xmms.mo share/locale/uk/LC_MESSAGES/xmms.mo share/locale/wa/LC_MESSAGES/xmms.mo share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo -share/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo +share/locale/zh_TW/LC_MESSAGES/xmms.mo @dirrm %%DATADIR%%/xmms @dirrm lib/xmms/Visualization @dirrm lib/xmms/Output diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index cb33a4c8d84e..2a40ed52ae9b 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -6,32 +6,41 @@ # PORTNAME= xmms -PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTVERSION= 1.2.5 CATEGORIES+= audio -MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ +MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \ + http://www.xmms.org/files/1.2.x/ \ + ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/ MAINTAINER?= esk@ira.uka.de LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml +USE_BZIP2= yes USE_X_PREFIX= yes USE_GTK= yes WANT_ESOUND= yes WANT_GNOME= yes +USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFILES= configure libxmms/configure INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ - HAVE_MIKMOD="${HAVE_MIKMOD}" \ - HAVE_VORBIS="${HAVE_VORBIS}" + INPUT_PLUGINS="${INPUT_PLUGINS}" \ + OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \ + VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" +MAN1= gnomexmms.1 wmxmms.1 xmms.1 + +INPUT_PLUGINS= cdaudio,idcin,mpg123,tonegen,wav +OUTPUT_PLUGINS= OSS,disk_writer +VISUALIZATION_PLUGINS= blur_scope,sanalyzer .include .if !defined(WITHOUT_MIKMOD) LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod -HAVE_MIKMOD= yes +INPUT_PLUGINS+= mikmod PLIST_SUB+= MIKMODPLUGIN:="" .else PLIST_SUB+= MIKMODPLUGIN:="@comment " @@ -39,7 +48,7 @@ PLIST_SUB+= MIKMODPLUGIN:="@comment " .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.0:${PORTSDIR}/audio/libvorbis -HAVE_VORBIS= yes +INPUT_PLUGINS+= vorbis PLIST_SUB+= VORBISPLUGIN:="" .else PLIST_SUB+= VORBISPLUGIN:="@comment " @@ -53,6 +62,7 @@ CONFIGURE_ARGS= --without-gnome .if defined(HAVE_ESOUND) USE_ESOUND= yes +OUTPUT_PLUGINS+= esd PLIST_SUB+= ESDPLUGIN:="" .else PLIST_SUB+= ESDPLUGIN:="@comment " @@ -87,9 +97,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/aclocal|\$\(prefix\)/share/aclocal|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo index 4c09375234a2..cbcdd02f8263 100644 --- a/multimedia/xmms/distinfo +++ b/multimedia/xmms/distinfo @@ -1 +1 @@ -MD5 (xmms-1.2.4.tar.gz) = df1081cc01628cd8b97cb5f3ca80e063 +MD5 (xmms-1.2.5.tar.bz2) = bb856ff278a4ccee3d2578e3ddea8686 diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab deleted file mode 100644 index a4895b94c00e..000000000000 --- a/multimedia/xmms/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Visualization/Makefile.in.orig Mon Jan 31 10:44:44 2000 -+++ Visualization/Makefile.in Sun Feb 27 01:37:39 2000 -@@ -125,7 +125,7 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = blur_scope sanalyzer opengl_spectrum -+SUBDIRS = blur_scope sanalyzer - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad index 638bfcf41154..6de233e90423 100644 --- a/multimedia/xmms/files/patch-ad +++ b/multimedia/xmms/files/patch-ad @@ -1,55 +1,17 @@ ---- configure.orig Tue Nov 28 16:12:16 2000 -+++ configure Tue Nov 28 16:12:52 2000 -@@ -4033,6 +4033,9 @@ - fi - - -+if [ x"${HAVE_ESOUND}" != x"yes" ]; then -+ have_esd=no -+fi - - if test "x$have_esd" = xyes; then - HAVE_ESD_TRUE= -@@ -4314,6 +4317,9 @@ - rm -f conf.mikmodtest - - -+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then -+ have_mikmod=no -+fi - - if test "x$have_mikmod" = xyes; then - HAVE_MIKMOD_TRUE= -@@ -4574,6 +4580,11 @@ - - rm -f conf.vorbistest - -+if [ x"${HAVE_VORBIS}" != x"yes" ]; then -+ have_ogg=no -+ have_vorbis=no -+fi -+ - have_oggvorbis=no - if test "x$have_ogg" = xyes - then -@@ -7551,14 +7562,14 @@ - - if test -n "$GCC" - then -- CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math" -+ CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -finline-functions -ffast-math" - fi - - arch_type=other + +$FreeBSD$ + +--- configure.orig Mon Jun 18 22:53:50 2001 ++++ configure Thu Jun 21 18:24:01 2001 +@@ -8062,7 +8062,6 @@ ARCH_DEFINES="" case "$host" in i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*) - CFLAGS="$CFLAGS -m486" -+ CFLAGS="$CFLAGS" ARCH_DEFINES="-DI386_ASSEM" arch_type=ix86 ;; -@@ -8315,10 +8326,6 @@ +@@ -8858,10 +8857,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/multimedia/xmms/files/patch-ae b/multimedia/xmms/files/patch-ae deleted file mode 100644 index e013d1c99109..000000000000 --- a/multimedia/xmms/files/patch-ae +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.in.orig Tue Nov 28 14:55:51 2000 -+++ Makefile.in Tue Nov 28 14:57:22 2000 -@@ -152,7 +152,10 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po -+SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po -+.ifdef HAVE_GNOME -+SUBDIRS += gnomexmms -+.endif - - bin_SCRIPTS = xmms-config - -@@ -211,9 +214,9 @@ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi --$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -- cd $(top_srcdir) && $(AUTOHEADER) -- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null -+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -+# cd $(top_srcdir) && $(AUTOHEADER) -+# @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - - mostlyclean-hdr: - diff --git a/multimedia/xmms/files/patch-af b/multimedia/xmms/files/patch-af deleted file mode 100644 index eccc666a3f35..000000000000 --- a/multimedia/xmms/files/patch-af +++ /dev/null @@ -1,14 +0,0 @@ ---- Output/Makefile.in.orig Tue Nov 28 14:58:15 2000 -+++ Output/Makefile.in Tue Nov 28 14:58:46 2000 -@@ -152,7 +152,10 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = OSS esd disk_writer -+SUBDIRS = OSS disk_writer -+.if defined(HAVE_ESOUND) || defined(HAVE_GNOME) -+SUBDIRS += esd -+.endif - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/multimedia/xmms/files/patch-ba b/multimedia/xmms/files/patch-ba deleted file mode 100644 index 0a38064365f6..000000000000 --- a/multimedia/xmms/files/patch-ba +++ /dev/null @@ -1,81 +0,0 @@ -*** /usr/local/src/CVS/MM/xmms/xmms/Input/cdaudio/cdaudio.c Wed Aug 2 02:15:13 2000 ---- Input/cdaudio/cdaudio.c Tue Sep 5 12:46:29 2000 -*************** -*** 183,194 **** - - static gboolean is_mounted(gchar * device_name) - { -! #ifdef HAVE_MNTENT_H -! FILE *mounts; -! struct mntent *mnt; - char devname[256]; - struct stat st; -! - if (lstat(device_name, &st) < 0) - return -1; - ---- 183,199 ---- - - static gboolean is_mounted(gchar * device_name) - { -! #if defined (HAVE_MNTENT_H) || defined (__FreeBSD__) - char devname[256]; - struct stat st; -! #if defined (HAVE_MNTENT_H) -! FILE *mounts; -! struct mntent *mnt; -! #elif defined (__FreeBSD__) -! struct statfs *fsp; -! int entries; -! #endif -! - if (lstat(device_name, &st) < 0) - return -1; - -*************** -*** 197,202 **** ---- 202,208 ---- - else - strncpy(devname, device_name, 256); - -+ #if defined (HAVE_MNTENT_H) - if ((mounts = setmntent(MOUNTED, "r")) == NULL) - return TRUE; - -*************** -*** 209,214 **** ---- 215,231 ---- - } - } - endmntent(mounts); -+ #elif defined (__FreeBSD__) -+ entries = getmntinfo (&fsp, MNT_NOWAIT); -+ if (entries < 0) -+ return NULL; -+ -+ while (entries-- > 0) { -+ if (!strcmp(fsp->f_mntfromname, devname)) -+ return TRUE; -+ fsp++; -+ } -+ #endif - #endif - return FALSE; - } -*** /usr/local/src/CVS/MM/xmms/xmms/Input/cdaudio/cdaudio.h Thu Jun 15 00:51:44 2000 ---- Input/cdaudio/cdaudio.h Tue Sep 5 13:49:37 2000 -*************** -*** 46,51 **** ---- 46,57 ---- - #include - #endif - -+ #ifdef __FreeBSD__ -+ #include -+ #include -+ #include -+ #endif -+ - #ifndef CD_FRAMES - #define CD_FRAMES 75 - #endif diff --git a/multimedia/xmms/pkg-message b/multimedia/xmms/pkg-message index d5080b5fd0a2..852df17c577e 100644 --- a/multimedia/xmms/pkg-message +++ b/multimedia/xmms/pkg-message @@ -1,2 +1,2 @@ -Xmms supports Gzipped and uncompressed skins. If you would like to use +Xmms supports Gzipped and uncompressed skins. If you would like to use Zip format skins you will need to ensure archivers/unzip is installed. diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist index d64f2a0ebef5..1667d8dfbf68 100644 --- a/multimedia/xmms/pkg-plist +++ b/multimedia/xmms/pkg-plist @@ -5,16 +5,16 @@ bin/xmms-config %%GNOME:%%etc/CORBA/servers/gnomexmms.gnorba %%GNOME:%%share/gnome/applets/Multimedia/gnomexmms.desktop include/xmms/configfile.h -include/xmms/dga.h include/xmms/dirbrowser.h include/xmms/formatter.h include/xmms/fullscreen.h include/xmms/plugin.h +include/xmms/titlestring.h include/xmms/util.h include/xmms/xmmsctrl.h lib/libxmms.a lib/libxmms.so -lib/libxmms.so.1 +lib/libxmms.so.2 lib/xmms/Effect/libecho.so lib/xmms/Effect/libstereo.so lib/xmms/Effect/libvoice.so @@ -46,8 +46,10 @@ share/locale/eo/LC_MESSAGES/xmms.mo share/locale/es/LC_MESSAGES/xmms.mo share/locale/fr/LC_MESSAGES/xmms.mo share/locale/ga/LC_MESSAGES/xmms.mo +share/locale/gl/LC_MESSAGES/xmms.mo share/locale/hr/LC_MESSAGES/xmms.mo share/locale/hu/LC_MESSAGES/xmms.mo +share/locale/id/LC_MESSAGES/xmms.mo share/locale/it/LC_MESSAGES/xmms.mo share/locale/ja/LC_MESSAGES/xmms.mo share/locale/ko/LC_MESSAGES/xmms.mo @@ -56,16 +58,18 @@ share/locale/lv/LC_MESSAGES/xmms.mo share/locale/nl/LC_MESSAGES/xmms.mo share/locale/no/LC_MESSAGES/xmms.mo share/locale/pl/LC_MESSAGES/xmms.mo +share/locale/pt/LC_MESSAGES/xmms.mo share/locale/pt_BR/LC_MESSAGES/xmms.mo share/locale/ro/LC_MESSAGES/xmms.mo share/locale/ru/LC_MESSAGES/xmms.mo share/locale/sk/LC_MESSAGES/xmms.mo +share/locale/sr/LC_MESSAGES/xmms.mo share/locale/sv/LC_MESSAGES/xmms.mo share/locale/tr/LC_MESSAGES/xmms.mo share/locale/uk/LC_MESSAGES/xmms.mo share/locale/wa/LC_MESSAGES/xmms.mo share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo -share/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo +share/locale/zh_TW/LC_MESSAGES/xmms.mo @dirrm %%DATADIR%%/xmms @dirrm lib/xmms/Visualization @dirrm lib/xmms/Output