Version bump + bugfix. Thanks to Theofilos Intzoglou, bug #22076

4 files changed, 91 insertions, 2 deletions

diff --git a/media-plugins/modplugxmms/Manifest b/media-plugins/modplugxmms/Manifest
index 8149bfa407c6..5a7a08366934 100644
--- a/media-plugins/modplugxmms/Manifest
+++ b/media-plugins/modplugxmms/Manifest
@@ -1,6 +1,6 @@
 MD5 fe7ca60cab5e927957308d3fba94557b modplugxmms-2.03.ebuild 898
-MD5 f7cb6c0924b9119fe4ccfbc0f53c1d74 modplugxmms-2.04.ebuild 1088
-MD5 9665a0322f667f17ef74942e9420a826 ChangeLog 732
+MD5 0f55bc47e503c6d5de242a7f4f01452a modplugxmms-2.04.ebuild 1086
+MD5 be95142d367124deb412acbb2aaa63b4 ChangeLog 978
 MD5 347455313bf5f53d8e4266e15aa5e626 files/modplugxmms-2.04.patch 1493
 MD5 f6708258d3e7af56cfb32b7cc55d695a files/digest-modplugxmms-2.03 68
 MD5 d7165423584038258ba8ea95f016b073 files/digest-modplugxmms-2.04 68
diff --git a/media-plugins/modplugxmms/files/digest-modplugxmms-2.04 b/media-plugins/modplugxmms/files/digest-modplugxmms-2.04
new file mode 100644
index 000000000000..b0d515ff4656
--- /dev/null
+++ b/media-plugins/modplugxmms/files/digest-modplugxmms-2.04
@@ -0,0 +1 @@
+MD5 fe3671391dc65703357db9ad147744ef modplugxmms-2.04.tar.gz 479747
diff --git a/media-plugins/modplugxmms/files/modplugxmms-2.04.patch b/media-plugins/modplugxmms/files/modplugxmms-2.04.patch
new file mode 100644
index 000000000000..8e307838ef46
--- /dev/null
+++ b/media-plugins/modplugxmms/files/modplugxmms-2.04.patch
@@ -0,0 +1,50 @@
+diff -ru modplugxmms/archive/arch_gzip.cpp /home/oscar/modplugxmms-2.041/modplugxmms/archive/arch_gzip.cpp
+--- modplugxmms/archive/arch_gzip.cpp	2003-04-27 14:30:48.000000000 +0300
++++ /home/oscar/modplugxmms-2.041/modplugxmms/archive/arch_gzip.cpp	2003-06-02 07:01:24.000000000 +0300
+@@ -88,7 +88,10 @@
+ 	FILE *f = popen(lCommand.c_str(),"r");
+ 	
+ 	if (f <= 0)
++	{
++	 	pclose(f);
+ 		return false;
++	}
+ 	
+ 	char line[300];
+ 	fgets(line, 80, f);   // ignore a line.
+diff -ru modplugxmms/archive/arch_rar.cpp /home/oscar/modplugxmms-2.041/modplugxmms/archive/arch_rar.cpp
+--- modplugxmms/archive/arch_rar.cpp	2003-04-27 14:30:48.000000000 +0300
++++ /home/oscar/modplugxmms-2.041/modplugxmms/archive/arch_rar.cpp	2003-06-02 06:48:34.000000000 +0300
+@@ -175,8 +175,11 @@
+ 		lName = lBuffer;
+ 		
+ 		if(IsOurFile(lName))
++		{
++		 	pclose(f);
+ 			return true;
++		}
+ 	}
+-	
++	pclose(f);
+ 	return false;
+ }
+diff -ru modplugxmms/archive/arch_zip.cpp /home/oscar/modplugxmms-2.041/modplugxmms/archive/arch_zip.cpp
+--- modplugxmms/archive/arch_zip.cpp	2003-04-27 14:30:48.000000000 +0300
++++ /home/oscar/modplugxmms-2.041/modplugxmms/archive/arch_zip.cpp	2003-06-02 07:04:05.000000000 +0300
+@@ -134,11 +134,16 @@
+ 		uint32 tempSize;
+ 		if (!processLine(line, &tempSize, lName)) 
+ 		{
++		 	pclose(f);
+ 			return false;
+ 		}
++		/* Did you forget an else here or something? */
++		/* Cause there is no real reason to use while if not */
++		pclose(f);
+ 		return true;
+ 		
+ 	}
+ 	
++	pclose(f);
+ 	return false;
+ }
diff --git a/media-plugins/modplugxmms/modplugxmms-2.04.ebuild b/media-plugins/modplugxmms/modplugxmms-2.04.ebuild
new file mode 100644
index 000000000000..9fe0b2e12150
--- /dev/null
+++ b/media-plugins/modplugxmms/modplugxmms-2.04.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/modplugxmms/modplugxmms-2.04.ebuild,v 1.1 2003/06/03 12:50:17 robh Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="XMMS plugin for MOD-like music files"
+SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=media-sound/xmms-1.2.5-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}.patch
+}
+
+src_compile() {
+	econf || die "could not configure"
+	emake LDFLAGS="$LDFLAGS -L${D}/usr/lib/" || die "emake failed"
+}
+
+src_install () {
+	einstall \
+		plugindir=${D}/usr/lib/xmms/Input || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+}
+
+pkg_postinst() {
+	einfo "Open XMMS, go to options->preferences->I/O plugins."
+	einfo "If \"MikMod Player\" is listed under \"Input Plugins\", click on"
+	einfo "it and UNcheck \"Enable Plugin\"."
+	einfo "(If you don't disable MikMod, it will play mods instead of ModPlug.)"
+}