- Fix build with clang/libc++

- Rename patches with accordance to porter's handbook

6 files changed, 65 insertions, 0 deletions

diff --git a/sysutils/gpart/files/patch-man__gpart.man b/sysutils/gpart/files/patch-man-gpart.man
index 845d168fc756..845d168fc756 100644
--- a/sysutils/gpart/files/patch-man__gpart.man
+++ b/sysutils/gpart/files/patch-man-gpart.man
diff --git a/sysutils/gpart/files/patch-src__disku.c b/sysutils/gpart/files/patch-src-disku.c
index 19605f19fb39..19605f19fb39 100644
--- a/sysutils/gpart/files/patch-src__disku.c
+++ b/sysutils/gpart/files/patch-src-disku.c
diff --git a/sysutils/gpart/files/patch-src__gm_bsddl.h b/sysutils/gpart/files/patch-src-gm__bsddl.h
index c1179a38a618..c1179a38a618 100644
--- a/sysutils/gpart/files/patch-src__gm_bsddl.h
+++ b/sysutils/gpart/files/patch-src-gm__bsddl.h
diff --git a/sysutils/gpart/files/patch-src__gm_ntfs.h b/sysutils/gpart/files/patch-src-gm__ntfs.h
index af5e4ea2fa4a..af5e4ea2fa4a 100644
--- a/sysutils/gpart/files/patch-src__gm_ntfs.h
+++ b/sysutils/gpart/files/patch-src-gm__ntfs.h
diff --git a/sysutils/gpart/files/patch-src-gpart.c b/sysutils/gpart/files/patch-src-gpart.c
new file mode 100644
index 000000000000..15bf3767b8cb
--- /dev/null
+++ b/sysutils/gpart/files/patch-src-gpart.c
@@ -0,0 +1,65 @@
+--- src/gpart.c.orig	2001-02-07 21:08:08.000000000 +0300
++++ src/gpart.c	2013-09-17 03:12:11.505226148 +0400
+@@ -69,7 +69,7 @@
+ int		(*boundary_fun)(disk_desc *,s64_t);
+ unsigned long	increment = 'h', gc = 0, gh = 0, gs = 0;
+ s64_t		skipsec = 0, maxsec = 0;
+-FILE		*log = 0;
++FILE		*logfile = 0;
+ 
+ 
+ 
+@@ -125,26 +125,26 @@
+ 		case FATAL :
+ 			g_mod_deleteall();
+ 			if (! f_quiet) fprintf(stderr,EM_FATALERROR,msg);
+-			if (log)
++			if (logfile)
+ 			{
+-				fprintf(log,EM_FATALERROR,msg);
+-				fclose(log);
++				fprintf(logfile,EM_FATALERROR,msg);
++				fclose(logfile);
+ 			}
+ 			exit(1);
+ 		case ERROR :
+ 			if (! f_quiet) fprintf(stderr,EM_SIMPLEERROR,msg);
+-			if (log) fprintf(log,EM_SIMPLEERROR,msg);
++			if (logfile) fprintf(logfile,EM_SIMPLEERROR,msg);
+ 			break;
+ 		case WARN :
+ 			if (! f_quiet) fprintf(stderr,EM_WARNING,msg);
+-			if (log) fprintf(log,EM_WARNING,msg);
++			if (logfile) fprintf(logfile,EM_WARNING,msg);
+ 			break;
+ 		case MSG :
+ 			if (! f_quiet) fputs(msg,stdout); fflush(stdout);
+-			if (log) fputs(msg,log);
++			if (logfile) fputs(msg,logfile);
+ 			break;
+ 	}
+-	if (log) fflush(log);
++	if (logfile) fflush(logfile);
+ }
+ 
+ 
+@@ -1750,8 +1750,8 @@
+ 				}
+ 				break;
+ 			case 'l' :
+-				if (log) fclose(log);
+-				if ((log = fopen(optarg,"w")) == 0)
++				if (logfile) fclose(logfile);
++				if ((logfile = fopen(optarg,"w")) == 0)
+ 					pr(FATAL,EM_OPENLOG,optarg);
+ 				break;
+ 			case 'L' :
+@@ -1831,7 +1831,7 @@
+ 		}
+ 	}
+ 	free_disk_desc(d);
+-	if (log) fclose(log);
++	if (logfile) fclose(logfile);
+ 
+ 	return (f_check ? no_of_incons : 0);
+ }
diff --git a/sysutils/gpart/files/patch-src__gpart.h b/sysutils/gpart/files/patch-src-gpart.h
index 07771ea1c33a..07771ea1c33a 100644
--- a/sysutils/gpart/files/patch-src__gpart.h
+++ b/sysutils/gpart/files/patch-src-gpart.h