From owner-svn-ports-all@freebsd.org Fri Aug 19 05:07:21 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB1D1BBDF8B; Fri, 19 Aug 2016 05:07:21 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB312189E; Fri, 19 Aug 2016 05:07:21 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7J57L0x040701; Fri, 19 Aug 2016 05:07:21 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7J57KIm040699; Fri, 19 Aug 2016 05:07:20 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201608190507.u7J57KIm040699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 19 Aug 2016 05:07:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420447 - in head/archivers/paq: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 05:07:22 -0000 Author: marino Date: Fri Aug 19 05:07:20 2016 New Revision: 420447 URL: https://svnweb.freebsd.org/changeset/ports/420447 Log: archivers/paq: Fix when DOCS option is OFF No revbump necessary as the port would always fail to build if DOCS option was disabled. PR: 208994 Submitted by: Anton Sayetsky Added: head/archivers/paq/files/patch-zpsfx.cpp - copied unchanged from r420420, head/archivers/paq/files/patch_zpsfx.cpp Deleted: head/archivers/paq/files/patch_zpsfx.cpp Modified: head/archivers/paq/Makefile Modified: head/archivers/paq/Makefile ============================================================================== --- head/archivers/paq/Makefile Fri Aug 19 04:23:33 2016 (r420446) +++ head/archivers/paq/Makefile Fri Aug 19 05:07:20 2016 (r420447) @@ -55,7 +55,6 @@ PORTDOCS+= bwt_.cpp bwtpre.cpp bwtrle.cp exe_jo.cpp jpeg_jo.cpp lzpre.cpp lzppre.cpp readme_bwt.txt \ readme_bwt_j3.txt readme_exe_j1.txt readme_lazy210.txt zpsfx.cpp READMES+= bwt_j3 exe_j1 lazy210 -EXTRA_PATCHES+= ${FILESDIR}/patch_zpsfx.cpp .endif WDATA= bmp_j4.cfg bwt_j3.cfg bwt_slowmode1_1GB_block.cfg \ bwt_slowmode1_256MB_block.cfg bwt_slowmode1_4MB_block.cfg \ Copied: head/archivers/paq/files/patch-zpsfx.cpp (from r420420, head/archivers/paq/files/patch_zpsfx.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/paq/files/patch-zpsfx.cpp Fri Aug 19 05:07:20 2016 (r420447, copy of r420420, head/archivers/paq/files/patch_zpsfx.cpp) @@ -0,0 +1,77 @@ +--- zpsfx.cpp.orig 2016-07-26 12:10:41 UTC ++++ zpsfx.cpp +@@ -16,19 +16,38 @@ Or use appropriate optimization options. + the executable smaller. -DNDEBUG turns off run time checks. + To convert a ZPAQ archive to a self extracting archive: + ++On Windows: ++ + copy/b zpsfx.exe+zpsfx.tag+archive.zpaq archive.exe + ++On FreeBSD(the choice of archive name is discretionary): ++ ++ cat zpsfx zpsfx.tag archive.zpaq > archive.sfx ++ + zpsfx.tag is a 13 byte file used to mark the start of the compressed data + that is appended. Alternatively, zpaq with the "t" modifier will append + the same tag ("a" appends). + ++On Windows: ++ + copy zpsfx.exe archive.exe + zpaq ta archive.exe files... + ++On FreeBSD: ++ ++ cp zpsfx archive.sfx ++ zpaq ta archive.sfx files... ++ + To extract: + ++On Windows: ++ + archive.exe + ++On FreeBSD: ++ ++ archive.sfx ++ + The program reads itself and decompresses the appended archive. + You must enter the .exe extension as shown. If the file is not in + the current folder then you need to specify the path. The PATH environment +@@ -44,7 +63,11 @@ stored filename. SHA-1 checksums are not + #include + #include + #include ++#ifdef unix ++#include ++#else + #include ++#endif + + // An error handler is required as shown in this example. libzpaq will + // call it with an English language message in case of a fatal error. +@@ -96,7 +119,11 @@ struct Buf: public libzpaq::Writer { + + // Return '/' in Linux or '\' in Windows + char slash() { ++#ifdef unix ++ return '/'; ++#else + return '\\'; ++#endif + } + + // Create directories as needed. For example if path="/tmp/foo/bar" +@@ -106,7 +133,11 @@ void makepath(std::string& path) { + for (int i=0; i