From eadc85ef1a19597616eed4810ef1979fbf1d37a2 Mon Sep 17 00:00:00 2001 From: Brendan Fabeny Date: Mon, 28 Nov 2011 22:10:35 +0000 Subject: update to 20111126: x86*-only JIT that doesn't require a c++ compiler, merge of zp and zpaq Feature safe: yes --- archivers/paq/Makefile | 86 +++++++++++++++++++------------------- archivers/paq/distinfo | 20 ++++----- archivers/paq/files/patch-zpaq.cpp | 22 ++++++++++ archivers/paq/pkg-plist | 5 --- 4 files changed, 76 insertions(+), 57 deletions(-) create mode 100644 archivers/paq/files/patch-zpaq.cpp (limited to 'archivers') diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile index fe3836966a5d..e06fc3a29704 100644 --- a/archivers/paq/Makefile +++ b/archivers/paq/Makefile @@ -6,13 +6,14 @@ # PORTNAME= paq -PORTVERSION= 20110621 +PORTVERSION= 20111126 CATEGORIES= archivers MASTER_SITES= http://mattmahoney.net/dc/ LOCAL/bf/paq/ -DISTFILES= libzpaq.202a.zip wbpe110.zip zp.103.zip zpaq.205.zip zpipe.201.zip +DISTFILES= libzpaq400.zip wbpe110.zip zpaq401.zip zpipe.201.zip .if !defined(NOPORTDATA) || make(makesum) -DISTFILES+= bmp_j4.zip bwt.1.zip bwt_j3.zip bwt_slowmode1.zip exe_j1.zip \ - fast.cfg jpg_test2.zip max.cfg mid.cfg min.zip zpsfx.100.zip +DISTFILES+= bmp_j4a.zip bwt.1.zip bwt_j3.zip bwt_slowmode1.zip \ + calgarytest.zpaq exe_j1.zip fast.cfg jpg_test2.zip max.cfg \ + mid.cfg min.zip zpsfx.100.zip .endif .if !defined(NOPORTDOCS) || make(makesum) DISTFILES+= zpaq1.pdf @@ -23,7 +24,10 @@ EXTRACT_ONLY= ${DISTFILES:M*.zip} MAINTAINER= bf@FreeBSD.org COMMENT= A family of archivers with extremely high compression ratios -EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt zp -d ${WRKDIR} +LICENSE= GPLv3 MIT +LICENSE_COMB= multi + +EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt -d ${WRKDIR} NO_WRKSUBDIR= yes USE_ZIP= yes @@ -35,23 +39,24 @@ SUB_FILES= pkg-message MAN1= zpaq.1 MAN3= libzpaq.3 -LICENSE= GPLv3 MIT -LICENSE_COMB= multi +.include .if !defined(WITH_DEBUG) CFLAGS+= -DNDEBUG .endif -ZPFLAGS= -DOPT="\"${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} \ - -I${PREFIX}/include \$$1.cpp ${PREFIX}/lib/zpaq/zp.o \ - ${PREFIX}/lib/zpaq/libzpaq.o ${PTHREAD_LIBS} -o \$$1.exe\"" -ZPAQFLAGS= -DOPT="\"${CXX} ${CXXFLAGS} -I${PREFIX}/include zpaqopt.cpp \ - ${PREFIX}/lib/zpaq/zpaq.o ${PREFIX}/lib/zpaq/libzpaq.o \ - -o zpaqopt.exe\"" +.if !defined(WITHOUT_OPENMP) && empty(CXX:M*clang++*) +PTHREAD_CFLAGS+= -fopenmp +.endif + +.if ${ARCH} == "amd64" || ( ${ARCH} == "i386" && !empty(MACHINE_CPU:Msse2) ) +ZPAQFLAGS= -msse2 +.else +ZPAQFLAGS= -DNOJIT +.endif .if !defined(NOPORTDOCS) -PORTDOCS= libzpaq.cpp libzpaqo.cpp readme_zp.txt wbpe.cpp zp.cpp \ - zpaq.cpp zpaq1.pdf zpipe.cpp +PORTDOCS= libzpaq.cpp wbpe.cpp zpaq.cpp zpaq1.pdf zpipe.cpp .endif .if !defined(NOPORTDATA) @@ -78,8 +83,10 @@ post-extract: .endif -.if !defined(NOPORTDATA) post-patch: + @${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' \ + ${WRKSRC}/libzpaq.cpp +.if !defined(NOPORTDATA) @${REINPLACE_CMD} -e 's|c:\\res\\zpaq\\||' ${WRKSRC}/bwt[12].cfg \ ${WRKSRC}/bwtrle[12].cfg @@ -87,34 +94,26 @@ post-patch: do-build: .if !defined(NOPORTDATA) - @(cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lzppre; do \ - ${CXX} ${CXXFLAGS} $${prog}.cpp -o $${prog}; done; \ - ${CXX} ${CXXFLAGS} bwtrle.cpp divsufsort.c -o bwtrle; \ - ${CXX} ${CXXFLAGS} zpsfx.cpp libzpaq.cpp libzpaqo.cpp -o zpsfx) + @cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lzppre; do \ + ${CXX} ${CXXFLAGS} -o $${prog} $${prog}.cpp; done; \ + ${CXX} ${CXXFLAGS} -o bwtrle bwtrle.cpp divsufsort.c; \ + ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpsfx zpsfx.cpp libzpaq.cpp .endif - @(cd ${WRKSRC}; \ - ${CXX} ${CXXFLAGS} wbpe.cpp -o wbpe; \ - ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${ZPFLAGS} zp.cpp libzpaq.cpp \ - divsufsort.c ${PTHREAD_LIBS} -o zp; \ - ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} zpaq.cpp libzpaq.cpp libzpaqo.cpp \ - -o zpaq; \ - ${CXX} ${CXXFLAGS} zpipe.cpp libzpaq.cpp libzpaqo.cpp -o zpipe; \ - ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} -c libzpaq.cpp; \ - ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} -DNOOPT -c zp.cpp; \ - ${CXX} ${CXXFLAGS} -c zpaq.cpp; \ + @cd ${WRKSRC}; \ + ${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \ + ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${ZPAQFLAGS} \ + -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} ${PTHREAD_LIBS}; \ + ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp; \ for page in ${MAN1} ${MAN3}; \ - do pod2man $${page}.pod > $${page}; done) + do pod2man $${page}.pod > $${page}; done do-install: - @${MKDIR} ${PREFIX}/bin ${PREFIX}/include ${PREFIX}/lib/zpaq \ - ${MANPREFIX}/man/man1 ${MANPREFIX}/man/man3 -.for prog in wbpe zp zpaq zpipe + @${MKDIR} ${PREFIX}/bin ${PREFIX}/include ${MANPREFIX}/man/man1 \ + ${MANPREFIX}/man/man3 +.for prog in wbpe zpaq zpipe @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin .endfor @${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${PREFIX}/include -.for obj in libzpaq.o zp.o zpaq.o - @${INSTALL_DATA} ${WRKSRC}/${obj} ${PREFIX}/lib/zpaq -.endfor .for page in ${MAN1} ${MAN3} @${INSTALL_MAN} ${WRKSRC}/${page} ${MANPREFIX}/man/man${page:E} .endfor @@ -123,15 +122,18 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin .endfor @${MKDIR} ${DATADIR} - @(cd ${WRKSRC}; ${INSTALL_DATA} ${WDATA} ${DATADIR}; \ - ${INSTALL_LIB} zpsfx ${DATADIR}) - @(cd ${_DISTDIR}; ${INSTALL_DATA} ${DDATA} ${DATADIR}) + @cd ${WRKSRC}; ${INSTALL_DATA} ${WDATA} ${DATADIR}; \ + ${INSTALL_LIB} zpsfx ${DATADIR} + @cd ${_DISTDIR}; ${INSTALL_DATA} ${DDATA} ${DATADIR} .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS:Nzpaq1.pdf} ${DOCSDIR}) + @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS:Nzpaq1.pdf} ${DOCSDIR} @${INSTALL_DATA} ${_DISTDIR}/zpaq1.pdf ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} -.include +check regression-test test: build + ${WRKSRC}/zpaq l ${_DISTDIR}/calgarytest.zpaq + +.include diff --git a/archivers/paq/distinfo b/archivers/paq/distinfo index f84a8de6df95..6badedd26167 100644 --- a/archivers/paq/distinfo +++ b/archivers/paq/distinfo @@ -1,21 +1,21 @@ -SHA256 (paq/libzpaq.202a.zip) = 9b4c0ec9e605c5ba49c1ab691a4149e4385f7a76c41f4c782d09d2f5d5a53605 -SIZE (paq/libzpaq.202a.zip) = 35631 +SHA256 (paq/libzpaq400.zip) = 62164c9115c7cfa0030675c89bb57fefa48a3ee1b388bb724afd365d82bb7179 +SIZE (paq/libzpaq400.zip) = 48738 SHA256 (paq/wbpe110.zip) = 1675083b253e04ba7dd7cd28b2f7be179b3f5c1bb4d5289be4cfa217c6bc9b27 SIZE (paq/wbpe110.zip) = 13667 -SHA256 (paq/zp.103.zip) = cc1a9f42702852d4b3708230fe88593de659412628b406a8342289b7b1dbfe76 -SIZE (paq/zp.103.zip) = 612604 -SHA256 (paq/zpaq.205.zip) = f2310b5d6085fe004afccc48e3b2b0a363d7cfb6988249c2737f57fe51ae24dd -SIZE (paq/zpaq.205.zip) = 101816 -SHA256 (paq/zpipe.201.zip) = 742f0da404fd279683e87e66001093bef7cca268b59a774d580c54bfeff4f1a5 -SIZE (paq/zpipe.201.zip) = 42173 -SHA256 (paq/bmp_j4.zip) = 1b43969dcd0f04ff6f1f90b9ae40c790b8740fa6fd1011d0c2153fc4c52fc842 -SIZE (paq/bmp_j4.zip) = 1711 +SHA256 (paq/zpaq401.zip) = 6aedb2adb6f4fb83a2c7016b3453e14665c9bd7686da5e761b47e017926ed6e6 +SIZE (paq/zpaq401.zip) = 43589 +SHA256 (paq/zpipe.201.zip) = 5add2f6fe2425ccfda401cfbbd3b873fa31e371dca3a6a0a3c2158859e1bfeab +SIZE (paq/zpipe.201.zip) = 66484 +SHA256 (paq/bmp_j4a.zip) = 6b314e518f5b9ceffdac183229ddf74e6b5a0f4ef0e47181f652bf46e55de03c +SIZE (paq/bmp_j4a.zip) = 1852 SHA256 (paq/bwt.1.zip) = 689dbafe057afb5d46be34906f4c7565d5f9d8eed7943c78b70ac10753943c68 SIZE (paq/bwt.1.zip) = 40417 SHA256 (paq/bwt_j3.zip) = c5e75abdd8d8a3fb6effa3c467e98aeb3175068bd454a635baae79de024b9120 SIZE (paq/bwt_j3.zip) = 16535 SHA256 (paq/bwt_slowmode1.zip) = 3b7fb3c4a2491b4f8b2c243f7f67a4f2c7d2b793558207001b2565f06e145a92 SIZE (paq/bwt_slowmode1.zip) = 138176 +SHA256 (paq/calgarytest.zpaq) = 53d3cc3c6c6f97d701ea316313fb447fa84ef55a353e5325c6754568e20c93bf +SIZE (paq/calgarytest.zpaq) = 1003792 SHA256 (paq/exe_j1.zip) = 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239 SIZE (paq/exe_j1.zip) = 9828 SHA256 (paq/fast.cfg) = 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda diff --git a/archivers/paq/files/patch-zpaq.cpp b/archivers/paq/files/patch-zpaq.cpp new file mode 100644 index 000000000000..b99e18eafb13 --- /dev/null +++ b/archivers/paq/files/patch-zpaq.cpp @@ -0,0 +1,22 @@ +--- zpaq.cpp.orig 2011-11-28 15:50:58.000000000 -0500 ++++ zpaq.cpp 2011-11-28 16:01:21.000000000 -0500 +@@ -70,6 +70,7 @@ + #define PTHREAD 1 + #include + #include ++#include + #include + #else + #include +@@ -195,6 +196,11 @@ + int rc=0; // result + #ifdef unix + ++ size_t rcsize; ++ rcsize = sizeof(rc); ++ if (sysctlbyname("kern.smp.cpus", &rc, &rcsize, NULL, 0) < 0) return 1; ++#elif 0 ++ + // 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"); diff --git a/archivers/paq/pkg-plist b/archivers/paq/pkg-plist index 86316b85ba9c..95d3908e2eea 100644 --- a/archivers/paq/pkg-plist +++ b/archivers/paq/pkg-plist @@ -5,11 +5,6 @@ %%PORTDATA%%bin/jpeg_jo %%PORTDATA%%bin/lzppre bin/wbpe -bin/zp bin/zpaq bin/zpipe include/libzpaq.h -lib/zpaq/libzpaq.o -lib/zpaq/zp.o -lib/zpaq/zpaq.o -@dirrm lib/zpaq -- cgit v1.2.3