Patch make so the sinclude directive works.

Package-Manager: portage-2.1.3.7

4 files changed, 79 insertions, 10 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index b185bcc87eeb..a8bd77c053a0 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.47 2007/09/03 14:49:36 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.48 2007/09/04 14:50:45 uberlord Exp $
+
+  04 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-ubin-6.2-make-sinclude.patch, freebsd-ubin-6.2.ebuild:
+  Patch make so the sinclude directive works.
 
   03 Sep 2007; Roy Marples <uberlord@gentoo.org> freebsd-ubin-6.2.ebuild:
   Move touch back to /usr/bin as baselayout no longer uses it.
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 1b89027377d8..91e041075030 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -14,6 +14,10 @@ AUX freebsd-ubin-6.1-gcc41.patch 1004 RMD160 1d3bfda88ff72196c2fb22c49c89821b9da
 MD5 bf060324f78d20a211acfddc0fcf0d73 files/freebsd-ubin-6.1-gcc41.patch 1004
 RMD160 1d3bfda88ff72196c2fb22c49c89821b9da487fb files/freebsd-ubin-6.1-gcc41.patch 1004
 SHA256 3bcdb76b2c5f4a370a24fdde0aa258a66d66a146f5124ff37b7e89b93b203422 files/freebsd-ubin-6.1-gcc41.patch 1004
+AUX freebsd-ubin-6.2-make-sinclude.patch 1696 RMD160 b91a8cb7cf82566476fd98e67a19907ac5cb0376 SHA1 961ac009a724957c1204c75c2b134c083c52f7f4 SHA256 bd3eec8d63a275f3f29dedef318766d79e0c83b750c64ce17628907ca74d27da
+MD5 45353cd40b8151d8756173d6597b2b72 files/freebsd-ubin-6.2-make-sinclude.patch 1696
+RMD160 b91a8cb7cf82566476fd98e67a19907ac5cb0376 files/freebsd-ubin-6.2-make-sinclude.patch 1696
+SHA256 bd3eec8d63a275f3f29dedef318766d79e0c83b750c64ce17628907ca74d27da files/freebsd-ubin-6.2-make-sinclude.patch 1696
 AUX freebsd-ubin-6.2-rpcgen-gcc4.1.patch 4451 RMD160 4b284ae72f58b7f057c2c501815fd9fb76e355b8 SHA1 69b9018f1558d7c2b4c027e533b6f7e063382778 SHA256 63455b81c40b015fe7b9a8f8ac8ca6c341a805b76315e9c538da7e4bd0bb9e7c
 MD5 79ab3c22bb9a7f4002dcc792d9f9cac5 files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch 4451
 RMD160 4b284ae72f58b7f057c2c501815fd9fb76e355b8 files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch 4451
@@ -53,14 +57,14 @@ DIST freebsd-include-6.2.tar.bz2 131651 RMD160 9264ba0661bbdceba85c4bef19a2ebd78
 DIST freebsd-lib-6.2.tar.bz2 2670374 RMD160 95bbce7862fc7a406b8629914f281d5e01e5ea71 SHA1 3cd061f83ef6672d98599dd3a294ead6832a1b14 SHA256 8e0c909a79a9ed18841f8a5a6e25fc770f76de1a5dc20cbd6bc591bed52d1033
 DIST freebsd-sys-6.2.tar.bz2 18344936 RMD160 784230e22ccaf09933ef3f053ff29cc3e579786a SHA1 161b7a4d165665deb1c4434c356b5f610a72a83a SHA256 a754371d88601aaab7152bb3d127bd3777db912e13a26a866e13ba34934c5e5b
 DIST freebsd-ubin-6.2.tar.bz2 1772844 RMD160 8101bc3e98fa485e31ecf0d5529136ddeb4be5b9 SHA1 34debd5e3142cbde5e603ce6c89e358d0039e68f SHA256 446c1a8c7031defda8b184ccf4535cacf651928f324db6ce0aaec3b87b04d9ae
-EBUILD freebsd-ubin-6.2.ebuild 3525 RMD160 92543c9a1b18da66bc9120eccb10d3b612fe6121 SHA1 16e82bdb9167f39cb6ca866f6c77e9dc4e9a4e86 SHA256 99be8bf1274737a34f92ca19612bad139a3d8065b1736f0786f76b4702c6ebab
-MD5 a3e7c21ef47b8e6e5991fef6d39fd61a freebsd-ubin-6.2.ebuild 3525
-RMD160 92543c9a1b18da66bc9120eccb10d3b612fe6121 freebsd-ubin-6.2.ebuild 3525
-SHA256 99be8bf1274737a34f92ca19612bad139a3d8065b1736f0786f76b4702c6ebab freebsd-ubin-6.2.ebuild 3525
-MISC ChangeLog 11753 RMD160 a2501d7606e878fba31e35bd56ed68c78e38e232 SHA1 0dbf3e513e978a87412e99d94b7ad1446be76976 SHA256 8677f3162b0c6ee6bfee9f48df717ee9b40db5e8b5d8ebf61b0d0a9994d042c2
-MD5 83d83fb385a749a10b1171cfab430438 ChangeLog 11753
-RMD160 a2501d7606e878fba31e35bd56ed68c78e38e232 ChangeLog 11753
-SHA256 8677f3162b0c6ee6bfee9f48df717ee9b40db5e8b5d8ebf61b0d0a9994d042c2 ChangeLog 11753
+EBUILD freebsd-ubin-6.2.ebuild 3568 RMD160 9f3eda98603060c739b88f316eccbb3de1da59d7 SHA1 d1e876007f8a12e7790d2916e54708ec7428eb00 SHA256 1a85e570a52a75b11b8457d43bcae0798d5f66e6107d91f813889835caad144f
+MD5 4e9280951719f56f762c99330268fabf freebsd-ubin-6.2.ebuild 3568
+RMD160 9f3eda98603060c739b88f316eccbb3de1da59d7 freebsd-ubin-6.2.ebuild 3568
+SHA256 1a85e570a52a75b11b8457d43bcae0798d5f66e6107d91f813889835caad144f freebsd-ubin-6.2.ebuild 3568
+MISC ChangeLog 11921 RMD160 e239a88e72a2aebe7637ac04072647c2bddd4216 SHA1 2b2207e8189a0671652e6abd99fb6a3c22d86ef6 SHA256 16e1154add4f02e305fb30087046a08ee3c850fa6703019507e0e8fd7cbe8188
+MD5 10ae690dd1999aeee606a33f20586392 ChangeLog 11921
+RMD160 e239a88e72a2aebe7637ac04072647c2bddd4216 ChangeLog 11921
+SHA256 16e1154add4f02e305fb30087046a08ee3c850fa6703019507e0e8fd7cbe8188 ChangeLog 11921
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch
new file mode 100644
index 000000000000..73256172fff0
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch
@@ -0,0 +1,60 @@
+--- usr.bin/make/parse.c.orig	2007-09-04 14:39:07 +0100
++++ usr.bin/make/parse.c	2007-09-04 14:51:00 +0100
+@@ -1602,8 +1602,8 @@
+  * ParseTraditionalInclude  --
+  *	Push to another file.
+  *
+- *	The input is the line minus the "include".  The file name is
+- *	the string following the "include".
++ *	The input is the current line. The file name(s) are
++ *	following the "include".
+  *
+  * Results:
+  *	None
+@@ -1614,10 +1614,12 @@
+  *---------------------------------------------------------------------
+  */
+ static void
+-ParseTraditionalInclude(char *file)
++ParseTraditionalInclude(char *line)
+ {
+ 	char	*fullname;	/* full pathname of file */
+ 	char	*cp;		/* current position in file spec */
++	int	silent = (line[0] != 'i') ? 1 : 0;
++	char	*file = &line[silent + 7];
+ 
+ 	/*
+ 	 * Skip over whitespace
+@@ -1665,7 +1667,9 @@
+ 	}
+ 
+ 	if (fullname == NULL) {
+-		Parse_Error(PARSE_FATAL, "Could not find %s", file);
++		if (!silent) {
++			Parse_Error(PARSE_FATAL, "Could not find %s", file);
++		}
+ 		/* XXXHB free(file) */
+ 		return;
+ 	}
+@@ -2416,14 +2420,16 @@
+ 				}
+ 			}
+ #ifdef SYSVINCLUDE
+-		} else if (strncmp(line, "include", 7) == 0 &&
+-		    isspace((unsigned char)line[7]) &&
+-		    strchr(line, ':') == NULL) {
++		} else if (((strncmp(line, "include", 7) == 0 &&
++				isspace((unsigned char) line[7])) ||
++					((line[0] == 's' || line[0] == '-') &&
++						strncmp(&line[1], "include", 7) == 0 &&
++						isspace((unsigned char) line[8]))) &&
++					strchr(line, ':') == NULL) {
+ 			/*
+ 			 * It's an S3/S5-style "include".
+ 			 */
+-			ParseTraditionalInclude(line + 7);
+-			goto nextLine;
++			ParseTraditionalInclude(line);
+ #endif
+ 		} else if (Parse_IsVar(line)) {
+ 			ParseFinishLine();
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2.ebuild
index a5b15ba8fb3e..1e2b66ebd628 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2.ebuild,v 1.4 2007/09/03 14:49:36 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2.ebuild,v 1.5 2007/09/04 14:50:45 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -55,6 +55,7 @@ PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
 	${FILESDIR}/${PN}-lint-stdarg.patch
 	${FILESDIR}/${PN}-6.0-kdump-ioctl.patch
 	${FILESDIR}/${PN}-6.1-gcc41.patch
+	${FILESDIR}/${PN}-6.2-make-sinclude.patch
 	${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch
 	${FILESDIR}/${PN}-6.2-sparc64.patch"