3 files changed, 21 insertions, 13 deletions

diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index 4d9c6b875a00..36f3ba3cdac2 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	paq
-PORTVERSION=	20111221
+PORTVERSION=	20120202
 CATEGORIES=	archivers
 MASTER_SITES=	http://mattmahoney.net/dc/ LOCAL/bf/paq/
-DISTFILES=	libzpaq401.zip wbpe110.zip zpaq403.zip zpipe.201.zip
+DISTFILES=	libzpaq501.zip wbpe110.zip zpaq403.zip zpipe.201.zip
 .if !defined(NOPORTDATA) || make(makesum)
 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
+		calgarytest.zpaq calgarytest2.zpaq exe_j1.zip fast.cfg \
+		jpg_test2.zip lz1.zip max.cfg mid.cfg min.zip zpsfx.100.zip
 .endif
 .if !defined(NOPORTDOCS) || make(makesum)
-DISTFILES+=	zpaq1.pdf
+DISTFILES+=	zpaq1.pdf zpaq200.pdf
 .endif
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:M*.zip}
@@ -62,7 +62,7 @@ PORTDOCS=	libzpaq.cpp wbpe.cpp zpaq.cpp zpaq1.pdf zpipe.cpp
 .if !defined(NOPORTDATA)
 .if !defined(NOPORTDOCS)
 PORTDOCS+=	bwt_.cpp bwtpre.cpp bwtrle.cpp divsufsort.c divsufsort.h \
-		exe_jo.cpp jpeg_jo.cpp lzppre.cpp readme_bwt.txt \
+		exe_jo.cpp jpeg_jo.cpp lzpre.cpp lzppre.cpp readme_bwt.txt \
 		readme_bwt_j3.txt readme_exe_j1.txt zpsfx.cpp
 READMES+=	bwt_j3 exe_j1
 EXTRA_PATCHES +=	${FILESDIR}/patch_zpsfx.cpp
@@ -70,7 +70,7 @@ EXTRA_PATCHES +=	${FILESDIR}/patch_zpsfx.cpp
 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 min.cfg zpsfx.tag
+	exe_j1.cfg jpg_test2.cfg lz1.cfg min.cfg zpsfx.tag
 DDATA=	fast.cfg max.cfg mid.cfg
 PORTDATA=	${WDATA} ${DDATA} zpsfx
 .endif
@@ -92,7 +92,7 @@ post-patch:
 
 do-build:
 .if !defined(NOPORTDATA)
-	@cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lzppre; do \
+	@cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo 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
@@ -116,7 +116,7 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/${page} ${MANPREFIX}/man/man${page:E}
 .endfor
 .if !defined(NOPORTDATA)
-.for prog in bwt_ bwtpre bwtrle exe_jo jpeg_jo lzppre
+.for prog in bwt_ bwtpre bwtrle exe_jo jpeg_jo lzpre lzppre
 	@${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin
 .endfor
 	@${MKDIR} ${DATADIR}
@@ -133,5 +133,6 @@ do-install:
 
 check regression-test test: build
 	${WRKSRC}/zpaq l ${_DISTDIR}/calgarytest.zpaq
+	${WRKSRC}/zpaq l ${_DISTDIR}/calgarytest2.zpaq
 
 .include <bsd.port.post.mk>
diff --git a/archivers/paq/distinfo b/archivers/paq/distinfo
index e501b0007ed5..0364fc20eac2 100644
--- a/archivers/paq/distinfo
+++ b/archivers/paq/distinfo
@@ -1,11 +1,11 @@
-SHA256 (paq/libzpaq401.zip) = 81e672750fbdfe7ad63149a30dc405eefd776ffca26e5a46ab36fcb78b6abc80
-SIZE (paq/libzpaq401.zip) = 48509
+SHA256 (paq/libzpaq501.zip) = 3ea073fd7f02a5eafe6bd4e64723f8098224484eaa2ff42f5c56508bb48cc689
+SIZE (paq/libzpaq501.zip) = 43716
 SHA256 (paq/wbpe110.zip) = 1675083b253e04ba7dd7cd28b2f7be179b3f5c1bb4d5289be4cfa217c6bc9b27
 SIZE (paq/wbpe110.zip) = 13667
 SHA256 (paq/zpaq403.zip) = 46cc36e1d2094464c3929de444b5ce25aab0ea3e07484d69dd220e708df83dda
 SIZE (paq/zpaq403.zip) = 45762
-SHA256 (paq/zpipe.201.zip) = 5add2f6fe2425ccfda401cfbbd3b873fa31e371dca3a6a0a3c2158859e1bfeab
-SIZE (paq/zpipe.201.zip) = 66484
+SHA256 (paq/zpipe.201.zip) = e95dfe6f701dd463f969fe16c933ed97fca194bd7aacec37d6c35409766133a8
+SIZE (paq/zpipe.201.zip) = 67555
 SHA256 (paq/bmp_j4a.zip) = 6b314e518f5b9ceffdac183229ddf74e6b5a0f4ef0e47181f652bf46e55de03c
 SIZE (paq/bmp_j4a.zip) = 1852
 SHA256 (paq/bwt.1.zip) = 689dbafe057afb5d46be34906f4c7565d5f9d8eed7943c78b70ac10753943c68
@@ -16,12 +16,16 @@ SHA256 (paq/bwt_slowmode1.zip) = 3b7fb3c4a2491b4f8b2c243f7f67a4f2c7d2b7935582070
 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/lz1.zip) = 2817e3d300edee5c1d65d702feb58b51bd459817dc32a2a29d82d0f92a0ea7d9
+SIZE (paq/lz1.zip) = 10012
 SHA256 (paq/max.cfg) = 7965863923d5558409f5792167c74914a9c0d07f813ef385587450e7b5a156b7
 SIZE (paq/max.cfg) = 1754
 SHA256 (paq/mid.cfg) = 51dd9dc78513e36217033c501f4a3331d30820df875e466052b6b6175bc9bafa
@@ -32,3 +36,5 @@ SHA256 (paq/zpsfx.100.zip) = 4ccf6b7967a2545d7741021f6c87362d72077d7f51c74840ab0
 SIZE (paq/zpsfx.100.zip) = 43423
 SHA256 (paq/zpaq1.pdf) = dce14a22ddd51117a29743db77a79ce31f97b2dbb1b2aaec7d0be0946ed85bf0
 SIZE (paq/zpaq1.pdf) = 105049
+SHA256 (paq/zpaq200.pdf) = 3a858e81e9b0a361a1306711fdf31d9bcfb1f007f7d766172ef50ca73a9febdf
+SIZE (paq/zpaq200.pdf) = 194940
diff --git a/archivers/paq/pkg-plist b/archivers/paq/pkg-plist
index 95d3908e2eea..a2536995446a 100644
--- a/archivers/paq/pkg-plist
+++ b/archivers/paq/pkg-plist
@@ -3,6 +3,7 @@
 %%PORTDATA%%bin/bwtrle
 %%PORTDATA%%bin/exe_jo
 %%PORTDATA%%bin/jpeg_jo
+%%PORTDATA%%bin/lzpre
 %%PORTDATA%%bin/lzppre
 bin/wbpe
 bin/zpaq