Add a patch to use $MAKE instead of make and add ~x86-fbsd keyword

(Portage version: 2.1.2_rc2-r4)

7 files changed, 98 insertions, 3 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index ecb001b367fc..56b7dfc1c8cb 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.23 2006/08/20 20:32:19 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.24 2006/12/08 23:34:28 drizzt Exp $
+
+  08 Dec 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/ming-0.2a-make.patch, ming-0.2a-r3.ebuild:
+  Add a patch to use $MAKE instead of make and add ~x86-fbsd keyword
 
   20 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> ming-0.3.0.ebuild:
   applying java patch needs to be conditional on java useflag (Bug #144548)
diff --git a/media-libs/ming/files/digest-ming-0.2a b/media-libs/ming/files/digest-ming-0.2a
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a
+++ b/media-libs/ming/files/digest-ming-0.2a
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/digest-ming-0.2a-r1 b/media-libs/ming/files/digest-ming-0.2a-r1
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a-r1
+++ b/media-libs/ming/files/digest-ming-0.2a-r1
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/digest-ming-0.2a-r2 b/media-libs/ming/files/digest-ming-0.2a-r2
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a-r2
+++ b/media-libs/ming/files/digest-ming-0.2a-r2
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/digest-ming-0.2a-r3 b/media-libs/ming/files/digest-ming-0.2a-r3
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a-r3
+++ b/media-libs/ming/files/digest-ming-0.2a-r3
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/ming-0.2a-make.patch b/media-libs/ming/files/ming-0.2a-make.patch
new file mode 100644
index 000000000000..67d644f1d9e1
--- /dev/null
+++ b/media-libs/ming/files/ming-0.2a-make.patch
@@ -0,0 +1,82 @@
+diff -ur ming-0.2a.orig/Makefile ming-0.2a/Makefile
+--- ming-0.2a.orig/Makefile	2006-12-09 00:15:45 +0100
++++ ming-0.2a/Makefile	2006-12-09 00:18:27 +0100
+@@ -25,16 +25,16 @@
+ 	install libming.a ${LIBDIR}/libming.a
+ 
+ dynamic:
+-	cd src && make dynamic
++	cd src && ${MAKE} dynamic
+ 
+ static:
+-	cd src && make static
++	cd src && ${MAKE} static
+ 
+ clean:
+-	cd src && make clean
+-	cd util && make clean
+-	cd py_ext && make clean
+-	cd php_ext && make clean
++	cd src && ${MAKE} clean
++	cd util && ${MAKE} clean
++	cd py_ext && ${MAKE} clean
++	cd php_ext && ${MAKE} clean
+ 	rm -f test.o test test.exe *.core
+ 	rm -f libming.a libming.so
+ 
+diff -ur ming-0.2a.orig/php_ext/Makefile ming-0.2a/php_ext/Makefile
+--- ming-0.2a.orig/php_ext/Makefile	2006-12-09 00:15:44 +0100
++++ ming-0.2a/php_ext/Makefile	2006-12-09 00:18:30 +0100
+@@ -13,7 +13,7 @@
+ 	${CC} ${DEFINES} -c ming.c -I. -I.. `php-config --includes`
+ 
+ ../libming.a:
+-	cd ..; make static
++	cd ..; ${MAKE} static
+ 
+ clean:
+ 	rm -f php_ming.so
+diff -ur ming-0.2a.orig/py_ext/Makefile ming-0.2a/py_ext/Makefile
+--- ming-0.2a.orig/py_ext/Makefile	2006-12-09 00:15:44 +0100
++++ ming-0.2a/py_ext/Makefile	2006-12-09 00:18:30 +0100
+@@ -18,7 +18,7 @@
+ 	gcc -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c
+ 
+ ../libming.a:
+-	cd ..; make static
++	cd ..; ${MAKE} static
+ 
+ swig:
+ 	swig -I.. -python ming.i
+diff -ur ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile
+--- ming-0.2a.orig/src/Makefile	2006-12-09 00:15:44 +0100
++++ ming-0.2a/src/Makefile	2006-12-09 00:18:30 +0100
+@@ -19,22 +19,22 @@
+ all: dynamic
+ 
+ dynamic: ${OFILES}
+-	cd blocks && make
+-	cd actioncompiler && make
++	cd blocks && ${MAKE}
++	cd actioncompiler && ${MAKE}
+ 	${CC} ${CFLAGS} ${LDFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
+ 	  -o libming.so
+ 	cp libming.so ..
+ 
+ static: ${OFILES}
+-	cd blocks && make
+-	cd actioncompiler && make
++	cd blocks && ${MAKE}
++	cd actioncompiler && ${MAKE}
+ 	ar r libming.a blocks/*.o ${OFILES} ${COMPILEROFILES}
+ 	ranlib libming.a  # bsd requires this?
+ 	cp libming.a ..
+ 
+ clean:
+-	cd blocks && make clean
+-	cd actioncompiler && make clean
++	cd blocks && ${MAKE} clean
++	cd actioncompiler && ${MAKE} clean
+ 	rm -f *.o libming.a libming.so test test.exe core *.core
+ 
+ # breaks on bsd:
diff --git a/media-libs/ming/ming-0.2a-r3.ebuild b/media-libs/ming/ming-0.2a-r3.ebuild
index 19c77d94e81d..a528a7540cdb 100644
--- a/media-libs/ming/ming-0.2a-r3.ebuild
+++ b/media-libs/ming/ming-0.2a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a-r3.ebuild,v 1.1 2006/06/11 12:19:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a-r3.ebuild,v 1.2 2006/12/08 23:34:28 drizzt Exp $
 
 inherit eutils toolchain-funcs flag-o-matic python
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.opaque.net/ming/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="python"
 
 RDEPEND="python? ( virtual/python )
@@ -24,6 +24,7 @@ src_unpack() {
 	EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${P}-gentoo.diff
 	sed -e 's,gcc -g -Wall,$(CC) $(CFLAGS),g' -i ${S}/py_ext/Makefile
 	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-linking.patch
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-make.patch
 }
 
 src_compile() {