cint: Backport patches from lang/cint

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Sep 28 00:31:27 2016 +0200
Changeset:	2f425f4acfe8220d6174af689091460d593b7f53

Modified Files:
	cint/distinfo
Added Files:
	cint/patches/patch-lib_posix_posix.h
	cint/patches/patch-src_Type.cxx
	cint/patches/patch-src_v6__loadfile.cxx
	cint/patches/patch-tool_ifdef_Makefile.base
	cint/patches/patch-tool_ifdef_get.c
	cint/patches/patch-tool_ifdef_ifdef.cxx

Log Message:
cint: Backport patches from lang/cint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f425f4acfe8220d6174af689091460d593b7f53

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cint/distinfo                               |  6 ++++
 cint/patches/patch-lib_posix_posix.h        | 13 ++++++++
 cint/patches/patch-src_Type.cxx             | 27 ++++++++++++++++
 cint/patches/patch-src_v6__loadfile.cxx     | 13 ++++++++
 cint/patches/patch-tool_ifdef_Makefile.base | 10 ++++++
 cint/patches/patch-tool_ifdef_get.c         | 50 +++++++++++++++++++++++++++++
 cint/patches/patch-tool_ifdef_ifdef.cxx     | 26 +++++++++++++++
 7 files changed, 145 insertions(+)

diffs:
diff --git a/cint/distinfo b/cint/distinfo
index 74eaddf..3960fab 100644
--- a/cint/distinfo
+++ b/cint/distinfo
@@ -6,12 +6,18 @@ SHA512 (cint-5.16.19-source.tar.gz) = ae96247dc62f7ab27d514b302cd836a9bed07ed24a
 Size (cint-5.16.19-source.tar.gz) = 1975329 bytes
 SHA1 (patch-Makefile) = 2bbed612d93d5a86a0e331d40d8be029d50e93a0
 SHA1 (patch-configure) = 281dd6f18d1d9528e0c993175ef32571c49e6ea8
+SHA1 (patch-lib_posix_posix.h) = 03ae9bb303c93994a6255181fedf7142c1160723
 SHA1 (patch-src_Method.cxx) = ee84d79c15f6951c07527e8c000c0d8eb60fdc71
+SHA1 (patch-src_Type.cxx) = 1eec44be0995f8837af0ea63ca1bdb04af0e00f7
 SHA1 (patch-src_bc__reader.h) = f768471d096a7e9401f7322f960119dd0f92769b
 SHA1 (patch-src_gcc3strm.cxx) = d0003a4fbfbe85080eb1770376c2bcaec562fdb8
+SHA1 (patch-src_v6__loadfile.cxx) = b72d099b5d7bf7e2fe5b346979a4ee10e3ae4318
 SHA1 (patch-src_v6__macro.cxx) = 932f3177a6f6704aeca95d511a2730b30f3d1293
 SHA1 (patch-src_v6__newlink.cxx) = c481f18f470246424944fad6ead167c7e8c00bef
 SHA1 (patch-src_v6__parse.cxx) = c2e3f9fd599d607ea538c0fb8fe12eccf96fb936
 SHA1 (patch-src_v6__pcode.cxx) = 430706306baa0e9bb3f3631bdae81733f65d7815
 SHA1 (patch-tool_INSTALLBIN) = 76c5778cbf2f10c48a9e859837f045d2a7ac807d
+SHA1 (patch-tool_ifdef_Makefile.base) = 82ba2085341b8a430f45ed8885b583943f17bb43
+SHA1 (patch-tool_ifdef_get.c) = 6f8f7e3e1ed2725072b86af1594a7effea1f26c8
+SHA1 (patch-tool_ifdef_ifdef.cxx) = ef8d54c8609fc88ca00c252654c869c904eac867
 SHA1 (patch-tool_makecint.cxx) = b81d05e92dd089ad7a4d85160266fa3d19a1dab4
diff --git a/cint/patches/patch-lib_posix_posix.h b/cint/patches/patch-lib_posix_posix.h
new file mode 100644
index 0000000..256386c
--- /dev/null
+++ b/cint/patches/patch-lib_posix_posix.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/posix/posix.h.orig	2006-11-28 15:08:01.000000000 +0000
++++ lib/posix/posix.h
+@@ -283,7 +283,7 @@ extern int setpgrp(pid_t _pid,pid_t _pgr
+ #endif
+ #elif defined(G__SUN) || defined(__sun)
+ extern long setpgrp(void);
+-#elif defined(G__FBSD)||defined(__FreeBSD__)||defined(G__OBSD)||defined(__OpenBSD__)||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))
++#elif defined(G__FBSD)||defined(__FreeBSD__)||defined(G__NBSD)||defined(__NetBSD__)||defined(G__OBSD)||defined(__OpenBSD__)||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))
+ extern int setpgrp(pid_t _pid, pid_t _pgrp);
+ #elif defined(G__KCC) || defined(__KCC)
+ extern pid_t setpgrp(void);
diff --git a/cint/patches/patch-src_Type.cxx b/cint/patches/patch-src_Type.cxx
new file mode 100644
index 0000000..82eb68b
--- /dev/null
+++ b/cint/patches/patch-src_Type.cxx
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- src/Type.cxx.orig	2006-11-29 01:59:05.000000000 +0000
++++ src/Type.cxx
+@@ -125,7 +125,7 @@ const char* Cint::G__TypeInfo::TrueName(
+   strcpy(G__buf,
+ 	 G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
+   return(G__buf);
+-#elif  !defind(G__OLDIMPLEMENTATION401)
++#elif  !defined(G__OLDIMPLEMENTATION401)
+   return(G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
+ #else
+   return(G__type2string((int)type,(int)tagnum,-1,(int)reftype));
+@@ -138,7 +138,7 @@ const char* Cint::G__TypeInfo::Name() 
+   strcpy(G__buf,G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
+ 			       ,(int)isconst));
+   return(G__buf);
+-#elif  !defind(G__OLDIMPLEMENTATION401)
++#elif  !defined(G__OLDIMPLEMENTATION401)
+   return(G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
+ 	,(int)isconst));
+ #else
+@@ -238,4 +238,3 @@ int Cint::G__TypeInfo::Next()
+ {
+    return 0;
+ }
+-
diff --git a/cint/patches/patch-src_v6__loadfile.cxx b/cint/patches/patch-src_v6__loadfile.cxx
new file mode 100644
index 0000000..e1a7b74
--- /dev/null
+++ b/cint/patches/patch-src_v6__loadfile.cxx
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/v6_loadfile.cxx.orig	2007-03-15 17:59:30.000000000 +0000
++++ src/v6_loadfile.cxx
+@@ -2494,7 +2494,7 @@ char* G__tmpnam(char *name)
+   G__tmpfiles.Add(name);
+   return(name);
+ 
+-#elif /*defined(G__NEVER) && */ ((__GNUC__>=3)||((__GNUC__>=2)&&(__GNUC_MINOR__>=96)))&&(defined(__linux)||defined(__linux__))
++#elif /*defined(G__NEVER) && */ ((__GNUC__>=3)||((__GNUC__>=2)&&(__GNUC_MINOR__>=96)))&&(defined(__linux)||defined(__linux__)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(__OpenBSD__)||defined(__DragonFly__))
+   /* After all, mkstemp creates more problem than a solution. */
+   static char tempname[G__MAXFILENAME];
+   const char *appendix="_cint";
diff --git a/cint/patches/patch-tool_ifdef_Makefile.base b/cint/patches/patch-tool_ifdef_Makefile.base
new file mode 100644
index 0000000..71056a1
--- /dev/null
+++ b/cint/patches/patch-tool_ifdef_Makefile.base
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- tool/ifdef/Makefile.base.orig	2005-05-04 10:25:33.000000000 +0000
++++ tool/ifdef/Makefile.base
+@@ -18,4 +18,4 @@ get.o: get.c
+ 
+ 
+ clean:
+-	rm get.o ifdef.o ifdef
++	rm -f get.o ifdef.o ifdef
diff --git a/cint/patches/patch-tool_ifdef_get.c b/cint/patches/patch-tool_ifdef_get.c
new file mode 100644
index 0000000..8557805
--- /dev/null
+++ b/cint/patches/patch-tool_ifdef_get.c
@@ -0,0 +1,50 @@
+$NetBSD$
+
+--- tool/ifdef/get.c.orig	2006-07-26 13:00:37.000000000 +0000
++++ tool/ifdef/get.c
+@@ -2582,7 +2582,7 @@ struct G__param *libp;
+ {
+ 	char temp[ONELINE],temp1[ONELINE];
+ 	FILE *fopen();
+-	int fp;
++	long fp;
+ 
+ 	if(strcmp(funcname,"printf")==0) {
+ 		/* para[0]:description, para[1~paran-1]: */
+@@ -2603,18 +2603,18 @@ struct G__param *libp;
+ 
+ 	if(strcmp(funcname,"fclose")==0) {
+ 		/* para[0]:filepointer */
+-		sprintf(result7,"%d",fclose((FILE*)atoi(libp->para[0])));
++		sprintf(result7,"%d",fclose((FILE*)atol(libp->para[0])));
+ 		return(1);
+ 	}
+ 
+ 	if(strcmp(funcname,"fgets")==0) {
+ 		/* parameter[0]:varname, para[1]:nchar,para[2]:filepointer */
+-		fp=atoi(libp->para[2]);
++		fp=atol(libp->para[2]);
+ 		sprintf(result7,"%ld"
+ 			,(long)fgets(temp,atoi(libp->para[1]),(FILE*)fp));
+ 		G__letvariable(libp->parameter[0]
+ 			    ,G__add_quotation(temp),&G__global,G__local);
+-		sprintf(temp,"%d",fp);
++		sprintf(temp,"%ld",fp);
+ 		G__letvariable(libp->parameter[1],temp,&G__global,G__local);
+ 		return(1);
+ 	}
+@@ -2622,7 +2622,7 @@ struct G__param *libp;
+ 	if(strcmp(funcname,"fprintf")==0) {
+ 		/* parameter[0]:pointer ,parameter[1]:description, para[2~paran-1]: */
+ 		G__charformatter(result7,1,libp);
+-		fprintf((FILE*)atoi(libp->para[0]),"%s",result7);
++		fprintf((FILE*)atol(libp->para[0]),"%s",result7);
+ 		strcpy(result7,"");
+ 		return(1);
+ 	}
+@@ -3553,5 +3553,3 @@ FILE *fp;
+ 
+ 	return( c ) ;
+ }
+-
+-
diff --git a/cint/patches/patch-tool_ifdef_ifdef.cxx b/cint/patches/patch-tool_ifdef_ifdef.cxx
new file mode 100644
index 0000000..d5c9ba0
--- /dev/null
+++ b/cint/patches/patch-tool_ifdef_ifdef.cxx
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- tool/ifdef/ifdef.cxx.orig	2006-07-26 13:00:37.000000000 +0000
++++ tool/ifdef/ifdef.cxx
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <unistd.h>
+ #include <string>
+ #include <map>
+ #ifndef __hpux
+@@ -69,7 +70,7 @@ extern "C" {
+ char *G__calc(char*);
+ char *G__getexpr(char*);
+ char *G__getandor(char*);
+-#if !defined(__hpux) && !defined(__APPLE__) 
++#if !defined(__hpux) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ char getopt(int argc,char **argv,char *optlist);
+ #endif
+ extern int optind;
+@@ -946,4 +947,3 @@ int G__splitawk(char* string,int* argc,c
+   }
+   return(n_eof);
+ }
+-