Index: head/archivers/paq/Makefile =================================================================== --- head/archivers/paq/Makefile (revision 374070) +++ head/archivers/paq/Makefile (revision 374071) @@ -1,125 +1,128 @@ # Created by: bf # $FreeBSD$ PORTNAME= paq PORTVERSION= 20140131 CATEGORIES= archivers MASTER_SITES= http://mattmahoney.net/dc/ LOCAL/bf/paq/ -DISTFILES= wbpe110.zip zpaqd633.zip zpaq649.zip zpipe.201.zip +DISTFILES= wbpe110.zip zpaqd633.zip zpaq657.zip zpipe.201.zip DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTFILES:M*.zip} MAINTAINER= bf@FreeBSD.org COMMENT= Family of archivers with extremely high compression ratios LICENSE= GPLv3 MIT LICENSE_COMB= multi USES= dos2unix zip:infozip EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt -d ${WRKDIR} NO_WRKSUBDIR= yes OPTIONS_DEFINE= OPENMP DOCS SUB_FILES= pkg-message .include .if ${ARCH} == "amd64" || ( ${ARCH} == "i386" && !empty(MACHINE_CPU:Msse2) ) ZPAQFLAGS= -Dunix -msse2 .else ZPAQFLAGS= -Dunix -DNOJIT .endif .if defined(WITH_DEBUG) CXXFLAGS+= -DDEBUG .else CXXFLAGS+= -DNDEBUG .endif DISTFILES+= bmp_j4c.zip bwt.1.zip bwt_j3.zip bwt_slowmode1.zip \ calgarytest.zpaq calgarytest2.zpaq exe_j1.zip fast.cfg \ jpg_test2.zip lazy210.zip lz1.zip max.cfg mid.cfg min.zip \ zpsfx.100.zip zpsfx101.cpp .if ${PORT_OPTIONS:MDOCS} || make(makesum) -DISTFILES+= zpaq1.pdf zpaq202.pdf zpaq203.pdf +DISTFILES+= zpaq1.pdf zpaq202.pdf zpaq203.pdf zpaq204.pdf .endif .if ${PORT_OPTIONS:MDOCS} -PORTDOCS= libzpaq.cpp wbpe.cpp zpaq.cpp zpaq1.pdf zpaq202.pdf zpaq203.pdf zpipe.cpp +PORTDOCS= libzpaq.cpp wbpe.cpp zpaq.cpp zpaq.pod zpaq1.pdf \ + zpaq202.pdf zpaq203.pdf zpaq204.pdf zpipe.cpp .endif .if ${PORT_OPTIONS:MDOCS} PORTDOCS+= bwt_.cpp bwtpre.cpp bwtrle.cpp divsufsort.c divsufsort.h \ exe_jo.cpp jpeg_jo.cpp lzpre.cpp lzppre.cpp readme_bwt.txt \ readme_bwt_j3.txt readme_exe_j1.txt readme_lazy210.txt zpsfx.cpp READMES+= bwt_j3 exe_j1 lazy210 EXTRA_PATCHES+= ${FILESDIR}/patch_zpsfx.cpp .endif WDATA= bmp_j4.cfg bwt_j3.cfg bwt_slowmode1_1GB_block.cfg \ bwt_slowmode1_256MB_block.cfg bwt_slowmode1_4MB_block.cfg \ bwt1.cfg bwt2.cfg bwtrle1.cfg bwtrle2.cfg colorpre.cfg \ exe_j1.cfg jpg_test2.cfg lazy2.cfg lz1.cfg min.cfg zpsfx.tag DDATA= fast.cfg max.cfg mid.cfg PORTDATA= ${WDATA} ${DDATA} zpsfx .if ${PORT_OPTIONS:MOPENMP} OPENMP_CFLAGS+= -fopenmp USE_GCC= any .endif post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/zpsfx101.cpp ${WRKSRC}/zpsfx.cpp .if ${PORT_OPTIONS:MDOCS} .for r in ${READMES} @${UNZIP_CMD} -pq ${DISTDIR}/${DIST_SUBDIR}/${r}.zip readme.txt > ${WRKSRC}/readme_${r:R}.txt .endfor .endif post-patch: @${REINPLACE_CMD} -e 's|c:\\res\\zpaq\\||' ${WRKSRC}/bwt[12].cfg \ ${WRKSRC}/bwtrle[12].cfg do-build: @cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lazy2 lzpre \ 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 @cd ${WRKSRC}; \ ${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \ ${CXX} ${CXXFLAGS} ${OPENMP_CFLAGS} ${ZPAQFLAGS} \ - -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} -pthread; \ + -o zpaq zpaq.cpp libzpaq.cpp ${LDFLAGS} -pthread; \ ${CXX} ${CXXFLAGS:N-DNDEBUG} ${ZPAQFLAGS} \ -o zpaqd zpaqd.cpp libzpaq.cpp ${LDFLAGS}; \ ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp do-install: .for prog in wbpe zpaq zpaqd zpipe - @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin .endfor - @${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${STAGEDIR}${PREFIX}/include .for prog in bwt_ bwtpre bwtrle exe_jo jpeg_jo lazy2 lzpre lzppre - @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin .endfor @${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${WDATA} ${STAGEDIR}${DATADIR}; \ + cd ${WRKSRC}; ${INSTALL_DATA} ${WDATA} ${STAGEDIR}${DATADIR}; \ ${INSTALL_LIB} zpsfx ${STAGEDIR}${DATADIR} - @cd ${_DISTDIR}; ${INSTALL_DATA} ${DDATA} ${STAGEDIR}${DATADIR} + cd ${_DISTDIR}; ${INSTALL_DATA} ${DDATA} ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS:N*.pdf} ${STAGEDIR}${DOCSDIR} - @cd ${DISTDIR}/${DIST_SUBDIR}; ${INSTALL_DATA} ${PORTDOCS:M*.pdf} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS:N*.pdf} ${STAGEDIR}${DOCSDIR} + cd ${DISTDIR}/${DIST_SUBDIR}; ${INSTALL_DATA} ${PORTDOCS:M*.pdf} ${STAGEDIR}${DOCSDIR} .endif check regression-test test: build .for _f in calgarytest.zpaq calgarytest2.zpaq .for _c in -list -test ${WRKSRC}/zpaq ${_c} ${DISTDIR}/${DIST_SUBDIR}/${_f} .endfor - ${WRKSRC}/zpaq -encrypt ${DISTDIR}/${DIST_SUBDIR}/${_f} -to ${WRKSRC}/encrypted_${_f} password - ${WRKSRC}/zpaq -test ${WRKSRC}/encrypted_${_f} -key password + cd ${WRKSRC}; ./zpaq -extract ${DISTDIR}/${DIST_SUBDIR}/${_f}; \ + ./zpaq -add encrypted_${_f} calgary -key password; \ + ./zpaq -test encrypted_${_f} -key password; \ + ${RM} -r calgary .endfor .include Index: head/archivers/paq/distinfo =================================================================== --- head/archivers/paq/distinfo (revision 374070) +++ head/archivers/paq/distinfo (revision 374071) @@ -1,46 +1,48 @@ SHA256 (paq/wbpe110.zip) = 1675083b253e04ba7dd7cd28b2f7be179b3f5c1bb4d5289be4cfa217c6bc9b27 SIZE (paq/wbpe110.zip) = 13667 SHA256 (paq/zpaqd633.zip) = bd913f3f843fb9a14a2b015d35d37ac87b56bdb9b9fee71469a3e9ca2a61ef03 SIZE (paq/zpaqd633.zip) = 297885 -SHA256 (paq/zpaq649.zip) = d6162d40f17649573ca355038ef7b79baf337696f8c14ca58706dcb6519b5767 -SIZE (paq/zpaq649.zip) = 609714 +SHA256 (paq/zpaq657.zip) = ceef7496eacaddeccd4293ac8a560c50a99836777b536f5cc05f8c93e270adf9 +SIZE (paq/zpaq657.zip) = 679480 SHA256 (paq/zpipe.201.zip) = e95dfe6f701dd463f969fe16c933ed97fca194bd7aacec37d6c35409766133a8 SIZE (paq/zpipe.201.zip) = 67555 SHA256 (paq/bmp_j4c.zip) = 98fe722a89ac107f637d54bf609673402fa9ede87d19ed68ee28633e64e879a7 SIZE (paq/bmp_j4c.zip) = 2511 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/calgarytest2.zpaq) = b110688939477bbe62263faff1ce488872c68c0352aa8e55779346f1bd1ed07e SIZE (paq/calgarytest2.zpaq) = 1002255 SHA256 (paq/exe_j1.zip) = 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239 SIZE (paq/exe_j1.zip) = 9828 SHA256 (paq/fast.cfg) = 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda SIZE (paq/fast.cfg) = 359 SHA256 (paq/jpg_test2.zip) = b09eedf0760826fa6822d266c1e262e67ad4ac119e11235e192e208e558e4855 SIZE (paq/jpg_test2.zip) = 12189 SHA256 (paq/lazy210.zip) = 7c6d55c316b366328d711ada5fd8302e4db89916dfd66449d696416d7f60d735 SIZE (paq/lazy210.zip) = 15867 SHA256 (paq/lz1.zip) = 2817e3d300edee5c1d65d702feb58b51bd459817dc32a2a29d82d0f92a0ea7d9 SIZE (paq/lz1.zip) = 10012 SHA256 (paq/max.cfg) = 7965863923d5558409f5792167c74914a9c0d07f813ef385587450e7b5a156b7 SIZE (paq/max.cfg) = 1754 SHA256 (paq/mid.cfg) = 51dd9dc78513e36217033c501f4a3331d30820df875e466052b6b6175bc9bafa SIZE (paq/mid.cfg) = 786 SHA256 (paq/min.zip) = 7209ffaf0d48f5e10e3134826d766e2dc52ed914ed5dbad415023db10b4e1113 SIZE (paq/min.zip) = 9560 SHA256 (paq/zpsfx.100.zip) = 4ccf6b7967a2545d7741021f6c87362d72077d7f51c74840ab0ae34e5f12bffa SIZE (paq/zpsfx.100.zip) = 43423 SHA256 (paq/zpsfx101.cpp) = d035fa2cc2f63f61e8e3476ccd09598b9f5012628de8c911dfaae07e64ae73ff SIZE (paq/zpsfx101.cpp) = 5491 SHA256 (paq/zpaq1.pdf) = dce14a22ddd51117a29743db77a79ce31f97b2dbb1b2aaec7d0be0946ed85bf0 SIZE (paq/zpaq1.pdf) = 105049 SHA256 (paq/zpaq202.pdf) = 1a4b6f045f3a445d7f64b78c7d8d510bf04ccc658c5cf6ab15a7203856a139f8 SIZE (paq/zpaq202.pdf) = 203352 SHA256 (paq/zpaq203.pdf) = 63586238f2fbad55e710422d0daed2597d66c5916f2353282517f1e53de04199 SIZE (paq/zpaq203.pdf) = 207565 +SHA256 (paq/zpaq204.pdf) = 720be1d48417064c940c5da57bca4b6c5cbe82643d5e6e8d8eabef2737f17b98 +SIZE (paq/zpaq204.pdf) = 208997