Replace pzpaq with unzp and zp

4 files changed, 38 insertions, 33 deletions

diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index 9d0528fceef2..bca25a0c29df 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	paq
-PORTVERSION=	20110316
+PORTVERSION=	20110518
 CATEGORIES=	archivers
 MASTER_SITES=	http://mattmahoney.net/dc/ LOCAL/bf/paq/
-DISTFILES=	libzpaq.202a.zip  pzpaq.005.zip zpaq.205.zip zpipe.201.zip
+DISTFILES=	libzpaq.202a.zip unzp.100.zip zp.102.zip zpaq.205.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
@@ -23,7 +23,7 @@ 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 -d ${WRKDIR}
+EXTRACT_AFTER_ARGS=	-x *.bat *.exe readme.txt unzp zp -d ${WRKDIR}
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 
@@ -32,7 +32,7 @@ USE_PERL5_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-MAN1=	pzpaq.1 zpaq.1
+MAN1=	zpaq.1
 MAN3=	libzpaq.3
 
 LICENSE=	GPLv3 MIT
@@ -42,17 +42,16 @@ LICENSE_COMB=	multi
 CFLAGS+=	-DNDEBUG
 .endif
 
+UNZPFLAGS=	-DOPT="\"${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} \
+		-I${PREFIX}/include \$$1.cpp ${PREFIX}/lib/zpaq/unzp.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\""
-PZPAQFLAGS=	-DOPT="\"${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} \
-		-I${PREFIX}/include \$$1.cpp ${PREFIX}/lib/zpaq/pzpaq.o \
-		${PREFIX}/lib/zpaq/libzpaq.o ${PTHREAD_LIBS} -o \$$1.exe\""
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	libzpaq.cpp libzpaqo.cpp pzpaq.cpp readme_pzpaq.txt zpaq.cpp \
+PORTDOCS=	libzpaq.cpp libzpaqo.cpp unzp.cpp zp.cpp zpaq.cpp \
 		zpaq1.pdf zpipe.cpp
-READMES=	pzpaq.005
 .endif
 
 .if !defined(NOPORTDATA)
@@ -93,12 +92,15 @@ do-build:
 	${CXX} ${CXXFLAGS} bwtrle.cpp divsufsort.c -o bwtrle; \
 	${CXX} ${CXXFLAGS} zpsfx.cpp libzpaq.cpp libzpaqo.cpp -o zpsfx)
 .endif
-	@(cd ${WRKSRC};  ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${PZPAQFLAGS} \
-	pzpaq.cpp libzpaq.cpp libzpaqo.cpp ${PTHREAD_LIBS} -o pzpaq; \
+	@(cd ${WRKSRC}; \
+	${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${UNZPFLAGS} \
+	unzp.cpp libzpaq.cpp ${PTHREAD_LIBS} -o unzp; \
+	${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} 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 pzpaq.cpp; \
+	${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} -c libzpaq.cpp unzp.cpp; \
 	${CXX} ${CXXFLAGS} -c zpaq.cpp; \
 	for page in ${MAN1} ${MAN3}; \
 	do pod2man $${page}.pod > $${page}; done)
@@ -106,11 +108,11 @@ do-build:
 do-install:
 	@${MKDIR} ${PREFIX}/bin ${PREFIX}/include ${PREFIX}/lib/zpaq \
 	${MANPREFIX}/man/man1 ${MANPREFIX}/man/man3
-.for prog in pzpaq zpaq zpipe
+.for prog in unzp zp zpaq zpipe
 	@${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${PREFIX}/include
-.for obj in  libzpaq.o pzpaq.o zpaq.o
+.for obj in  libzpaq.o unzp.o zpaq.o
 	@${INSTALL_DATA} ${WRKSRC}/${obj} ${PREFIX}/lib/zpaq
 .endfor
 .for page in ${MAN1} ${MAN3}
diff --git a/archivers/paq/distinfo b/archivers/paq/distinfo
index 93e292cf721b..f91d298d5cb8 100644
--- a/archivers/paq/distinfo
+++ b/archivers/paq/distinfo
@@ -1,3 +1,13 @@
+SHA256 (paq/libzpaq.202a.zip) = 9b4c0ec9e605c5ba49c1ab691a4149e4385f7a76c41f4c782d09d2f5d5a53605
+SIZE (paq/libzpaq.202a.zip) = 35631
+SHA256 (paq/unzp.100.zip) = 49485215543580929fb333fc487f9a0222159b6672687b43069a83f27992cdfb
+SIZE (paq/unzp.100.zip) = 556541
+SHA256 (paq/zp.102.zip) = 44a2d436385b3b7a7e1b89c1e95231fceb9aaa8f103d1a8e7e8acb6f9120f5e6
+SIZE (paq/zp.102.zip) = 572495
+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/bwt.1.zip) = 689dbafe057afb5d46be34906f4c7565d5f9d8eed7943c78b70ac10753943c68
@@ -12,20 +22,12 @@ SHA256 (paq/fast.cfg) = 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c90
 SIZE (paq/fast.cfg) = 359
 SHA256 (paq/jpg_test2.zip) = b09eedf0760826fa6822d266c1e262e67ad4ac119e11235e192e208e558e4855
 SIZE (paq/jpg_test2.zip) = 12189
-SHA256 (paq/libzpaq.202a.zip) = 9b4c0ec9e605c5ba49c1ab691a4149e4385f7a76c41f4c782d09d2f5d5a53605
-SIZE (paq/libzpaq.202a.zip) = 35631
 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/pzpaq.005.zip) = 849f7ec3b2d73a2ca18ba920ddaff647fc88093849e60000c52e6c670b319188
-SIZE (paq/pzpaq.005.zip) = 99059
-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/zpsfx.100.zip) = 4ccf6b7967a2545d7741021f6c87362d72077d7f51c74840ab0ae34e5f12bffa
 SIZE (paq/zpsfx.100.zip) = 43423
 SHA256 (paq/zpaq1.pdf) = dce14a22ddd51117a29743db77a79ce31f97b2dbb1b2aaec7d0be0946ed85bf0
diff --git a/archivers/paq/files/pkg-message.in b/archivers/paq/files/pkg-message.in
index db6c220bbdd9..8c58e83aa08f 100644
--- a/archivers/paq/files/pkg-message.in
+++ b/archivers/paq/files/pkg-message.in
@@ -1,11 +1,11 @@
 *************************************************************************
-In addition to the manpages, see %%DOCSDIR%%/readme_*.txt and the
-comments at the head of %%DOCSDIR%%/*.cpp for instructions and
-details on usage and the algorithms employed.  For simplicity, the
-".exe" suffix has been retained for temporary executables used with
-the zpaq "o" flag, and optimized pzpaq decompression.  However, the
-suffix has been dropped from the zpsfx self-expanding archive stub
-executable, to avoid confusion with win32 executable stubs. zpsfx
-can be further compressed with archivers/upx, to yield smaller
-self-expanding archives.
+In addition to the manpages, see %%DOCSDIR%%/readme_*.txt and
+the comments at the head of %%DOCSDIR%%/*.cpp for instructions
+and details on usage and the algorithms employed.  For
+simplicity, the ".exe" suffix has been retained for temporary
+executables used with the zpaq "o" flag.  However, the suffix
+has been dropped from the zpsfx self-expanding archive stub
+executable, to avoid confusion with win32 executable stubs.
+zpsfx can be further compressed with archivers/upx, to yield
+smaller self-expanding archives.
 ************************************************************************
diff --git a/archivers/paq/pkg-plist b/archivers/paq/pkg-plist
index a2ea05a596fc..692925b6f1db 100644
--- a/archivers/paq/pkg-plist
+++ b/archivers/paq/pkg-plist
@@ -4,11 +4,12 @@
 %%PORTDATA%%bin/exe_jo
 %%PORTDATA%%bin/jpeg_jo
 %%PORTDATA%%bin/lzppre
-bin/pzpaq
+bin/unzp
+bin/zp
 bin/zpaq
 bin/zpipe
 include/libzpaq.h
 lib/zpaq/libzpaq.o
-lib/zpaq/pzpaq.o
+lib/zpaq/unzp.o
 lib/zpaq/zpaq.o
 @dirrm lib/zpaq