add patch to work with newer GNU make from Jeremy Wilkins via bug #158705

Package-Manager: portage-2.1.1-r2

diff --git a/games-strategy/freecraft/ChangeLog b/games-strategy/freecraft/ChangeLog
index adb3089c9b10bf0034e152471abf996daf2d424d..6fb13503a0725d3885beb86ed246fc65d37e202a 100644 (file)
--- a/games-strategy/freecraft/ChangeLog
+++ b/games-strategy/freecraft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecraft
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.13 2006/10/04 22:40:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.14 2006/12/21 08:21:53 mr_bones_ Exp $
+
+  21 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/freecraft-1.18-Makefile.patch, freecraft-1.18-r3.ebuild:
+  add patch to work with newer GNU make from Jeremy Wilkins via bug #158705
 
   04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   freecraft-1.18-r3.ebuild:

diff --git a/games-strategy/freecraft/Manifest b/games-strategy/freecraft/Manifest
index 6fc63765704166dd58a69d906bf3f5c377ddb978..31e7e6f89c8748715a290e76e69e8658582f0d33 100644 (file)
--- a/games-strategy/freecraft/Manifest
+++ b/games-strategy/freecraft/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.18-setup.patch 1057 RMD160 90f5b5352fe6150ad944ac1ec601be81d605853c SHA1 cd2f754ff0d928c838b950418f8210654ffa5dc9 SHA256 524cc950b93c4c674e2d37f8a41bd7dfaf48f80c86bd339196350552c153c6fe
 MD5 c7be4012a9ba721244dec67d4abc2e53 files/1.18-setup.patch 1057
 RMD160 90f5b5352fe6150ad944ac1ec601be81d605853c files/1.18-setup.patch 1057
@@ -9,19 +6,23 @@ AUX freecraft 493 RMD160 af4d83c1f1a8bd436c73a2fb5905d6693d7cafd5 SHA1 22e539e97
 MD5 0e6f6ecc763f6ca1565717fa90296b45 files/freecraft 493
 RMD160 af4d83c1f1a8bd436c73a2fb5905d6693d7cafd5 files/freecraft 493
 SHA256 a34fe93b034bd82e5430a466c19bb3d32b7601cc9da4c2b09fcbdf0b0a8d181d files/freecraft 493
+AUX freecraft-1.18-Makefile.patch 470 RMD160 3ad637fc1b0e1d7bc535a30d087fdc7d6c6132e7 SHA1 ecd39f58175abc4801421fe0c35f530a32b7e3da SHA256 a8a80e5dddacbd3bab48257fad3c51a87660a57f8f4bd2187346f9827551fc63
+MD5 0bfb78784434b883206d4e852f18e69f files/freecraft-1.18-Makefile.patch 470
+RMD160 3ad637fc1b0e1d7bc535a30d087fdc7d6c6132e7 files/freecraft-1.18-Makefile.patch 470
+SHA256 a8a80e5dddacbd3bab48257fad3c51a87660a57f8f4bd2187346f9827551fc63 files/freecraft-1.18-Makefile.patch 470
 AUX freecraft-1.18-gcc41.patch 2816 RMD160 eac34a4203bc0682022fd795fbab3211f3fc6ddd SHA1 ceae0144b8509bb1b3d290d5f4ee807a8d5b7cf1 SHA256 5008fe57339babba5421ed8a454fc18b0f32c4d4e372287563cf4049dded717f
 MD5 a58042c2d290371950eba4fcd99ad0ec files/freecraft-1.18-gcc41.patch 2816
 RMD160 eac34a4203bc0682022fd795fbab3211f3fc6ddd files/freecraft-1.18-gcc41.patch 2816
 SHA256 5008fe57339babba5421ed8a454fc18b0f32c4d4e372287563cf4049dded717f files/freecraft-1.18-gcc41.patch 2816
 DIST freecraft-030311-src.tar.gz 1883435 RMD160 6f35070a8c9f953d1fffdc673219d8ab7ccaba6f SHA1 4104b720e717b89111b7e301fa1bcbd54ae8aefc SHA256 1728b6249a2618ccad0fbb4b2fa06c479eab5294017b397cbfd245ff9dbd0c19
-EBUILD freecraft-1.18-r3.ebuild 2685 RMD160 57ce17b0fef08a1772e92a01695158ed089d9064 SHA1 78448e2579bcde2a4f326ef54dda630c4cd8fbd2 SHA256 b9c32a65e93f350a440a7443b942559264db49144f9dcdab5244cb68a249f3f8
-MD5 0fc69ad63dbb7cf87a1a5039e26e9d86 freecraft-1.18-r3.ebuild 2685
-RMD160 57ce17b0fef08a1772e92a01695158ed089d9064 freecraft-1.18-r3.ebuild 2685
-SHA256 b9c32a65e93f350a440a7443b942559264db49144f9dcdab5244cb68a249f3f8 freecraft-1.18-r3.ebuild 2685
-MISC ChangeLog 2672 RMD160 b4158e6f63eaa40d8e1f80d3a47b094efb1532af SHA1 686cabfb1c108f0c4bc8241e70c9f5bbd33e9baa SHA256 245a8791c8968ec2a02136e94a9ae452807a8caf8a8c4639c3eb4a36fad9bf6d
-MD5 13f20fa5c53c7fe732a135fa1675a856 ChangeLog 2672
-RMD160 b4158e6f63eaa40d8e1f80d3a47b094efb1532af ChangeLog 2672
-SHA256 245a8791c8968ec2a02136e94a9ae452807a8caf8a8c4639c3eb4a36fad9bf6d ChangeLog 2672
+EBUILD freecraft-1.18-r3.ebuild 2724 RMD160 e9ac27925cea0cc8857ef0d91a7429d8436aa4a8 SHA1 770261ce4f2a24c8b8fa99c63e5bf2049e2b9612 SHA256 a57b3008d7099ae4e819c140368259dfebbdebf86439fa8404d4a59052beb5c8
+MD5 bc4e61ffe6b2a43214197a7f48ddbe86 freecraft-1.18-r3.ebuild 2724
+RMD160 e9ac27925cea0cc8857ef0d91a7429d8436aa4a8 freecraft-1.18-r3.ebuild 2724
+SHA256 a57b3008d7099ae4e819c140368259dfebbdebf86439fa8404d4a59052beb5c8 freecraft-1.18-r3.ebuild 2724
+MISC ChangeLog 2871 RMD160 072646bd866c4c5567395ae86b5a7d7716cd2a8a SHA1 257e7d9930b1f8e63559728305cd2502587db983 SHA256 25a1edf82dd7647ab935f65bb27f164ea32d792f416396c6dcf3ceaaf4e587e3
+MD5 2e7c4a3d6d91bd2f1e1a507563c831aa ChangeLog 2871
+RMD160 072646bd866c4c5567395ae86b5a7d7716cd2a8a ChangeLog 2871
+SHA256 25a1edf82dd7647ab935f65bb27f164ea32d792f416396c6dcf3ceaaf4e587e3 ChangeLog 2871
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,10 +30,3 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 654d2fd7b68e87cd7a861d31c68f54aa files/digest-freecraft-1.18-r3 265
 RMD160 6838485b92571f3ae97ba3c40c0fcc3e8b10470f files/digest-freecraft-1.18-r3 265
 SHA256 4637a2d97f43044b7385627c51288a2bd91f451f9c212c96441cf07da3be4275 files/digest-freecraft-1.18-r3 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFJDhxkT4lNIS36YERAoxYAJ9KxjRbKyiiG8QHJxj3udfzxtuYewCaA2/0
-okl1v+PZiCIC8VqtZku4v28=
-=Ymik
------END PGP SIGNATURE-----

diff --git a/games-strategy/freecraft/files/freecraft-1.18-Makefile.patch b/games-strategy/freecraft/files/freecraft-1.18-Makefile.patch
new file mode 100644 (file)
index 0000000..62b634c
--- /dev/null
+++ b/games-strategy/freecraft/files/freecraft-1.18-Makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig      2003-03-11 22:03:34.000000000 -0600
++++ Makefile   2006-12-21 00:00:54.000000000 -0600
+@@ -172,9 +172,9 @@
+ depend:
+       @echo -n >.depend
+       @echo
+-      @for i in $(SRC) ; do\
+-      echo -e "\rMaking dependencies for $$i";\
+-      echo -n `dirname $$i`/$(OBJDIR)/ >> .depend;\
++      @for i in $(SRC) ; do \
++      echo -e "\rMaking dependencies for $$i"; \
++      echo -n `dirname $$i`/$(OBJDIR)/ >> .depend; \
+       $(CC) -MM $(IFLAGS) $(DFLAGS) $(CFLAGS) $$i >>.depend ; done
+       @echo
+ 

diff --git a/games-strategy/freecraft/freecraft-1.18-r3.ebuild b/games-strategy/freecraft/freecraft-1.18-r3.ebuild
index 41cedfeb4ff38a24d22d3c9f4d090dddcf95eff1..fd2fd90802148719eb26a2a231a30dc57d0ec1ed 100644 (file)
--- a/games-strategy/freecraft/freecraft-1.18-r3.ebuild
+++ b/games-strategy/freecraft/freecraft-1.18-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/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.12 2006/10/04 22:40:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.13 2006/12/21 08:21:53 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -33,7 +33,8 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}/${PV}-setup.patch" \
-               "${FILESDIR}/${P}"-gcc41.patch
+               "${FILESDIR}/${P}"-gcc41.patch \
+               "${FILESDIR}/${P}"-Makefile.patch
        env GENTOO_CFLAGS="${CFLAGS}" ./setup || die
 }