Restore still needed bsd fix and add a new one due to recent changes, submitted upstream

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 22 insertions, 2 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 10ece59865b1..11f48521e3dd 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.55 2009/08/21 08:39:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.56 2009/09/20 14:47:33 aballier Exp $
+
+  20 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  freeglut-2.6.0_rc1.ebuild, +files/freeglut-2.6.0_rc1-bsd_joystick.patch:
+  Restore still needed bsd fix and add a new one due to recent changes,
+  submitted upstream
 
 *freeglut-2.6.0_rc1 (21 Aug 2009)
 
diff --git a/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch b/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch
new file mode 100644
index 000000000000..cde788850aeb
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/tracker/?func=detail&aid=2862668&group_id=1032&atid=101032
+
+--- freeglut-2.6.0/src/freeglut_joystick.c.old	2009-09-20 16:28:07 +0200
++++ freeglut-2.6.0/src/freeglut_joystick.c	2009-09-20 16:28:18 +0200
+@@ -1325,7 +1325,7 @@
+         if( joy->error )
+             return;
+ 
+-        snprintf( joyfname, sizeof(buffer), "%s/.joy%drc", getenv( "HOME" ), joy->id );
++        snprintf( joyfname, sizeof(joyfname), "%s/.joy%drc", getenv( "HOME" ), joy->id );
+ 
+         joyfile = fopen( joyfname, "r" );
+         joy->error =( joyfile == NULL );
diff --git a/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild b/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
index a7d49ff5f8df..42ab66cb05f6 100644
--- a/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
+++ b/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild,v 1.2 2009/08/21 08:41:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild,v 1.3 2009/09/20 14:47:32 aballier Exp $
 
 EAPI="2"
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P/_*/}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-bsd_joystick.patch"
+	epatch "${FILESDIR}/${PN}-2.4.0-bsd-usb-joystick.patch"
 	# Needed for sane .so versionning on bsd, please don't drop
 	elibtoolize
 }