7 files changed, 11 insertions, 68 deletions

diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index f34973d2b890..76db98f02feb 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmms-wma
-PORTVERSION=	0.1.3
+PORTVERSION=	0.2
 CATEGORIES=	audio
 MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 
diff --git a/audio/xmms-wma/distinfo b/audio/xmms-wma/distinfo
index f5b8fa0ca6f0..373e638d1934 100644
--- a/audio/xmms-wma/distinfo
+++ b/audio/xmms-wma/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmms-wma-0.1.3.tar.bz2) = ddb46e38017c905d5cea09beae9941b5
-SIZE (xmms-wma-0.1.3.tar.bz2) = 140855
+MD5 (xmms-wma-0.2.tar.bz2) = f73b6e78fe6811a1db0e6b804b2ee4f5
+SIZE (xmms-wma-0.2.tar.bz2) = 144704
diff --git a/audio/xmms-wma/files/patch-Makefile b/audio/xmms-wma/files/patch-Makefile
index db2d9490a733..eaf62c5d35d9 100644
--- a/audio/xmms-wma/files/patch-Makefile
+++ b/audio/xmms-wma/files/patch-Makefile
@@ -1,20 +1,19 @@
---- Makefile	Wed Mar  3 17:47:58 2004
-+++ Makefile	Thu Mar 11 19:05:38 2004
+--- Makefile.orig	Mon Apr 19 08:42:08 2004
++++ Makefile	Mon Apr 19 08:55:24 2004
 @@ -1,6 +1,6 @@
--.PHONY: all install install-home uninstall uninstall-home clean
-+.PHONY: all install uninstall clean
+ .PHONY: all install install-home uninstall uninstall-home clean
  
 -INSTALL_DIR := /usr/lib/xmms/Input
 +INSTALL_DIR := `xmms-config --input-plugin-dir`
  INSTALL_DIR_HOME := ~/.xmms/Plugins/Input
  
  export PLUGIN_FILE := libwma.so
-@@ -11,34 +11,17 @@
+@@ -11,12 +11,9 @@
  export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
  
  all:
 -	@cd ffmpeg-strip-wma; make; cd ..
-+	@cd ffmpeg-strip-wma; gmake; cd ..
++	@cd ffmpeg-strip-wma; $(MAKE); cd ..
  	@$(MAKE) --no-print-directory -f Makefile.inc
  	@strip $(PLUGIN_FILE)
 -	@echo "The plug-in has been compiled. Run one of the following:"
@@ -23,26 +22,10 @@
  
  install: all
  	cp -f $(PLUGIN_FILE) $(INSTALL_DIR)
--	@echo "The plug-in has been installed."
--	@echo "Enjoy!"
--
--install-home: all
--	-mkdir ~/.xmms
--	-mkdir ~/.xmms/Plugins
--	-mkdir ~/.xmms/Plugins/Input
--	cp -f $(PLUGIN_FILE) $(INSTALL_DIR_HOME)
--	@echo "The plug-in has been installed."
--	@echo "Enjoy!"
- 
- uninstall:
- 	rm -f $(INSTALL_DIR)/$(PLUGIN_FILE)
+@@ -40,5 +37,5 @@
  	@echo "The plug-in has been uninstalled."
  
--uninstall-home:
--	rm -f $(INSTALL_DIR_HOME)/$(PLUGIN_FILE)
--	@echo "The plug-in has been uninstalled."
--
  clean:
 -	cd ffmpeg-strip-wma; make clean; cd ..
-+	cd ffmpeg-strip-wma; gmake clean; cd ..
++	cd ffmpeg-strip-wma; $(MAKE) clean; cd ..
  	rm -f $(OBJECTS) $(DEPS)
diff --git a/audio/xmms-wma/files/patch-Makefile.inc b/audio/xmms-wma/files/patch-Makefile.inc
deleted file mode 100644
index 4679f248ec79..000000000000
--- a/audio/xmms-wma/files/patch-Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.inc	Wed Mar  3 23:02:39 2004
-+++ Makefile.inc	Thu Mar 11 18:59:19 2004
-@@ -10,7 +10,7 @@
- 	$(CC) -o $@ $^ $(LIBS) -shared
- 
- $(OBJDIR)/%.o: %.c
--	$(CC) -c -o $@ $(CFLAGS) $<
-+	$(CC) -c -o $@ $(CFLAGS) $< 
- 
- $(DEPDIR)/%.d: %.c
- 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
deleted file mode 100644
index 5f4d7ef98951..000000000000
--- a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg-strip-wma/asf.c	Fri Feb 20 03:21:31 2004
-+++ ffmpeg-strip-wma/asf.c	Thu Mar 11 18:46:59 2004
-@@ -847,7 +847,7 @@
-        {
-            return;
-        }
--       result = iconv(frt, &ansbptr, &len, &ansaptr, &len1);
-+       result = iconv(frt, (const char **)&ansbptr, &len, &ansaptr, &len1);
-        if (result == (size_t) - 1)
-        {
-            return;
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak
deleted file mode 100644
index ea47033c399f..000000000000
--- a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak
+++ /dev/null
@@ -1,18 +0,0 @@
---- ffmpeg-strip-wma/config.mak.orig	Thu Feb 19 01:08:40 2004
-+++ ffmpeg-strip-wma/config.mak	Tue Mar 16 15:30:59 2004
-@@ -3,12 +3,12 @@
- bindir=/usr/bin
- mandir=/usr/share/man
- MAKE=make
--CC=gcc
-+CC?=gcc
- AR=ar
- RANLIB=ranlib
- STRIP=strip
--OPTFLAGS=-Wall  -g -O3
--SHCFLAGS=-Wall  -g -O3
-+OPTFLAGS=-Wall -O3
-+SHCFLAGS=-Wall -O3
- LDFLAGS=-Wl,--warn-common -rdynamic
- FFSLDFLAGS=-Wl,-E
- SHFLAGS=-shared
diff --git a/audio/xmms-wma/pkg-descr b/audio/xmms-wma/pkg-descr
index 01c649fe8972..455e3a8cb1ec 100644
--- a/audio/xmms-wma/pkg-descr
+++ b/audio/xmms-wma/pkg-descr
@@ -1,4 +1,4 @@
-XMMS input plugin to support WMA format.
+XMMS input plugin for support WMA format.
 
 WWW: http://mcmcc.bat.ru/xmms-wma/