summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-03-11 10:55:16 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-03-11 10:55:16 +0000
commita6a13c14ba3a671c5c3d2cd292aee63c3c8e164a (patch)
tree868eef7304f397cbdaadf3a7c7b4b81771a4535a /sys-freebsd/freebsd-ubin/files
parentremove old (diff)
downloadgentoo-2-a6a13c14ba3a671c5c3d2cd292aee63c3c8e164a.tar.gz
gentoo-2-a6a13c14ba3a671c5c3d2cd292aee63c3c8e164a.tar.bz2
gentoo-2-a6a13c14ba3a671c5c3d2cd292aee63c3c8e164a.zip
remove old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-ubin/files')
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch35
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch60
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch131
3 files changed, 0 insertions, 226 deletions
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch
deleted file mode 100644
index 00d7a9e96b22..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: fbsd-6.1/usr.bin/window/wwgets.c
-===================================================================
---- fbsd-6.1.orig/usr.bin/window/wwgets.c
-+++ fbsd-6.1/usr.bin/window/wwgets.c
-@@ -43,6 +43,8 @@ static char rcsid[] =
- #include "ww.h"
- #include "char.h"
-
-+static void rub();
-+
- wwgets(buf, n, w)
- char *buf;
- int n;
-@@ -51,7 +53,6 @@ register struct ww *w;
- register char *p = buf;
- register int c;
- char uc = w->ww_unctrl;
-- static void rub();
-
- w->ww_unctrl = 0;
- for (;;) {
-Index: fbsd-6.1/usr.bin/xlint/xlint/xlint.c
-===================================================================
---- fbsd-6.1.orig/usr.bin/xlint/xlint/xlint.c
-+++ fbsd-6.1/usr.bin/xlint/xlint/xlint.c
-@@ -402,7 +402,8 @@ main(int argc, char *argv[])
- break;
-
- case 'p':
-- appcstrg(&lcflags, "-Wtraditional -Wno-system-headers");
-+ appcstrg(&lcflags, "-Wtraditional");
-+ appcstrg(&lcflags, "-Wno-system-headers");
- appcstrg(&l1flags, "-p");
- appcstrg(&l2flags, "-p");
- if (*deflibs != NULL) {
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
deleted file mode 100644
index 73256172fff0..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch
deleted file mode 100644
index fffd69ebbde4..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Index: fbsd-6.2/usr.bin/rpcgen/rpc_hout.c
-===================================================================
---- fbsd-6.2.orig/usr.bin/rpcgen/rpc_hout.c
-+++ fbsd-6.2/usr.bin/rpcgen/rpc_hout.c
-@@ -50,7 +50,7 @@ void storexdrfuncdecl( char *, int );
- static void pconstdef( definition * );
- static void pstructdef( definition * );
- static void puniondef( definition * );
--static void pprogramdef( definition *, int );
-+static void pprogramdef( definition *, int, int );
- static void pstructdef( definition * );
- static void penumdef( definition * );
- static void ptypedef( definition * );
-@@ -64,7 +64,7 @@ void pdeclaration( char *, declaration *
- * Print the C-version of an xdr definition
- */
- void
--print_datadef(definition *def, int headeronly)
-+print_datadef(definition *def, int headeronly, int nomain)
- {
-
- if (def->def_kind == DEF_PROGRAM) /* handle data only */
-@@ -87,7 +87,7 @@ print_datadef(definition *def, int heade
- ptypedef(def);
- break;
- case DEF_PROGRAM:
-- pprogramdef(def, headeronly);
-+ pprogramdef(def, headeronly, nomain);
- break;
- case DEF_CONST:
- pconstdef(def);
-@@ -103,12 +103,12 @@ print_datadef(definition *def, int heade
-
-
- void
--print_funcdef(definition *def, int headeronly)
-+print_funcdef(definition *def, int headeronly, int nomain)
- {
- switch (def->def_kind) {
- case DEF_PROGRAM:
- f_print(fout, "\n");
-- pprogramdef(def, headeronly);
-+ pprogramdef(def, headeronly, nomain);
- break;
- default:
- break;
-@@ -313,7 +313,7 @@ pdispatch(char * name, char *vers, int m
- }
-
- static void
--pprogramdef(definition *def, int headeronly)
-+pprogramdef(definition *def, int headeronly, int nomain)
- {
- version_list *vers;
- proc_list *proc;
-@@ -341,7 +341,7 @@ pprogramdef(definition *def, int headero
-
- if(!Cflag){
- ext = "extern ";
-- if (headeronly) {
-+ if (headeronly && nomain) {
- f_print(fout, "%s", ext);
- pdispatch(def->def_name, vers->vers_num, 2);
- }
-@@ -372,7 +372,7 @@ pprogramdef(definition *def, int headero
- ext = "extern ";
- }
-
-- if (headeronly) {
-+ if (headeronly && nomain) {
- f_print(fout, "%s", ext);
- pdispatch(def->def_name, vers->vers_num,
- i);
-Index: fbsd-6.2/usr.bin/rpcgen/rpc_main.c
-===================================================================
---- fbsd-6.2.orig/usr.bin/rpcgen/rpc_main.c
-+++ fbsd-6.2/usr.bin/rpcgen/rpc_main.c
-@@ -61,7 +61,7 @@ extern int write_sample_clnt( definition
- extern void write_sample_clnt_main( void );
- extern void add_sample_msg( void );
- static void c_output( char *, char *, int, char * );
--static void h_output( char *, char *, int, char *, int );
-+static void h_output( char *, char *, int, char *, int, int );
- static void l_output( char *, char *, int, char * );
- static void t_output( char *, char *, int, char * );
- static void clnt_output( char *, char *, int, char * );
-@@ -173,7 +173,7 @@ main(argc, argv)
- c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile);
- } else if (cmd.hflag) {
- h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile,
-- cmd.hflag);
-+ cmd.hflag, cmd.nflag);
- } else if (cmd.lflag) {
- l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile);
- } else if (cmd.sflag || cmd.mflag || (cmd.nflag)) {
-@@ -193,7 +193,7 @@ main(argc, argv)
- /* the rescans are required, since cpp may effect input */
- c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c");
- reinitialize();
-- h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h", cmd.hflag);
-+ h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h", cmd.hflag, cmd.nflag);
- reinitialize();
- l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c");
- reinitialize();
-@@ -515,7 +515,7 @@ char *generate_guard(pathname)
-
-
- static void
--h_output(char *infile, char *define, int extend, char *outfile, int headeronly)
-+h_output(char *infile, char *define, int extend, char *outfile, int headeronly, int nomain)
- {
- definition *def;
- char *outfilename;
-@@ -555,7 +555,7 @@ h_output(char *infile, char *define, int
-
- /* print data definitions */
- while ( (def = get_definition()) ) {
-- print_datadef(def, headeronly);
-+ print_datadef(def, headeronly, nomain);
- }
-
- /*
-@@ -564,7 +564,7 @@ h_output(char *infile, char *define, int
- * arguments for functions
- */
- for (l = defined; l != NULL; l = l->next) {
-- print_funcdef(l->val, headeronly);
-+ print_funcdef(l->val, headeronly, nomain);
- }
- /* Now print all xdr func declarations */
- if (xdrfunc_head != NULL){