svn commit: r311879 - in head/archivers/paq: . files

[Brendan Fabeny]

Author: bf
Date: Thu Feb  7 19:07:07 2013
New Revision: 311879
URL: http://svnweb.freebsd.org/changeset/ports/311879

Log:
  update zpaq to 6.21; fix default number of threads used by zpaq

Added:
  head/archivers/paq/files/patch-zpaq.cpp   (contents, props changed)
Modified:
  head/archivers/paq/Makefile
  head/archivers/paq/distinfo

Modified: head/archivers/paq/Makefile
==============================================================================
--- head/archivers/paq/Makefile	Thu Feb  7 17:40:34 2013	(r311878)
+++ head/archivers/paq/Makefile	Thu Feb  7 19:07:07 2013	(r311879)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	paq
-PORTVERSION=	20130201
+PORTVERSION=	20130206
 CATEGORIES=	archivers
 MASTER_SITES=	http://mattmahoney.net/dc/ LOCAL/bf/paq/
-DISTFILES=	wbpe110.zip zpaq620.zip zpipe.201.zip
+DISTFILES=	wbpe110.zip zpaq621.zip zpipe.201.zip
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:M*.zip}
 

Modified: head/archivers/paq/distinfo
==============================================================================
--- head/archivers/paq/distinfo	Thu Feb  7 17:40:34 2013	(r311878)
+++ head/archivers/paq/distinfo	Thu Feb  7 19:07:07 2013	(r311879)
@@ -1,7 +1,7 @@
 SHA256 (paq/wbpe110.zip) = 1675083b253e04ba7dd7cd28b2f7be179b3f5c1bb4d5289be4cfa217c6bc9b27
 SIZE (paq/wbpe110.zip) = 13667
-SHA256 (paq/zpaq620.zip) = 38675c007b86527bb9b2756a7a9f58af9ff5d9052bcf4b44515225caa2763b00
-SIZE (paq/zpaq620.zip) = 366365
+SHA256 (paq/zpaq621.zip) = 3830eda642a606ca7c79b10c07eadaab8e1eb02d4a263dd45ac9fa68db8e72d9
+SIZE (paq/zpaq621.zip) = 370629
 SHA256 (paq/zpipe.201.zip) = e95dfe6f701dd463f969fe16c933ed97fca194bd7aacec37d6c35409766133a8
 SIZE (paq/zpipe.201.zip) = 67555
 SHA256 (paq/bmp_j4c.zip) = 98fe722a89ac107f637d54bf609673402fa9ede87d19ed68ee28633e64e879a7

Added: head/archivers/paq/files/patch-zpaq.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/paq/files/patch-zpaq.cpp	Thu Feb  7 19:07:07 2013	(r311879)
@@ -0,0 +1,28 @@
+--- zpaq.cpp.orig	2013-02-07 12:39:36.000000000 -0500
++++ zpaq.cpp	2013-02-07 12:39:51.000000000 -0500
+@@ -1089,24 +1089,7 @@
+   int rc=0;  // result
+ #ifdef unix
+ 
+-  // Count lines of the form "processor\t: %d\n" in /proc/cpuinfo
+-  // where %d is 0, 1, 2,..., rc-1
+-  FILE *in=fopen("/proc/cpuinfo", "r");
+-  if (!in) return 1;
+-  std::string s;
+-  int c;
+-  while ((c=getc(in))!=EOF) {
+-    if (c>='A' && c<='Z') c+='a'-'A';  // convert to lowercase
+-    if (c>' ') s+=c;  // remove white space
+-    if (c=='\n') {  // end of line?
+-      if (size(s)>10 && s.substr(0, 10)=="processor:") {
+-        c=atoi(s.c_str()+10);
+-        if (c==rc) ++rc;
+-      }
+-      s="";
+-    }
+-  }
+-  fclose(in);
++  rc=(int)sysconf(_SC_NPROCESSORS_ONLN);
+ #else
+ 
+   // In Windows return %NUMBER_OF_PROCESSORS%