[Midnightbsd-cvs] mports: motor/files: Add patch for gcc4 and strndup fixes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add patch for gcc4 and strndup fixes.

Still not faking right.

Added Files:
-----------
    mports/devel/motor/files:
        patch-gcc4 (r1.1)
        patch-parser::include::strfn.h (r1.1)
        patch-parser::src::strfn.c (r1.1)

-------------- next part --------------
--- /dev/null
+++ devel/motor/files/patch-parser::include::strfn.h
@@ -0,0 +1,23 @@
+--- parser/include/strfn.h.orig	Wed Aug 22 04:32:11 2007
++++ parser/include/strfn.h	Wed Aug 22 04:32:24 2007
+@@ -37,20 +37,6 @@
+ /*****************************************************************************/
+ 
+ /*
+-* strndup - Duplicate string with maximum length specified.
+-*
+-* WARNING: This function can process memory allocation.
+-* 
+-* Parameters:
+-*	char *src - source string
+-*	int size - new string maximum size
+-*
+-* Return value:
+-* 	char * - new string
+-*/
+-char *strndup(const char *src, int size);
+-
+-/*
+ * strappend - Append source string to destination.
+ *
+ * WARNING: This function can process memory allocation.
--- /dev/null
+++ devel/motor/files/patch-parser::src::strfn.c
@@ -0,0 +1,22 @@
+--- parser/src/strfn.c.orig	Wed Aug 22 04:31:48 2007
++++ parser/src/strfn.c	Wed Aug 22 04:31:59 2007
+@@ -44,19 +44,6 @@
+     return z;
+ }
+ 
+-/* string function */
+-char *strndup(const char *src, int size) {
+-    int s;
+-    char *r;
+-
+-    if ((s = strlen(src)) > size) s = size;
+-    
+-    r = calloc(1, s + 1);
+-    memcpy(r, src, s);
+-    
+-    return r;
+-}
+-
+ char *strappend(char *dst, const char *src) {
+     int dlen;
+     
--- /dev/null
+++ devel/motor/files/patch-gcc4
@@ -0,0 +1,116 @@
+diff -urN ../tmp-orig/motor-3.4.0/kkconsui/src/texteditor.cc ./kkconsui/src/texteditor.cc
+--- ../tmp-orig/motor-3.4.0/kkconsui/src/texteditor.cc	2003-09-09 23:51:33.000000000 +0200
++++ ./kkconsui/src/texteditor.cc	2005-04-08 20:30:03.690067218 +0200
+@@ -1940,7 +1940,7 @@
+ }
+ 
+ int texteditor::findint(void *p1, void *p2) {
+-    return *(int *) p1 != (int) p2;
++    return *(int *) p1 != (long) p2;
+ }
+ 
+ int texteditor::findhighline(void *p1, void *p2) {
+diff -urN ../tmp-orig/motor-3.4.0/kkstrtext/kkstrtext.cc ./kkstrtext/kkstrtext.cc
+--- ../tmp-orig/motor-3.4.0/kkstrtext/kkstrtext.cc	2005-02-01 01:13:24.000000000 +0100
++++ ./kkstrtext/kkstrtext.cc	2005-04-08 20:30:03.691067026 +0200
+@@ -431,7 +431,7 @@
+ }
+ 
+ int intcompare(void *s1, void *s2) {
+-    return (int) s1 != (int) s2;
++    return s1 != s2;
+ }
+ 
+ string i2str(int i) {
+diff -urN ../tmp-orig/motor-3.4.0/src/ui/ncurses/ncursesui.cc ./src/ui/ncurses/ncursesui.cc
+--- ../tmp-orig/motor-3.4.0/src/ui/ncurses/ncursesui.cc	2004-11-14 22:04:08.000000000 +0100
++++ ./src/ui/ncurses/ncursesui.cc	2005-04-08 20:30:03.691067026 +0200
+@@ -1242,7 +1242,7 @@
+ 	populatesettingstree(*db.gettree());
+         if(fin = !db.open(n, b, &p)) break;
+ 
+-        switch((int) p) {
++        switch((long) p) {
+             case 10:
+ 		if(input(motorui::text, buf = project.getversion(),
+ 		_("version: ")) == motorui::yes) {
+@@ -1356,7 +1356,8 @@
+ vector<shitpair> treeshit;
+ 
+ void ncursesui::populatecontentstree(treeview &tree, motorproject &mp, projeditaction pea, bool setcurrent) {
+-    int foldid, id, cfid = -1, i, sid;
++    int foldid, id, cfid = -1, i;
++    long sid;
+     vector<motorfolder>::iterator ifold;
+     vector<motorfile>::iterator ifile;
+     static vector<string> cnodes;
+@@ -1368,7 +1369,7 @@
+ 	    id = tree.getid(i);
+ 
+ 	    if(tree.isnode(id))
+-		if(sid = (int) tree.getref(id))
++		if(sid = (long) tree.getref(id))
+ 		    if(!tree.isnodeopen(id))
+ 			cnodes.push_back(treeshit[sid-1].second->gettagname());
+ 	}
+diff -urN ../tmp-orig/motor-3.4.0/src/ui/ncurses/uitagbrowser.cc ./src/ui/ncurses/uitagbrowser.cc
+--- ../tmp-orig/motor-3.4.0/src/ui/ncurses/uitagbrowser.cc	2004-07-23 02:18:16.000000000 +0200
++++ ./src/ui/ncurses/uitagbrowser.cc	2005-04-08 20:30:03.692066835 +0200
+@@ -95,7 +95,7 @@
+     cm.close();
+ 
+     if(n) {
+-	int c = (int) cm.getref(n-1);
++	long c = (long) cm.getref(n-1);
+ 
+ 	if(c != tagbrowser.getscope()) {
+ 	    tagbrowser.setscope((motortagbrowser::viewscope) c);
+@@ -142,7 +142,7 @@
+ 	switch(cm.open()) {
+ 	    case -2:
+ 		iter = false;
+-		c = (char) (int) cm.getref(cm.getpos());
++		c = (char) (long) cm.getref(cm.getpos());
+ 
+ 		while((pos = nfilter.find(c)) != -1) {
+ 		    nfilter.erase(pos, 1);
+@@ -213,7 +213,7 @@
+ }
+ 
+ void uitagbrowser::exec() {
+-    int n, k;
++    long n, k;
+     bool r;
+ 
+     if(search.empty())
+@@ -240,7 +240,7 @@
+     m.setpos(mpos);
+ 
+     if(r = (n = m.open())) {
+-        k = (int) m.getref(n-1);
++        k = (long) m.getref(n-1);
+         mpos = n-1;
+     }
+ 
+diff -urN ../tmp-orig/motor-3.4.0/src/ui/ncurses/uivcs.cc ./src/ui/ncurses/uivcs.cc
+--- ../tmp-orig/motor-3.4.0/src/ui/ncurses/uivcs.cc	2005-02-12 15:58:28.000000000 +0100
++++ ./src/ui/ncurses/uivcs.cc	2005-04-08 20:30:03.692066835 +0200
+@@ -31,7 +31,8 @@
+ void uivcs::check() {
+     bool found;
+     dialogbox db;
+-    int n, b, i, nodes[motorvcs::remotely_modified+1];
++    int n, b, nodes[motorvcs::remotely_modified+1];
++    long i;
+     string comment, buf;
+ 
+     if(!enabled()) return;
+@@ -98,7 +99,7 @@
+ 	switch(b) {
+ 	    case 0:
+ 		if(!i) {
+-                    i = (int) tree.getref(tree.getid(n));
++                    i = (long) tree.getref(tree.getid(n));
+ 		    ic = ch.begin()+i-1;
+ 
+                     found = (ik = find(naffect.begin(), naffect.end(),