Date: Fri, 7 Feb 2014 18:46:21 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343286 - head/archivers/paq Message-ID: <201402071846.s17IkL8C056702@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Fri Feb 7 18:46:21 2014 New Revision: 343286 URL: http://svnweb.freebsd.org/changeset/ports/343286 QAT: https://qat.redports.org/buildarchive/r343286/ Log: Update zpaq to 6.49; use staging Modified: head/archivers/paq/Makefile head/archivers/paq/distinfo Modified: head/archivers/paq/Makefile ============================================================================== --- head/archivers/paq/Makefile Fri Feb 7 18:26:17 2014 (r343285) +++ head/archivers/paq/Makefile Fri Feb 7 18:46:21 2014 (r343286) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= paq -PORTVERSION= 20130926 +PORTVERSION= 20140131 CATEGORIES= archivers MASTER_SITES= http://mattmahoney.net/dc/ LOCAL/bf/paq/ -DISTFILES= wbpe110.zip zpaqd633.zip zpaq642.zip zpipe.201.zip +DISTFILES= wbpe110.zip zpaqd633.zip zpaq649.zip zpipe.201.zip DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTFILES:M*.zip} @@ -15,9 +15,8 @@ COMMENT= Family of archivers with extrem LICENSE= GPLv3 MIT LICENSE_COMB= multi -NO_STAGE= yes -USE_DOS2UNIX= yes USE_ZIP= yes +USES= dos2unix EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt -d ${WRKDIR} NO_WRKSUBDIR= yes @@ -46,11 +45,11 @@ DISTFILES+= bmp_j4c.zip bwt.1.zip bwt_j3 .endif .if ${PORT_OPTIONS:MDOCS} || make(makesum) -DISTFILES+= zpaq1.pdf zpaq202.pdf +DISTFILES+= zpaq1.pdf zpaq202.pdf zpaq203.pdf .endif .if ${PORT_OPTIONS:MDOCS} -PORTDOCS= libzpaq.cpp wbpe.cpp zpaq.cpp zpaq1.pdf zpaq202.pdf zpipe.cpp +PORTDOCS= libzpaq.cpp wbpe.cpp zpaq.cpp zpaq1.pdf zpaq202.pdf zpaq203.pdf zpipe.cpp .endif .if !defined(NOPORTDATA) @@ -75,10 +74,10 @@ USE_GCC= any .endif post-extract: - @${CP} ${_DISTDIR}/zpsfx101.cpp ${WRKSRC}/zpsfx.cpp + @${CP} ${DISTDIR}/${DIST_SUBDIR}/zpsfx101.cpp ${WRKSRC}/zpsfx.cpp .if ${PORT_OPTIONS:MDOCS} .for r in ${READMES} - @${UNZIP_CMD} -pq ${_DISTDIR}/${r}.zip readme.txt > ${WRKSRC}/readme_${r:R}.txt + @${UNZIP_CMD} -pq ${DISTDIR}/${DIST_SUBDIR}/${r}.zip readme.txt > ${WRKSRC}/readme_${r:R}.txt .endfor .endif @@ -107,30 +106,31 @@ do-build: do-install: .for prog in wbpe zpaq zpaqd zpipe - @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin .endfor - @${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${PREFIX}/include + @${INSTALL_DATA} ${WRKSRC}/libzpaq.h ${STAGEDIR}${PREFIX}/include .if !defined(NOPORTDATA) .for prog in bwt_ bwtpre bwtrle exe_jo jpeg_jo lazy2 lzpre lzppre - @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${DATADIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${WDATA} ${DATADIR}; \ - ${INSTALL_LIB} zpsfx ${DATADIR} - @cd ${_DISTDIR}; ${INSTALL_DATA} ${DDATA} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + @cd ${WRKSRC}; ${INSTALL_DATA} ${WDATA} ${STAGEDIR}${DATADIR}; \ + ${INSTALL_LIB} zpsfx ${STAGEDIR}${DATADIR} + @cd ${_DISTDIR}; ${INSTALL_DATA} ${DDATA} ${STAGEDIR}${DATADIR} .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS:N*.pdf} ${DOCSDIR} - @cd ${_DISTDIR}; ${INSTALL_DATA} ${PORTDOCS:M*.pdf} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS:N*.pdf} ${STAGEDIR}${DOCSDIR} + @cd ${DISTDIR}/${DIST_SUBDIR}; ${INSTALL_DATA} ${PORTDOCS:M*.pdf} ${STAGEDIR}${DOCSDIR} .endif - @${CAT} ${PKGMESSAGE} check regression-test test: build .for _f in calgarytest.zpaq calgarytest2.zpaq .for _c in -list -test - ${WRKSRC}/zpaq ${_c} ${_DISTDIR}/${_f} + ${WRKSRC}/zpaq ${_c} ${DISTDIR}/${DIST_SUBDIR}/${_f} .endfor + ${WRKSRC}/zpaq -encrypt ${DISTDIR}/${DIST_SUBDIR}/${_f} -to ${WRKSRC}/encrypted_${_f} password + ${WRKSRC}/zpaq -test ${WRKSRC}/encrypted_${_f} -key password .endfor .include <bsd.port.mk> Modified: head/archivers/paq/distinfo ============================================================================== --- head/archivers/paq/distinfo Fri Feb 7 18:26:17 2014 (r343285) +++ head/archivers/paq/distinfo Fri Feb 7 18:46:21 2014 (r343286) @@ -2,8 +2,8 @@ SHA256 (paq/wbpe110.zip) = 1675083b253e0 SIZE (paq/wbpe110.zip) = 13667 SHA256 (paq/zpaqd633.zip) = bd913f3f843fb9a14a2b015d35d37ac87b56bdb9b9fee71469a3e9ca2a61ef03 SIZE (paq/zpaqd633.zip) = 297885 -SHA256 (paq/zpaq642.zip) = e58a1ca0095ff5ddc1a04cbc7856216430163a8133b8d52863d0faff5f691608 -SIZE (paq/zpaq642.zip) = 581003 +SHA256 (paq/zpaq649.zip) = d6162d40f17649573ca355038ef7b79baf337696f8c14ca58706dcb6519b5767 +SIZE (paq/zpaq649.zip) = 609714 SHA256 (paq/zpipe.201.zip) = e95dfe6f701dd463f969fe16c933ed97fca194bd7aacec37d6c35409766133a8 SIZE (paq/zpipe.201.zip) = 67555 SHA256 (paq/bmp_j4c.zip) = 98fe722a89ac107f637d54bf609673402fa9ede87d19ed68ee28633e64e879a7 @@ -42,3 +42,5 @@ SHA256 (paq/zpaq1.pdf) = dce14a22ddd5111 SIZE (paq/zpaq1.pdf) = 105049 SHA256 (paq/zpaq202.pdf) = 1a4b6f045f3a445d7f64b78c7d8d510bf04ccc658c5cf6ab15a7203856a139f8 SIZE (paq/zpaq202.pdf) = 203352 +SHA256 (paq/zpaq203.pdf) = 63586238f2fbad55e710422d0daed2597d66c5916f2353282517f1e53de04199 +SIZE (paq/zpaq203.pdf) = 207565
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402071846.s17IkL8C056702>