aboutsummaryrefslogtreecommitdiffstats
path: root/archivers/paq
diff options
context:
space:
mode:
authorbf <bf@FreeBSD.org>2013-02-08 03:07:07 +0800
committerbf <bf@FreeBSD.org>2013-02-08 03:07:07 +0800
commit2b111ee40803e823042880178d15c383b40b0eb1 (patch)
treed73e66c6b0549ea9bf6ae5ff4df0b41a96284a2c /archivers/paq
parentcc5490ffdce2b44cc4193fe56cbf338d293ed69b (diff)
downloadfreebsd-ports-gnome-2b111ee40803e823042880178d15c383b40b0eb1.tar.gz
freebsd-ports-gnome-2b111ee40803e823042880178d15c383b40b0eb1.tar.zst
freebsd-ports-gnome-2b111ee40803e823042880178d15c383b40b0eb1.zip
update zpaq to 6.21; fix default number of threads used by zpaq
Diffstat (limited to 'archivers/paq')
-rw-r--r--archivers/paq/Makefile4
-rw-r--r--archivers/paq/distinfo4
-rw-r--r--archivers/paq/files/patch-zpaq.cpp28
3 files changed, 32 insertions, 4 deletions
diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index 7cedd86803af..cd9eef780b06 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -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}
diff --git a/archivers/paq/distinfo b/archivers/paq/distinfo
index 5e006806bcbb..c5598edc9752 100644
--- a/archivers/paq/distinfo
+++ b/archivers/paq/distinfo
@@ -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
diff --git a/archivers/paq/files/patch-zpaq.cpp b/archivers/paq/files/patch-zpaq.cpp
new file mode 100644
index 000000000000..4b39843d73af
--- /dev/null
+++ b/archivers/paq/files/patch-zpaq.cpp
@@ -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%