From owner-svn-ports-all@freebsd.org Thu May 21 04:22:52 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2A63B328643; Thu, 21 May 2020 04:22:52 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49SGgc0Fr0z4K7L; Thu, 21 May 2020 04:22:52 +0000 (UTC) (envelope-from ak@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 03F3E27360; Thu, 21 May 2020 04:22:52 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04L4Mpbm054969; Thu, 21 May 2020 04:22:51 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04L4MpuG054967; Thu, 21 May 2020 04:22:51 GMT (envelope-from ak@FreeBSD.org) Message-Id: <202005210422.04L4MpuG054967@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Thu, 21 May 2020 04:22:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536043 - in head/emulators/ods2reader: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: in head/emulators/ods2reader: . files X-SVN-Commit-Revision: 536043 X-SVN-Commit-Repository: ports 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.33 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: Thu, 21 May 2020 04:22:52 -0000 Author: ak Date: Thu May 21 04:22:51 2020 New Revision: 536043 URL: https://svnweb.freebsd.org/changeset/ports/536043 Log: - Fix build on big-endian platforms Reported by: linimon Modified: head/emulators/ods2reader/Makefile head/emulators/ods2reader/files/vmsvlr2unix.sh Modified: head/emulators/ods2reader/Makefile ============================================================================== --- head/emulators/ods2reader/Makefile Thu May 21 04:17:31 2020 (r536042) +++ head/emulators/ods2reader/Makefile Thu May 21 04:22:51 2020 (r536043) @@ -13,9 +13,6 @@ EXTRACT_SUFX= .ZIP MAINTAINER= ak@FreeBSD.org COMMENT= Copies files from VMS Files-11 (ODS2) file systems -BROKEN_FreeBSD_12_powerpc64= fails to build: ods-2-reader.new.c:60:1: error: unterminated #ifdef -BROKEN_FreeBSD_13_powerpc64= fails to build: ods-2-reader.new.c:3:687: error: expected identifier or '(' - USES= zip NO_WRKSUBDIR= yes PLIST_FILES= bin/ods2reader Modified: head/emulators/ods2reader/files/vmsvlr2unix.sh ============================================================================== --- head/emulators/ods2reader/files/vmsvlr2unix.sh Thu May 21 04:17:31 2020 (r536042) +++ head/emulators/ods2reader/files/vmsvlr2unix.sh Thu May 21 04:22:51 2020 (r536043) @@ -17,13 +17,16 @@ fi while true; do off=$((${off} + ${strlen})) - strlen=$(hexdump -s ${off} -n 2 -e '"%u"' ${file}) + # read in 1-byte units + set -- $(od -An -tu1 -j${off} -N2 ${file}) # EoF - [ -z ${strlen} ] && break + [ -z "${1}" -o -z "${2}" ] && break + # assume little-endian, it's OpenVMS format + strlen=$(($2 * 256 + $1)) # print newline for zero-size records, as info-zip does [ ${strlen} -eq 0 ] && echo off=$((${off} + 2)) - hexdump -s ${off} -n ${strlen} -e '1000/1 "%c""\n"' ${file} + hexdump -s ${off} -n ${strlen} -e '"'%.${strlen}s'"''"\n"' ${file} # align 2 [ $((${strlen} % 2)) -ne 0 ] && off=$((${off} + 1)) done