svn commit: r374071 - head/archivers/paq

[Brendan Fabeny]

Author: bf
Date: Fri Dec  5 18:10:08 2014
New Revision: 374071
URL: https://svnweb.freebsd.org/changeset/ports/374071
QAT: https://qat.redports.org/buildarchive/r374071/

Log:
  update zpaq to 6.57
  
  PR:		195244

Modified:
  head/archivers/paq/Makefile
  head/archivers/paq/distinfo

Modified: head/archivers/paq/Makefile
==============================================================================
--- head/archivers/paq/Makefile	Fri Dec  5 18:09:25 2014	(r374070)
+++ head/archivers/paq/Makefile	Fri Dec  5 18:10:08 2014	(r374071)
@@ -5,7 +5,7 @@ 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}
 
@@ -42,11 +42,12 @@ DISTFILES+=	bmp_j4c.zip bwt.1.zip bwt_j3
 		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}
@@ -90,27 +91,27 @@ do-build:
 	@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
@@ -118,8 +119,10 @@ check regression-test test: build
 .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 <bsd.port.mk>

Modified: head/archivers/paq/distinfo
==============================================================================
--- head/archivers/paq/distinfo	Fri Dec  5 18:09:25 2014	(r374070)
+++ head/archivers/paq/distinfo	Fri Dec  5 18:10:08 2014	(r374071)
@@ -2,8 +2,8 @@ SHA256 (paq/wbpe110.zip) = 1675083b253e0
 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
@@ -44,3 +44,5 @@ SHA256 (paq/zpaq202.pdf) = 1a4b6f045f3a4
 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