- Update to 8.o9

- Fixes a bug in .bmp detection that caused an infinite loop for files
  with invalid headers. Added grayscale .rgb support
- Also bundle related archivers lpaq8, lpq1, and paq9a, which offer
  faster (de)compression, but may yield larger archives

PR:		ports/121111
Submitted by:	bf <bf2006a yahoo.com> (maintainer)

4 files changed, 50 insertions, 15 deletions

diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index 756c7db1107..0f5af202e09 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -6,25 +6,30 @@
 #
 
 PORTNAME=	paq
-DISTVERSION=	8o8
+DISTVERSION=	8o9
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.cs.fit.edu/~mmahoney/compression/
 DISTNAME=	${PORTNAME}${DISTVERSION}
 
 MAINTAINER=	bf2006a@yahoo.com
-COMMENT=	An archiver with an extremely high compression ratio
+COMMENT=	A family of archivers with extremely high compression ratios
 
+LPAQ=		lpaq8
+LPQ=		lpq1
+PAQ9=		paq9a
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LPAQ}${EXTRACT_SUFX} ${LPQ}${EXTRACT_SUFX} \
+		${PAQ9}${EXTRACT_SUFX}
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 SUB_FILES=	pkg-message
 CPPFILE=	${PORTNAME}${DISTVERSION:C/v.([^\.]*)$/\1/}
-PLIST_SUB=	CPPFILE=${CPPFILE}
+PLIST_SUB+=	CPPFILE=${CPPFILE} LPAQ=${LPAQ}	LPQ=${LPQ} PAQ9=${PAQ9}
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_ASM) && ${ARCH} == "i386" && !defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-CXXFLAGS+=	-DUNIX
+PAQFLAGS+=	-DUNIX
 ASM1?=	nasm -f elf -o
 ASM2?=
 .if !defined(WITH_SSE2)
@@ -35,14 +40,14 @@ ASMFILE=	paq7asmsse
 STRIP=
 .elif !defined(WITHOUT_ASM) && ${ARCH} == "amd64" && !defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
-CXXFLAGS+=	-DUNIX
+PAQFLAGS+=	-DUNIX
 ASM1?=	yasm -f elf64 -o
 ASM2?=	-a x86 -m amd64
 ASMFILE=	paq7asm-x86_64
 STRIP=
 .else
 WITHOUT_ASM=	yes
-CXXFLAGS+=-DUNIX -DNOASM
+PAQFLAGS+=	-DUNIX -DNOASM
 .endif
 
 pre-everything::
@@ -67,22 +72,35 @@ pre-everything::
 do-build:
 .if !defined(WITHOUT_ASM)
 	${ASM1} ${WRKSRC}/${ASMFILE}.o ${ASM2} ${WRKSRC}/${ASMFILE}.asm
-	${CXX} ${WRKSRC}/${CPPFILE}.cpp ${CXXFLAGS} -o ${WRKSRC}/${CPPFILE} ${WRKSRC}/${ASMFILE}.o
+	${CXX} ${WRKSRC}/${CPPFILE}.cpp ${CXXFLAGS} ${PAQFLAGS} -o ${WRKSRC}/${CPPFILE} \
+	${WRKSRC}/${ASMFILE}.o
 .else
-	${CXX} ${WRKSRC}/${CPPFILE}.cpp ${CXXFLAGS} -o ${WRKSRC}/${CPPFILE}
+	${CXX} ${WRKSRC}/${CPPFILE}.cpp ${CXXFLAGS} ${PAQFLAGS} -o ${WRKSRC}/${CPPFILE}
 .endif
+	${CXX} ${WRKSRC}/${LPAQ}.cpp ${CXXFLAGS} -o ${WRKSRC}/${LPAQ}
+	${CXX} ${WRKSRC}/${LPAQ}.cpp ${CXXFLAGS} -DWIKI -o ${WRKSRC}/${LPAQ}e
+	${CXX} ${WRKSRC}/${LPQ}.cpp ${CXXFLAGS} -o ${WRKSRC}/${LPQ}
+	${CXX} ${WRKSRC}/${PAQ9}.cpp ${CXXFLAGS} -o ${WRKSRC}/${PAQ9}
 
 do-install:
 .if !exists(${PREFIX}/bin)
 	${MKDIR} ${PREFIX}/bin
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/${CPPFILE} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${LPAQ} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${LPAQ}e ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${LPQ} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PAQ9} ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 .if !exists(${DOCSDIR})
 	${MKDIR} ${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${WRKSRC}/${CPPFILE}.cpp ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/readme.txt ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${LPAQ}.cpp ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${LPQ}.cpp ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PAQ9}.cpp ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/Readme.txt ${DOCSDIR}/${CPPFILE}_readme.txt
+	${INSTALL_MAN} ${WRKSRC}/readme.txt ${DOCSDIR}/${LPAQ}_readme.txt
 .endif
 	${CAT} ${PKGMESSAGE}
 
diff --git a/archivers/paq/distinfo b/archivers/paq/distinfo
index 7f670436dbc..bf88553aa82 100644
--- a/archivers/paq/distinfo
+++ b/archivers/paq/distinfo
@@ -1,3 +1,12 @@
-MD5 (paq8o8.zip) = 9114ae6a08ca8e82f37df9a6984c968d
-SHA256 (paq8o8.zip) = da36467726d234afd63aa959444cbc148a0b15315fe4a1abd26e15481ad5361d
-SIZE (paq8o8.zip) = 119817
+MD5 (paq8o9.zip) = 29f18f0d9244272c1d392797b9f5e322
+SHA256 (paq8o9.zip) = bf8af685fa4c0e021394eee2e256525a045a3e8b8066e3f6927fccd607c06d02
+SIZE (paq8o9.zip) = 108547
+MD5 (lpaq8.zip) = 16349656a2d3802bc0ccde5a2fa5bb9d
+SHA256 (lpaq8.zip) = ea43474526f13338cbb50ce3fbd974a0d088d77a3b73d42010ad11fb89a498b2
+SIZE (lpaq8.zip) = 43529
+MD5 (lpq1.zip) = d6369d7af064aa171c42d01fe00db8cc
+SHA256 (lpq1.zip) = 909d5cb101ed66e8a74accd2c68687cbf817259bfb3553f0c9b8466dc4f26701
+SIZE (lpq1.zip) = 20143
+MD5 (paq9a.zip) = be299078941bff9b88613191c9b0568d
+SHA256 (paq9a.zip) = a51bafd6433c107ea31e6407ded0970e59d81ffd5e24c235f746ca856ae02c35
+SIZE (paq9a.zip) = 32163
diff --git a/archivers/paq/files/pkg-message.in b/archivers/paq/files/pkg-message.in
index 92e9b1dc7f4..00de8d130ca 100644
--- a/archivers/paq/files/pkg-message.in
+++ b/archivers/paq/files/pkg-message.in
@@ -1,7 +1,7 @@
 *************************************************************************
 
-See %%PREFIX%%/share/doc/paq/readme.txt and the comments at the head of 
-%%PREFIX%%/share/doc/paq/paq8*.cpp for instructions and details on usage
+See %%PREFIX%%/share/doc/paq/*_readme.txt and the comments at the head of 
+%%PREFIX%%/share/doc/paq/*paq*.cpp for instructions and details on usage
 and the algorithms employed.
 
 *************************************************************************
diff --git a/archivers/paq/pkg-plist b/archivers/paq/pkg-plist
index ebc464d23a0..a51680f6f9c 100644
--- a/archivers/paq/pkg-plist
+++ b/archivers/paq/pkg-plist
@@ -1,4 +1,12 @@
 bin/%%CPPFILE%%
+bin/%%LPAQ%%
+bin/%%LPAQ%%e
+bin/%%LPQ%%
+bin/%%PAQ9%%
 %%PORTDOCS%%%%DOCSDIR%%/%%CPPFILE%%.cpp
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%LPAQ%%.cpp
+%%PORTDOCS%%%%DOCSDIR%%/%%LPQ%%.cpp
+%%PORTDOCS%%%%DOCSDIR%%/%%PAQ9%%.cpp
+%%PORTDOCS%%%%DOCSDIR%%/%%CPPFILE%%_readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%LPAQ%%_readme.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%