add patch from FreeBSD

(Portage version: 2.0.51.22-r2)

4 files changed, 55 insertions, 7 deletions

diff --git a/net-misc/mmsclient/ChangeLog b/net-misc/mmsclient/ChangeLog
index 38013b5d6b93..d5a1747e9704 100644
--- a/net-misc/mmsclient/ChangeLog
+++ b/net-misc/mmsclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mmsclient
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/ChangeLog,v 1.10 2004/07/01 21:29:40 squinky86 Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/ChangeLog,v 1.11 2005/07/31 03:51:25 vanquirius Exp $
+
+  31 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/mmsclient-0.0.3-fbsd.patch, mmsclient-0.0.3-r1.ebuild:
+  Add patch from FreeBSD.
 
   01 Jul 2004; Jon Hood <squinky86@gentoo.org> mmsclient-0.0.3-r1.ebuild,
   mmsclient-0.0.3.ebuild:
diff --git a/net-misc/mmsclient/Manifest b/net-misc/mmsclient/Manifest
index 8ff78e42e62e..e8cce060787a 100644
--- a/net-misc/mmsclient/Manifest
+++ b/net-misc/mmsclient/Manifest
@@ -1,7 +1,9 @@
 MD5 b06fb9b3eb4e6d7720b8075926506440 mmsclient-0.0.3.ebuild 710
 MD5 a5d547b3c8678160588f068f2dc6ecdf ChangeLog 1155
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 cdee4b3a86d40bf1df071082a655c94e mmsclient-0.0.3-r1.ebuild 736
+MD5 7fce7bffecb2eee07d7dccc81e322cc8 mmsclient-0.0.3-r1.ebuild 758
 MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3 68
 MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3-r1 68
+MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3-r2 68
 MD5 1c904575316d5ddd46b55d8d400468b0 files/mmsclient-0.0.3-r1.patch 3784
+MD5 8b1f4c95b4b13abd91d2c7c4ba51ea23 files/mmsclient-0.0.3-fbsd.patch 1087
diff --git a/net-misc/mmsclient/files/mmsclient-0.0.3-fbsd.patch b/net-misc/mmsclient/files/mmsclient-0.0.3-fbsd.patch
new file mode 100644
index 000000000000..68904d616083
--- /dev/null
+++ b/net-misc/mmsclient/files/mmsclient-0.0.3-fbsd.patch
@@ -0,0 +1,41 @@
+--- client.c.orig	Sat Dec 29 09:40:48 2001
++++ client.c	Mon Mar  4 21:42:05 2002
+@@ -277,12 +277,12 @@
+       int packet_len, command;
+       char data[BUF_SIZE];
+ 
+-      if (!get_data (s, &packet_len, 4)) {
++      if (!get_data (s, (char *)&packet_len, 4)) {
+ 	printf ("packet_len read failed\n");
+ 	return 0;
+       }
+       
+-      packet_len = get_32 (&packet_len, 0) + 4;
++      packet_len = get_32 ((unsigned char *)&packet_len, 0) + 4;
+       
+       printf ("command packet detected, len=%d\n",
+ 	      packet_len);
+@@ -308,7 +308,7 @@
+ int interp_header (uint8_t *header, int header_len) {
+ 
+   int i;
+-  int packet_length;
++  int packet_length = 0;
+ 
+   /*
+    * parse header
+@@ -416,12 +416,12 @@
+ 
+     int packet_len, command;
+ 
+-    if (!get_data (s, &packet_len, 4)) {
++    if (!get_data (s, (char *)&packet_len, 4)) {
+       printf ("packet_len read failed\n");
+       return 0;
+     }
+ 
+-    packet_len = get_32 (&packet_len, 0) + 4;
++    packet_len = get_32 ((unsigned char *)&packet_len, 0) + 4;
+ 
+     printf ("command packet detected, len=%d\n",
+ 	    packet_len);
diff --git a/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild b/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
index ee30abda46f0..bdac13c4c5f6 100644
--- a/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
+++ b/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild,v 1.6 2004/07/01 21:29:40 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild,v 1.7 2005/07/31 03:51:25 vanquirius Exp $
 
 inherit eutils
 
@@ -22,10 +22,11 @@ DEPEND="virtual/libc"
 S=${WORKDIR}/mms_client-${PV}
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/${PF}.patch
+	epatch ${FILESDIR}/${P}-fbsd.patch
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
+	make DESTDIR=${D} install || die
 }