Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Feb 2008 05:28:54 GMT
From:      bf <bf2006a@yahoo.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/121111: [PATCH]archivers/paq: update to 8.o9
Message-ID:  <200802260528.m1Q5Ss87062587@www.freebsd.org>
Resent-Message-ID: <200802260540.m1Q5e1nR055396@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         121111
>Category:       ports
>Synopsis:       [PATCH]archivers/paq: update to 8.o9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 26 05:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        7.0RC3 i386
>Organization:
-
>Environment:
>Description:
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.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN paq.orig/Makefile paq/Makefile
--- paq.orig/Makefile	2007-10-25 22:14:36.000000000 -0400
+++ paq/Makefile	2008-02-26 00:04:26.477289114 -0500
@@ -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 @@
 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 @@
 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 -ruN paq.orig/distinfo paq/distinfo
--- paq.orig/distinfo	2007-10-25 22:14:36.000000000 -0400
+++ paq/distinfo	2008-02-25 23:46:21.155540959 -0500
@@ -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 -ruN paq.orig/files/pkg-message.in paq/files/pkg-message.in
--- paq.orig/files/pkg-message.in	2007-04-10 03:59:10.000000000 -0400
+++ paq/files/pkg-message.in	2008-02-25 23:46:21.140544640 -0500
@@ -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 -ruN paq.orig/pkg-plist paq/pkg-plist
--- paq.orig/pkg-plist	2007-08-27 20:42:53.000000000 -0400
+++ paq/pkg-plist	2008-02-25 23:46:21.166541240 -0500
@@ -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%%


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802260528.m1Q5Ss87062587>