fix build on fbsd and keyword it x86-fbsd, bug #210965

(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)

3 files changed, 65 insertions, 3 deletions

diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog
index 3a8647f8316a..987f582d6fbc 100644
--- a/media-libs/libafterimage/ChangeLog
+++ b/media-libs/libafterimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libafterimage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.17 2008/07/04 10:02:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.18 2008/12/13 13:57:00 aballier Exp $
+
+  13 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/libafterimage-1.18-recmake_bsd.patch, libafterimage-1.18.ebuild:
+  fix build on fbsd and keyword it x86-fbsd, bug #210965
 
 *libafterimage-1.18 (04 Jul 2008)
 
diff --git a/media-libs/libafterimage/files/libafterimage-1.18-recmake_bsd.patch b/media-libs/libafterimage/files/libafterimage-1.18-recmake_bsd.patch
new file mode 100644
index 000000000000..7cffea2e7707
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-1.18-recmake_bsd.patch
@@ -0,0 +1,56 @@
+--- libAfterImage-1.18/Makefile.in.old	2008-12-13 13:31:30 +0000
++++ libAfterImage-1.18/Makefile.in	2008-12-13 13:32:06 +0000
+@@ -206,7 +206,7 @@
+ 		)
+ 
+ install.apps: install.lib
+-		@(if test -d apps; then cd apps; make install || exit 1; fi)
++		@(if test -d apps; then cd apps; $(MAKE) install || exit 1; fi)
+ 
+ # uninstallation targets : 
+ #
+@@ -250,7 +250,7 @@
+ 		done
+ 
+ uninstall.apps:
+-		@(if test -d apps; then cd apps; make uninstall || exit 1; fi)
++		@(if test -d apps; then cd apps; $(MAKE) uninstall || exit 1; fi)
+ 
+ uninstall.lib:		@LIBUNINSTALL@ uninstall.inc uninstall.apps
+ 
+@@ -261,11 +261,11 @@
+ clean:
+ 		$(RMF) $(LIB_SHARED) $(LIB_SHARED_CYG) $(LIB_SHARED_CYG_AR) $(LIB_STATIC) *.so.* *.so *.o *~ *% *.bak \#* core ; \
+ 		for I in ${subdirs}; do $(RMF) $$I/*.o $$I/*.obj $$I/*.bak; done
+-		@(if test -d apps; then cd apps; make clean || exit 1; fi)
++		@(if test -d apps; then cd apps; $(MAKE) clean || exit 1; fi)
+ 
+ distclean: clean
+ 		$(RMF) $(LIB_SHARED) $(LIB_SHARED_CYG) $(LIB_SHARED_CYG_AR) $(LIB_STATIC)  *.o *.so.* *~ *% *.bak \#* *.orig core Makefile 
+-		@(if test -d apps; then cd apps; make distclean || exit 1; fi)
++		@(if test -d apps; then cd apps; $(MAKE) distclean || exit 1; fi)
+ 
+ indent:
+ 		@SRCS=`echo "$(AFTERIMAGE_OBJS) " | sed "s/.o /.c /g"`; \
+@@ -276,7 +276,7 @@
+ 		    mv /tmp/$$i $$i; \
+ 		  fi; \
+ 		done ; \
+-		(if test -d apps; then cd apps; make indent || exit 1; fi )
++		(if test -d apps; then cd apps; $(MAKE) indent || exit 1; fi )
+ 
+ deps:
+ 		@echo -n > .depend ; \
+@@ -310,10 +310,10 @@
+ 		  echo -n '		$$('$(LIB_NAME)_PATH')'/$$f >> .shared ; \
+ 		done; \
+ 		echo "" >> .shared ; \
+-		(if test -d apps; then cd apps; make deps || exit 1; fi)
++		(if test -d apps; then cd apps; $(MAKE) deps || exit 1; fi)
+ 
+ apps: 	@APPSDEPS@
+-		@(if test -d apps; then cd apps; make; fi )
++		@(if test -d apps; then cd apps; $(MAKE); fi )
+ 
+ 
+ $(LIB_STATIC):	$(LIB_OBJS) $(LIB_INCS) config.h
diff --git a/media-libs/libafterimage/libafterimage-1.18.ebuild b/media-libs/libafterimage/libafterimage-1.18.ebuild
index 0df60124e27e..2931d9cdba81 100644
--- a/media-libs/libafterimage/libafterimage-1.18.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.18.ebuild,v 1.1 2008/07/04 10:02:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.18.ebuild,v 1.2 2008/12/13 13:57:00 aballier Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gif jpeg mmx nls png tiff examples"
 
 RDEPEND="media-libs/freetype
@@ -36,6 +36,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-makefile.in.patch
 	# fix lib paths in afterimage-config
 	epatch "${FILESDIR}"/${PN}-config.patch
+	# Fix recursive make calls, bug #210965
+	epatch "${FILESDIR}"/${P}-recmake_bsd.patch
 	# remove forced flags
 	sed -i \
 		-e 's/CFLAGS="-O3"//' \