3 files changed, 16 insertions, 20 deletions

diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index aea6de4100e1..4d9c6b875a00 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	paq
-PORTVERSION=	20111128
+PORTVERSION=	20111221
 CATEGORIES=	archivers
 MASTER_SITES=	http://mattmahoney.net/dc/ LOCAL/bf/paq/
-DISTFILES=	libzpaq400.zip wbpe110.zip zpaq402.zip zpipe.201.zip
+DISTFILES=	libzpaq401.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 \
@@ -45,7 +45,7 @@ MAN3=	libzpaq.3
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if !defined(WITHOUT_OPENMP) && empty(CXX:M*clang++*)
+.if !defined(WITHOUT_OPENMP) && empty(CXX:M*clang*)
 PTHREAD_CFLAGS+=	-fopenmp
 .endif
 
@@ -84,8 +84,6 @@ post-extract:
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' \
-		${WRKSRC}/libzpaq.cpp
 .if !defined(NOPORTDATA)
 	@${REINPLACE_CMD} -e 's|c:\\res\\zpaq\\||' ${WRKSRC}/bwt[12].cfg \
 		${WRKSRC}/bwtrle[12].cfg
diff --git a/archivers/paq/distinfo b/archivers/paq/distinfo
index 5b9f9b6387c3..e501b0007ed5 100644
--- a/archivers/paq/distinfo
+++ b/archivers/paq/distinfo
@@ -1,9 +1,9 @@
-SHA256 (paq/libzpaq400.zip) = 62164c9115c7cfa0030675c89bb57fefa48a3ee1b388bb724afd365d82bb7179
-SIZE (paq/libzpaq400.zip) = 48738
+SHA256 (paq/libzpaq401.zip) = 81e672750fbdfe7ad63149a30dc405eefd776ffca26e5a46ab36fcb78b6abc80
+SIZE (paq/libzpaq401.zip) = 48509
 SHA256 (paq/wbpe110.zip) = 1675083b253e04ba7dd7cd28b2f7be179b3f5c1bb4d5289be4cfa217c6bc9b27
 SIZE (paq/wbpe110.zip) = 13667
-SHA256 (paq/zpaq402.zip) = 1311250b53063cd0306a5e2afdb43aabac7706273b6548bb4c54bea91ee017ce
-SIZE (paq/zpaq402.zip) = 44377
+SHA256 (paq/zpaq403.zip) = 46cc36e1d2094464c3929de444b5ce25aab0ea3e07484d69dd220e708df83dda
+SIZE (paq/zpaq403.zip) = 45762
 SHA256 (paq/zpipe.201.zip) = 5add2f6fe2425ccfda401cfbbd3b873fa31e371dca3a6a0a3c2158859e1bfeab
 SIZE (paq/zpipe.201.zip) = 66484
 SHA256 (paq/bmp_j4a.zip) = 6b314e518f5b9ceffdac183229ddf74e6b5a0f4ef0e47181f652bf46e55de03c
diff --git a/archivers/paq/files/pkg-message.in b/archivers/paq/files/pkg-message.in
index 8c58e83aa08f..f9698a1ac0e0 100644
--- a/archivers/paq/files/pkg-message.in
+++ b/archivers/paq/files/pkg-message.in
@@ -1,11 +1,9 @@
-*************************************************************************
-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.
-************************************************************************
+***************************************************************************
+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 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.
+***************************************************************************