update to 20110621:

- update zp to version 1.03
- remove the now redundant unzp
- add wbpe 1.10, a dictionary
  preprocessor for text files

3 files changed, 20 insertions, 20 deletions

diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index bca25a0c29df..fe3836966a5d 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	paq
-PORTVERSION=	20110518
+PORTVERSION=	20110621
 CATEGORIES=	archivers
 MASTER_SITES=	http://mattmahoney.net/dc/ LOCAL/bf/paq/
-DISTFILES=	libzpaq.202a.zip unzp.100.zip zp.102.zip zpaq.205.zip zpipe.201.zip
+DISTFILES=	libzpaq.202a.zip wbpe110.zip zp.103.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 unzp zp -d ${WRKDIR}
+EXTRACT_AFTER_ARGS=	-x *.bat *.exe readme.txt zp -d ${WRKDIR}
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 
@@ -42,16 +42,16 @@ LICENSE_COMB=	multi
 CFLAGS+=	-DNDEBUG
 .endif
 
-UNZPFLAGS=	-DOPT="\"${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} \
-		-I${PREFIX}/include \$$1.cpp ${PREFIX}/lib/zpaq/unzp.o \
+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(NOPORTDOCS)
-PORTDOCS=	libzpaq.cpp libzpaqo.cpp unzp.cpp zp.cpp zpaq.cpp \
-		zpaq1.pdf zpipe.cpp
+PORTDOCS=	libzpaq.cpp libzpaqo.cpp readme_zp.txt wbpe.cpp zp.cpp \
+		zpaq.cpp zpaq1.pdf zpipe.cpp
 .endif
 
 .if !defined(NOPORTDATA)
@@ -93,14 +93,14 @@ do-build:
 	${CXX} ${CXXFLAGS} zpsfx.cpp libzpaq.cpp libzpaqo.cpp -o zpsfx)
 .endif
 	@(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} 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 unzp.cpp; \
+	${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} -c libzpaq.cpp; \
+	${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} -DNOOPT -c zp.cpp; \
 	${CXX} ${CXXFLAGS} -c zpaq.cpp; \
 	for page in ${MAN1} ${MAN3}; \
 	do pod2man $${page}.pod > $${page}; done)
@@ -108,11 +108,11 @@ do-build:
 do-install:
 	@${MKDIR} ${PREFIX}/bin ${PREFIX}/include ${PREFIX}/lib/zpaq \
 	${MANPREFIX}/man/man1 ${MANPREFIX}/man/man3
-.for prog in unzp zp zpaq zpipe
+.for prog in wbpe zp zpaq zpipe
 	@${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${PREFIX}/include
-.for obj in  libzpaq.o unzp.o zpaq.o
+.for obj in libzpaq.o zp.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 f91d298d5cb8..f84a8de6df95 100644
--- a/archivers/paq/distinfo
+++ b/archivers/paq/distinfo
@@ -1,9 +1,9 @@
 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/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
diff --git a/archivers/paq/pkg-plist b/archivers/paq/pkg-plist
index 692925b6f1db..86316b85ba9c 100644
--- a/archivers/paq/pkg-plist
+++ b/archivers/paq/pkg-plist
@@ -4,12 +4,12 @@
 %%PORTDATA%%bin/exe_jo
 %%PORTDATA%%bin/jpeg_jo
 %%PORTDATA%%bin/lzppre
-bin/unzp
+bin/wbpe
 bin/zp
 bin/zpaq
 bin/zpipe
 include/libzpaq.h
 lib/zpaq/libzpaq.o
-lib/zpaq/unzp.o
+lib/zpaq/zp.o
 lib/zpaq/zpaq.o
 @dirrm lib/zpaq