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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 71 insertions, 8 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/Manifest b/media-libs/libafterimage/Manifest
index 25aeb9965184..a4eab941d31c 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX libafterimage-1.15-examples.patch 765 RMD160 d72f8bce79346c8d0789332076e6e6e537b0884b SHA1 ad5628080698d8fa66a4fb173c67062c6c16cd8c SHA256 dc72323e502c02db820ed0e5d53aaf5604d140414343d8d69683b39db66fa64d
+AUX libafterimage-1.18-recmake_bsd.patch 1934 RMD160 cdd484974683aaea096c893d842b3693362e4a39 SHA1 030a4173e798e764dfbca64a60f2640af489236e SHA256 3628b28d09a119133b1235215454a8e7f664bdf9969445c267fa8648497e75a3
 AUX libafterimage-config.patch 369 RMD160 e209d20413373694cd4b4cf16cc1927fbb8437f6 SHA1 030143afcdece5802511b51899c221d48e421ebf SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6
 AUX libafterimage-examples.patch 15911 RMD160 8c616ede78d2bea70587ba1790da7e158196f684 SHA1 04b27bcb2dd782fe0a20b9963f3992dbb9bd1ea6 SHA256 d3f9256627f33c2174f5dfc7ff57adfc1c03b1985bb90242fcefd9dbebbaecff
 AUX libafterimage-makefile.in.patch 2168 RMD160 4b6340f3845774de82fb612de0e94f0841ae869a SHA1 f707ad8a850eafacdac780a727f936b8cf8673de SHA256 44b2f80b7e5f9bef3852d179e247592f3d5a0983de105082d1b5d1667eb4ced8
@@ -10,13 +11,13 @@ DIST libAfterImage-1.15.tar.bz2 1091821 RMD160 8111c5f809e5806face37677ffc65cf4e
 DIST libAfterImage-1.18.tar.bz2 1050328 RMD160 dcf921660e15bb31908c90fcfe00b58d58754fc3 SHA1 d177c63067f5d0053e02f92879fe59764e421f25 SHA256 f1562240f1dd3a180e07436ee28a993a707654a339d997ad0512692d3fc32312
 EBUILD libafterimage-1.07.ebuild 1869 RMD160 424f8fc147122e73d66d247ded59b5b5437af5ac SHA1 67cb5a2e0b72ecbb0a181da4d8de0ad0f2a26868 SHA256 3812a8eeae69055419bfebaaa14d91b7f2df9404982aeaa5db4f1be551815646
 EBUILD libafterimage-1.15.ebuild 1949 RMD160 9897dd4811f63bcbef314ea27f5835d22f71454b SHA1 df6fa346843d56be41e8fbdc585a08be35c5f8f2 SHA256 a5600cd2d119194504bd580c3d8ee2cf62502a888e8ecddbc4bae887e9f54000
-EBUILD libafterimage-1.18.ebuild 1874 RMD160 93e626deef28671eb103ba18ad1ad4f68d13776c SHA1 524b4e73145c2c317a24f9f12ad71b820512e5e0 SHA256 37b57e3ae1113242fb8848c36e208df6f0bbac69bdc5a757b3e2aca6b64db09c
-MISC ChangeLog 2411 RMD160 36c1f29cfa7c3484be14f8402b6505749dc5a84e SHA1 9825654516b8674cb31283762ab0adea7875bc38 SHA256 ecb4bb1e6de6d377f3440c1463bc0432abbffbef6e7b8178c2d6b4a455507dea
+EBUILD libafterimage-1.18.ebuild 1970 RMD160 c9987749cf947b14980669617bafa22f48d2439d SHA1 c7ff46580b8e234373deb87bff2003b74ddd21a4 SHA256 73f493b9a79c0b77bd4b50a151fe1caafbd99f546d9c059a244141b645bbc270
+MISC ChangeLog 2595 RMD160 c4fd7a2a153c47f19a93383bbc076af0555778ce SHA1 8f929e52dee7578535af06cb55bbfb472770b3ea SHA256 73d38c3d7ce20e38bd27ff48df8986d70828cbf7502933b9bbef914b3c86e83d
 MISC metadata.xml 895 RMD160 3a9671c21f649729ea596def4c2ecd7c313bf5b3 SHA1 434cfd341defa95b295978f8de809be03a762443 SHA256 95d257cc2a6f6846269d1c64750669c837712f2d341c886581a8a89422e591cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkht9SgACgkQ1ycZbhPLE2AwNgCfUS553WVbSCreekJQoKr0/TCQ
-vssAoIqoBMLjStOBfYR11VziJ/xvHnMA
-=ed3Z
+iEYEARECAAYFAklDvzMACgkQvFcC4BYPU0pyvQCgtPNQnu40jORPrsfxKyJ2FLmC
+4TgAn2O8527v+/gIKxuK4CHskFyvM09+
+=CMYb
 -----END PGP SIGNATURE-----
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"//' \