Add patch to let rpcgen generate GCC 4.1-compatible code.

Package-Manager: portage-2.1.1

4 files changed, 47 insertions, 14 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 732c6b3a31e1..230163b88088 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.18 2006/09/12 22:37:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.19 2006/09/13 04:19:09 flameeyes Exp $
+
+  13 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-ubin-6.1-rpcgen-gcc41.patch, freebsd-ubin-6.1.ebuild:
+  Add patch to let rpcgen generate GCC 4.1-compatible code.
 
   12 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-ubin-6.1.ebuild:
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index a2c1e6d2c89a..0a82220f7447 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -21,6 +21,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.1-rpcgen-gcc41.patch 821 RMD160 e9f24023d500ae0347a73667e3246b36e2d180d5 SHA1 9512af45421330e2e436206cb220034759fe54e8 SHA256 3265ed49d4e9253068ee429134dc0276cf63a5787b79dbd7250acf77a344c224
+MD5 391fdbf643a8ec924a13cffa010eb628 files/freebsd-ubin-6.1-rpcgen-gcc41.patch 821
+RMD160 e9f24023d500ae0347a73667e3246b36e2d180d5 files/freebsd-ubin-6.1-rpcgen-gcc41.patch 821
+SHA256 3265ed49d4e9253068ee429134dc0276cf63a5787b79dbd7250acf77a344c224 files/freebsd-ubin-6.1-rpcgen-gcc41.patch 821
 AUX freebsd-ubin-lint-stdarg.patch 792 RMD160 673ce804ebd887121160da5d1993787334099903 SHA1 948ade4052f3ec1865ee782116495a508bf70183 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6
 MD5 8e69a5c73317c371c037446c8b5c6fba files/freebsd-ubin-lint-stdarg.patch 792
 RMD160 673ce804ebd887121160da5d1993787334099903 files/freebsd-ubin-lint-stdarg.patch 792
@@ -51,14 +55,14 @@ DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa
 DIST freebsd-include-6.1.tar.bz2 127179 RMD160 f873b13bb16408a390932d14974b39336bd90a7c SHA1 747d7498ce80846274e49ed4487440dcbefe96af SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5
 DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37
 DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6
-EBUILD freebsd-ubin-6.1.ebuild 2802 RMD160 1d2f4f6e282c2bc8551b666affbce757e38db379 SHA1 841382f6b506cbe2677a9e3cd4152aa2fb7db66d SHA256 55640190c2cb235f8fb5a41a1bfc5961b99dee9c62dd56f8bf435f02f3b22bce
-MD5 c3c5a560cc8d9e51b11891b5cbadb649 freebsd-ubin-6.1.ebuild 2802
-RMD160 1d2f4f6e282c2bc8551b666affbce757e38db379 freebsd-ubin-6.1.ebuild 2802
-SHA256 55640190c2cb235f8fb5a41a1bfc5961b99dee9c62dd56f8bf435f02f3b22bce freebsd-ubin-6.1.ebuild 2802
-MISC ChangeLog 7117 RMD160 d34ee63692894a4abf7df8b5afdf866b6dd63e2c SHA1 d13019303e524f59eae12b3be1dd45d0c7b3db3c SHA256 f7b23cbbab8e3bc233d5ac6449cee7cbd862850ed2b97faa6f4f5552174470b5
-MD5 c7d05986733372c8fc9797279259b356 ChangeLog 7117
-RMD160 d34ee63692894a4abf7df8b5afdf866b6dd63e2c ChangeLog 7117
-SHA256 f7b23cbbab8e3bc233d5ac6449cee7cbd862850ed2b97faa6f4f5552174470b5 ChangeLog 7117
+EBUILD freebsd-ubin-6.1.ebuild 2839 RMD160 93fc23e8d7ee338db49645481e0b61628af40978 SHA1 dafd3c4ae0adb5987ff8749ccd2f98ff5eaa12c0 SHA256 1a52112476210ffc129dacee184da6ee4e148d9d3c1876b4435408081a1ddb60
+MD5 be9f810954cae2d8bb32213289981e66 freebsd-ubin-6.1.ebuild 2839
+RMD160 93fc23e8d7ee338db49645481e0b61628af40978 freebsd-ubin-6.1.ebuild 2839
+SHA256 1a52112476210ffc129dacee184da6ee4e148d9d3c1876b4435408081a1ddb60 freebsd-ubin-6.1.ebuild 2839
+MISC ChangeLog 7302 RMD160 b4dc231e842809df8839fcab7d4a00af6647a66e SHA1 fe877660c7d82b86f91e4be97e80d53d29e75f34 SHA256 8eca07610d3645b3e57f92a520a86ee4f0fa5d73d0f8c9dddefaedf6f84d0eb4
+MD5 b07ce2d8383d913c6bd50e9001609858 ChangeLog 7302
+RMD160 b4dc231e842809df8839fcab7d4a00af6647a66e ChangeLog 7302
+SHA256 8eca07610d3645b3e57f92a520a86ee4f0fa5d73d0f8c9dddefaedf6f84d0eb4 ChangeLog 7302
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -69,7 +73,7 @@ SHA256 cfdac09bb63d09d942690cf6956d5d9f805de04a60457dc1a672903ecc217bbd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBza2AiZjviIA2XgRArS8AKDwmGeUDvOcZOTOOruHZuEkdSGLqwCdEzNO
-jla4qVxBoslGEdVmNzJO5Uc=
-=457O
+iD8DBQFFB4bTAiZjviIA2XgRAoAIAKCytiigXwc5EUT0VxhBzEF1ypHGowCg08N+
+ROeg3pTWs+3Y0zEygRjL1qg=
+=OkVa
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-rpcgen-gcc41.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-rpcgen-gcc41.patch
new file mode 100644
index 000000000000..523f7041c0d5
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-rpcgen-gcc41.patch
@@ -0,0 +1,24 @@
+Index: fbsd-6.1/usr.bin/rpcgen/rpc_hout.c
+===================================================================
+--- fbsd-6.1.orig/usr.bin/rpcgen/rpc_hout.c
++++ fbsd-6.1/usr.bin/rpcgen/rpc_hout.c
+@@ -344,8 +344,7 @@ pprogramdef(def)
+ 
+ 		if(!Cflag){
+ 			ext = "extern  ";
+-			f_print(fout, "%s", ext);
+-			pdispatch(def->def_name, vers->vers_num, 2);
++			/* pdispatch(def->def_name, vers->vers_num, 2); */
+ 			for (proc = vers->procs; proc != NULL;
+ 			     proc = proc->next) {
+ 				if (!define_printed(proc,
+@@ -373,8 +372,7 @@ pprogramdef(def)
+ 					ext = "extern  ";
+ 				}
+ 
+-				f_print(fout, "%s", ext);
+-				pdispatch(def->def_name, vers->vers_num, i);
++				/* pdispatch(def->def_name, vers->vers_num, i); */
+ 				for (proc = vers->procs; proc != NULL;
+ 				     proc = proc->next) {
+ 					if (!define_printed(proc,
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
index e0a642ff1285..8000866c5885 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.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/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild,v 1.6 2006/09/12 22:37:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild,v 1.7 2006/09/13 04:19:09 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -52,7 +52,8 @@ PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
 	${FILESDIR}/${PN}-setXid.patch
 	${FILESDIR}/${PN}-lint-stdarg.patch
 	${FILESDIR}/${PN}-6.0-kdump-ioctl.patch
-	${FILESDIR}/${P}-gcc41.patch"
+	${FILESDIR}/${P}-gcc41.patch
+	${FILESDIR}/${P}-rpcgen-gcc41.patch"
 
 # Here we remove some sources we don't need because they are already
 # provided by portage's packages or similar. In order: