Date: Fri, 13 Dec 2013 09:40:00 GMT From: dfilter@FreeBSD.ORG (dfilter service) To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/184566: commit references a PR Message-ID: <201312130940.rBD9e0nJ041663@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/184566; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/184566: commit references a PR Date: Fri, 13 Dec 2013 09:34:47 +0000 (UTC) Author: gerald Date: Fri Dec 13 09:34:40 2013 New Revision: 336328 URL: http://svnweb.freebsd.org/changeset/ports/336328 Log: Fix the build with more standards-compliant compilers such as GCC 4.7. [1] On the way replace USE_GMAKE by USES=gmake. PR: 184566 [1], 182136 Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> [1] Approved by: maintainer (Jason Bacon <jwbacon@tds.net>) [1] Added: head/biology/plink/files/patch-elf.cpp (contents, props changed) head/biology/plink/files/patch-idhelp.cpp (contents, props changed) head/biology/plink/files/patch-sets.cpp (contents, props changed) Modified: head/biology/plink/Makefile Modified: head/biology/plink/Makefile ============================================================================== --- head/biology/plink/Makefile Fri Dec 13 09:03:57 2013 (r336327) +++ head/biology/plink/Makefile Fri Dec 13 09:34:40 2013 (r336328) @@ -15,8 +15,8 @@ LICENSE= GPLv2 LIB_DEPENDS= liblapack.so:${PORTSDIR}/math/lapack +USES= gmake USE_ZIP= yes -USE_GMAKE= yes USE_FORTRAN= yes # Make it use the same compiler as lapack PLIST_FILES= bin/plink Added: head/biology/plink/files/patch-elf.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/plink/files/patch-elf.cpp Fri Dec 13 09:34:40 2013 (r336328) @@ -0,0 +1,25 @@ +--- elf.cpp.orig 2013-11-16 17:09:56.000000000 +0100 ++++ elf.cpp 2013-11-16 17:10:24.000000000 +0100 +@@ -1175,10 +1175,10 @@ + << setw(8) << gcnt << " " + << setw(8) << (double)cnt / (double)gcnt << "\n"; + +- map<int,int>::iterator i = chr_cnt.begin(); +- while ( i != chr_cnt.end() ) ++ map<int,int>::iterator ichr = chr_cnt.begin(); ++ while ( ichr != chr_cnt.end() ) + { +- int c = i->first; ++ int c = ichr->first; + int x = chr_cnt.find( c )->second; + int y = chr_gcnt.find( c )->second; + +@@ -1189,7 +1189,7 @@ + << setw(8) << y << " " + << setw(8) << (double)x / (double)y << "\n"; + +- ++i; ++ ++ichr; + } + + } Added: head/biology/plink/files/patch-idhelp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/plink/files/patch-idhelp.cpp Fri Dec 13 09:34:40 2013 (r336328) @@ -0,0 +1,19 @@ +--- idhelp.cpp.orig 2013-11-16 17:11:42.000000000 +0100 ++++ idhelp.cpp 2013-11-16 17:12:53.000000000 +0100 +@@ -772,12 +772,12 @@ + for (int j = 0 ; j < jointField.size(); j++ ) + { + set<IDField*> & jf = jointField[j]; +- set<IDField*>::iterator j = jf.begin(); ++ set<IDField*>::iterator jfit = jf.begin(); + PP->printLOG(" { "); +- while ( j != jf.end() ) ++ while ( jfit != jf.end() ) + { +- PP->printLOG( (*j)->name + " " ); +- ++j; ++ PP->printLOG( (*jfit)->name + " " ); ++ ++jfit; + } + PP->printLOG(" }"); + } Added: head/biology/plink/files/patch-sets.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/plink/files/patch-sets.cpp Fri Dec 13 09:34:40 2013 (r336328) @@ -0,0 +1,18 @@ +--- sets.cpp.orig 2013-11-16 17:06:29.000000000 +0100 ++++ sets.cpp 2013-11-16 17:07:12.000000000 +0100 +@@ -768,11 +768,11 @@ + ////////////////////////////////////////////// + // Reset original missing status + +- vector<Individual*>::iterator i = PP->sample.begin(); +- while ( i != PP->sample.end() ) ++ vector<Individual*>::iterator ipp = PP->sample.begin(); ++ while ( ipp != PP->sample.end() ) + { +- (*i)->missing = (*i)->flag; +- ++i; ++ (*ipp)->missing = (*ipp)->flag; ++ ++ipp; + } + + //////////////////////////////////////////////// _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312130940.rBD9e0nJ041663>