From nobody Tue Oct 18 05:06:28 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ms1zm5dRtz4g2R6; Tue, 18 Oct 2022 05:06:28 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ms1zm5Gy0z3Wq6; Tue, 18 Oct 2022 05:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666069588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xgrh0+Dcr/P4iAEK4cgOQMDrVv8UQWLspGpY/NocIFM=; b=b+2U2BnNT9YI433LVgV/1vCbP/xMXxsvqTta0TACaOQls1AtLrJycHRvqfMf7YaM+M6USQ RvkdgO0RKO3QqIPVHcgOLjwTrF7422hspyRab8ZUsXiHA7kt2NVPfTuWlIkAWWVsbQJ69+ C0+WZjaOd8tQXkNpUlZo4k412V7/t/JdnkQV0KTM2t/Zlq94UcPNFW795GKCHb/sEjSRWL N/XNqT0iMvq/BsZpTtHi8GO0gP+gkbeYxeb+RbumExPWFGRCNkicfxWHxBoxJ3DFnDIo2t DbIjL/RMOw/yrnehDEshdJOiRSyg6kEvi0QXCi4Fdvv7Q9K+zaVssDv8T/AKEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ms1zm4HgZz14N8; Tue, 18 Oct 2022 05:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29I56SUW023193; Tue, 18 Oct 2022 05:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I56SQl023192; Tue, 18 Oct 2022 05:06:28 GMT (envelope-from git) Date: Tue, 18 Oct 2022 05:06:28 GMT Message-Id: <202210180506.29I56SQl023192@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 98e169c3d94f - main - devel/schilybase: update to 2022-10-16 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98e169c3d94fadcba5838d18f32b65d884a0750d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666069588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xgrh0+Dcr/P4iAEK4cgOQMDrVv8UQWLspGpY/NocIFM=; b=fU8mVbNDqpGh/RClX0veBZr/X81dGeCuqouO7yQPjfw5kIwkxCBBYu4lAOA6QZUY8Oq3oN LrfS6iDhF+eeY4slIITjgqZMWpagLSADsDQMc5qNVWcfY3GknDMZgxdirJRmgWv8MjJtj/ YAs+i+MgKxMFs/OA7aUFBoZ2WwFcTA4a1mZYwDXoZle7dC0D04biPzCgJTnAtiKGXpXuz7 jrWQGI0Kp8c3rEOjewuSSUc9Gtxst95uvKgL0R7l/mFN28rVL6sV7v198P+qiHaRlj8HlV eHGLxPBL/zoMsyFedmxe7yYVCCIMZpcKZAd3TjiDeq+82dD87FZs1gBYhUopGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666069588; a=rsa-sha256; cv=none; b=WVL8Ko62zOqHmI2o3T2LB3PoJdGR13wqIPXA/mZdCm8yUyypeTtK8uOto9fgP69bM3AMjW XhrPKyN4NJ0goLzUVSEXFamUdAg8TDzyehngOr+PPE6TYiVfqOB3bzxz4MWhXmT5Kg/AIs CHx2w74kj9mCNRvqp9AfkFFyKNtxZ5tr2MIV7bJ/wjIf1TZ4PzWKizzrI4jG3aGPYRLlrk ilJ7vS/4qSoK/eCR+rvgaKiF1xOSkmqOJ16lxlgUg8iGPsmNEoX4WnFmSHzIt/CfRtz4oD qtBRV0mTHOb4iwBwLRToiw6NVCyLkovRvYNqRg1z1C44AEDFTbqm+yHh5djc8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=98e169c3d94fadcba5838d18f32b65d884a0750d commit 98e169c3d94fadcba5838d18f32b65d884a0750d Author: Robert Clausecker AuthorDate: 2022-10-17 17:45:49 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-18 05:02:38 +0000 devel/schilybase: update to 2022-10-16 ChangeLog: http://fuz.su/pub/schilytools/AN-2022-10-16.txt This commit creates a new port archivers/tartest splitted off from archivers/star. misc/schilytools depends now on this new port. PR: 267131 Reported by: fuz@fuz.su (maintainer) --- UPDATING | 7 ++ archivers/Makefile | 1 + archivers/star/Makefile | 8 +- archivers/star/pkg-plist | 58 ----------- archivers/tartest/Makefile | 14 +++ archivers/tartest/pkg-descr | 11 +++ archivers/tartest/pkg-plist | 109 +++++++++++++++++++++ devel/schilybase/Makefile | 6 +- devel/schilybase/Makefile.master | 6 +- devel/schilybase/distinfo | 6 +- .../files/patch-RULES_i386-freebsd-clang.rul | 24 ----- .../files/patch-RULES_i386-freebsd-gcc.rul | 24 ----- devel/schilybase/files/patch-btcflash_btcflash.1 | 2 +- devel/schilybase/files/patch-cdrecord_cdrecord.1 | 8 +- devel/schilybase/files/patch-mkisofs_mkisofs.8 | 20 ---- devel/schilybase/files/patch-obosh_obosh.1 | 90 +++++++++++++++++ devel/schilybase/files/patch-pbosh_pbosh.1 | 6 ++ devel/schilybase/files/patch-readcd_readcd.1 | 4 +- devel/schilybase/files/patch-scgcheck_scgcheck.1 | 10 +- devel/schilybase/files/patch-sh_jsh.1 | 6 ++ devel/schilybase/files/patch-sh_sh.1 | 27 ++++- devel/schilybase/pkg-plist | 1 - misc/schilytools/Makefile | 7 +- sysutils/schilyutils/Makefile | 2 +- 24 files changed, 298 insertions(+), 159 deletions(-) diff --git a/UPDATING b/UPDATING index 6cce2464aeed..1ef9314bf9ee 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,13 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20221017: + AFFECTS: archivers/star + AUTHOR: fernape@FreeBSD.org + + With the update of devel/schilybase to 2022-10-16 a new port archivers/tartest + has been splitted off from archivers/star. + 20221016: AFFECTS: textproc/apache-solr AUTHOR: mfechner@FreeBSD.org diff --git a/archivers/Makefile b/archivers/Makefile index 868f258f152e..151f5927280f 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -233,6 +233,7 @@ SUBDIR += szip SUBDIR += tar-stream-chunker SUBDIR += tardy + SUBDIR += tartest SUBDIR += thunar-archive-plugin SUBDIR += torrentzip SUBDIR += ucl diff --git a/archivers/star/Makefile b/archivers/star/Makefile index cf35e8beb6fe..16d8c8a4f8e1 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -6,11 +6,9 @@ WWW= http://cdrtools.sourceforge.net/private/star.html PORTDOCS= README* STARvsGNUTAR -OPTIONS_DEFINE+=DOCS GNUTAR TARTEST +OPTIONS_DEFINE+=DOCS GNUTAR OPTIONS_SUB= yes GNUTAR_DESC= Install a gnutar binary -TARTEST_DESC= Install tartest and test scripts -TARTEST_VARS= COMPONENTS+=tartest MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= mt \ @@ -19,4 +17,8 @@ COMPONENTS= mt \ star_sym \ strar +# these are shipped in archivers/tartest +post-install: + ${RM} -r ${STAGEDIR}${DOCSDIR}/testscripts + .include "${MASTERDIR}/Makefile.master" diff --git a/archivers/star/pkg-plist b/archivers/star/pkg-plist index 13412844490e..b070681f84ab 100644 --- a/archivers/star/pkg-plist +++ b/archivers/star/pkg-plist @@ -6,68 +6,11 @@ bin/star bin/star_sym bin/strar bin/suntar -%%TARTEST%%bin/tartest bin/ustar etc/default/srmt etc/default/star sbin/srmt share/doc/srmt/default-srmt.sample -%%TARTEST%%share/doc/star/testscripts/00INDEX -%%TARTEST%%share/doc/star/testscripts/100char_longlink.tar -%%TARTEST%%share/doc/star/testscripts/100char_longlink.tar-non-compliant -%%TARTEST%%share/doc/star/testscripts/README.GNUtar-multivol.fail -%%TARTEST%%share/doc/star/testscripts/README.create-and-remove -%%TARTEST%%share/doc/star/testscripts/README.gtarfail -%%TARTEST%%share/doc/star/testscripts/README.largefiles -%%TARTEST%%share/doc/star/testscripts/README.longnames -%%TARTEST%%share/doc/star/testscripts/README.paxbug -%%TARTEST%%share/doc/star/testscripts/README.quicktest -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test2.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test3.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test4.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test5.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test2.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test3.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test4.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test5.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-test.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-test2.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-test3.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-test4.tar.gz -%%TARTEST%%share/doc/star/testscripts/acl-test5.tar.gz -%%TARTEST%%share/doc/star/testscripts/create-and-remove.tar -%%TARTEST%%share/doc/star/testscripts/dirloop.tar -%%TARTEST%%share/doc/star/testscripts/g-hdr.pax.gz -%%TARTEST%%share/doc/star/testscripts/gnu-multi-fail-volume1.gtar -%%TARTEST%%share/doc/star/testscripts/gnu-multi-fail-volume2.gtar -%%TARTEST%%share/doc/star/testscripts/gtarfail.tar -%%TARTEST%%share/doc/star/testscripts/gtarfail2.tar -%%TARTEST%%share/doc/star/testscripts/long.ustar.gz -%%TARTEST%%share/doc/star/testscripts/longpath.tar.bz2 -%%TARTEST%%share/doc/star/testscripts/mk -%%TARTEST%%share/doc/star/testscripts/mk2 -%%TARTEST%%share/doc/star/testscripts/not_a_tar_file -%%TARTEST%%share/doc/star/testscripts/not_a_tar_file1 -%%TARTEST%%share/doc/star/testscripts/not_a_tar_file2 -%%TARTEST%%share/doc/star/testscripts/not_a_tar_file3 -%%TARTEST%%share/doc/star/testscripts/old-file.tar -%%TARTEST%%share/doc/star/testscripts/pax-big-10g.tar.bz2 -%%TARTEST%%share/doc/star/testscripts/pax-rename.tar.gz -%%TARTEST%%share/doc/star/testscripts/quicktest.filelist -%%TARTEST%%share/doc/star/testscripts/remove.tar -%%TARTEST%%share/doc/star/testscripts/tartest-quicktest.out -%%TARTEST%%share/doc/star/testscripts/types-star-oldsparse.tar.gz -%%TARTEST%%share/doc/star/testscripts/typescript -%%TARTEST%%share/doc/star/testscripts/ustar-all-filetypes.tar -%%TARTEST%%share/doc/star/testscripts/ustar-all-quicktest-past-contig.tar -%%TARTEST%%share/doc/star/testscripts/ustar-all-quicktest.tar -%%TARTEST%%share/doc/star/testscripts/ustar-all-quicktest.tar-without-cont-file -%%TARTEST%%share/doc/star/testscripts/ustar-bad-filetypes.tar -%%TARTEST%%share/doc/star/testscripts/ustar-bad-signedsum.tar -%%TARTEST%%share/doc/star/testscripts/ustar-big-2g.tar.bz2 -%%TARTEST%%share/doc/star/testscripts/ustar-big-8g.tar.bz2 %%GNUTAR%%share/man/man1/gnutar.1.gz share/man/man1/srmt.1.gz share/man/man1/scpio.1.gz @@ -77,6 +20,5 @@ share/man/man1/star.1.gz share/man/man1/star_sym.1.gz share/man/man1/strar.1.gz share/man/man1/suntar.1.gz -%%TARTEST%%share/man/man1/tartest.1.gz share/man/man1/ustar.1.gz share/man/man5/star.5.gz diff --git a/archivers/tartest/Makefile b/archivers/tartest/Makefile new file mode 100644 index 000000000000..90e00461f5c7 --- /dev/null +++ b/archivers/tartest/Makefile @@ -0,0 +1,14 @@ +PORTNAME= tartest +CATEGORIES= archivers devel + +COMMENT= Test tar archive for POSIX.1-1990 compliance +WWW= https://schilytools.sourceforge.net/ + +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= tartest + +post-install: + ${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/star + cd ${WRKSRC}/star && ${COPYTREE_SHARE} testscripts ${STAGEDIR}/${PREFIX}/share/doc/star/ + +.include "${MASTERDIR}/Makefile.master" diff --git a/archivers/tartest/pkg-descr b/archivers/tartest/pkg-descr new file mode 100644 index 000000000000..5f0d8b4cd1f1 --- /dev/null +++ b/archivers/tartest/pkg-descr @@ -0,0 +1,11 @@ +Tartest reads a tar archive from stdin +and checks this archive for compliance with POSIX.1-1990. + +As tartest is limited to tests the data that is delivered by the tar +archiver that is going to be checked, it cannot tests if the tar +archiver in question will produce correct archives under all +circumstances. There may be borderline cases that trigger bugs in the +tar archiver. + +This port also contains the various test scripts belonging to +archivers/star. diff --git a/archivers/tartest/pkg-plist b/archivers/tartest/pkg-plist new file mode 100644 index 000000000000..6d6e4ececf2e --- /dev/null +++ b/archivers/tartest/pkg-plist @@ -0,0 +1,109 @@ +bin/tartest +share/doc/star/testscripts/00INDEX +share/doc/star/testscripts/100char_longlink.tar +share/doc/star/testscripts/100char_longlink.tar-non-compliant +share/doc/star/testscripts/README.GNUtar-multivol.fail +share/doc/star/testscripts/README.create-and-remove +share/doc/star/testscripts/README.gtarfail +share/doc/star/testscripts/README.largefiles +share/doc/star/testscripts/README.longnames +share/doc/star/testscripts/README.paxbug +share/doc/star/testscripts/README.quicktest +share/doc/star/testscripts/acl-nfsv4-compact-test.tar.gz +share/doc/star/testscripts/acl-nfsv4-compact-test2.tar.gz +share/doc/star/testscripts/acl-nfsv4-compact-test3.tar.gz +share/doc/star/testscripts/acl-nfsv4-compact-test4.tar.gz +share/doc/star/testscripts/acl-nfsv4-compact-test5.tar.gz +share/doc/star/testscripts/acl-nfsv4-test.tar.gz +share/doc/star/testscripts/acl-nfsv4-test2.tar.gz +share/doc/star/testscripts/acl-nfsv4-test3.tar.gz +share/doc/star/testscripts/acl-nfsv4-test4.tar.gz +share/doc/star/testscripts/acl-nfsv4-test5.tar.gz +share/doc/star/testscripts/acl-test.tar.gz +share/doc/star/testscripts/acl-test2.tar.gz +share/doc/star/testscripts/acl-test3.tar.gz +share/doc/star/testscripts/acl-test4.tar.gz +share/doc/star/testscripts/acl-test5.tar.gz +share/doc/star/testscripts/create-and-remove.tar +share/doc/star/testscripts/dirloop.tar +share/doc/star/testscripts/g-hdr.pax.gz +share/doc/star/testscripts/gnu-multi-fail-volume1.gtar +share/doc/star/testscripts/gnu-multi-fail-volume2.gtar +share/doc/star/testscripts/gtarfail.tar +share/doc/star/testscripts/gtarfail2.tar +share/doc/star/testscripts/long.ustar.gz +share/doc/star/testscripts/longpath.tar.bz2 +share/doc/star/testscripts/mk +share/doc/star/testscripts/mk2 +share/doc/star/testscripts/not_a_tar_file +share/doc/star/testscripts/not_a_tar_file1 +share/doc/star/testscripts/not_a_tar_file2 +share/doc/star/testscripts/not_a_tar_file3 +share/doc/star/testscripts/old-file.tar +share/doc/star/testscripts/pax-big-10g.tar.bz2 +share/doc/star/testscripts/pax-rename.tar.gz +share/doc/star/testscripts/quicktest.filelist +share/doc/star/testscripts/remove.tar +share/doc/star/testscripts/tar-test-inputs/file-size/12-digit.tar.bz2 +share/doc/star/testscripts/tar-test-inputs/file-size/ZIPBOMB-WARNING +share/doc/star/testscripts/tar-test-inputs/file-size/gnu.tar.bz2 +share/doc/star/testscripts/tar-test-inputs/file-size/pax.tar.bz2 +share/doc/star/testscripts/tar-test-inputs/format-acceptance/gnu-g.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/gnu.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/pax.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/star.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/suntar.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/ustar-pre-posix.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/ustar.tar +share/doc/star/testscripts/tar-test-inputs/format-acceptance/v7.tar +share/doc/star/testscripts/tar-test-inputs/large-mtime/12-digit.tar +share/doc/star/testscripts/tar-test-inputs/large-mtime/gnu.tar +share/doc/star/testscripts/tar-test-inputs/large-mtime/pax.tar +share/doc/star/testscripts/tar-test-inputs/long-paths/gnu.tar +share/doc/star/testscripts/tar-test-inputs/long-paths/pax.tar +share/doc/star/testscripts/tar-test-inputs/long-paths/star.tar +share/doc/star/testscripts/tar-test-inputs/long-paths/ustar.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/exustar-1.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/exustar-2.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/gnu-1.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/gnu-2.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/gnupax-1.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/gnupax-2.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/xstar-1.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/xstar-2.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/xustar-1.tar +share/doc/star/testscripts/tar-test-inputs/multi-volume/xustar-2.tar +share/doc/star/testscripts/tar-test-inputs/negative-mtime/gnu.tar +share/doc/star/testscripts/tar-test-inputs/negative-mtime/pax.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/gnu-small.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/gnu.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/pax-gnu0-0.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/pax-gnu0-1.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/pax-gnu1-0.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/star.tar +share/doc/star/testscripts/tar-test-inputs/sparse-files/xstar.tar +share/doc/star/testscripts/tar-test-inputs/user-group-largenum/8-digit.tar +share/doc/star/testscripts/tar-test-inputs/user-group-largenum/gnu.tar +share/doc/star/testscripts/tar-test-inputs/user-group-largenum/pax.tar +share/doc/star/testscripts/tar-test-inputs/user-group-name/pax.tar +share/doc/star/testscripts/tar-test-inputs/user-group-name/ustar-32chars.tar +share/doc/star/testscripts/tar-test-inputs/volume-label/gnu.tar +share/doc/star/testscripts/tar-test-inputs/volume-label/pax.tar +share/doc/star/testscripts/tar-test-inputs/volume-label/star.tar +share/doc/star/testscripts/tar-test-inputs/xattr/acl.tar +share/doc/star/testscripts/tar-test-inputs/xattr/fflags-libarchive.tar +share/doc/star/testscripts/tar-test-inputs/xattr/fflags-schily.tar +share/doc/star/testscripts/tar-test-inputs/xattr/xattr-libarchive.tar +share/doc/star/testscripts/tar-test-inputs/xattr/xattr-schily.tar +share/doc/star/testscripts/tartest-quicktest.out +share/doc/star/testscripts/types-star-oldsparse.tar.gz +share/doc/star/testscripts/typescript +share/doc/star/testscripts/ustar-all-filetypes.tar +share/doc/star/testscripts/ustar-all-quicktest-past-contig.tar +share/doc/star/testscripts/ustar-all-quicktest.tar +share/doc/star/testscripts/ustar-all-quicktest.tar-without-cont-file +share/doc/star/testscripts/ustar-bad-filetypes.tar +share/doc/star/testscripts/ustar-bad-signedsum.tar +share/doc/star/testscripts/ustar-big-2g.tar.bz2 +share/doc/star/testscripts/ustar-big-8g.tar.bz2 +share/man/man1/tartest.1.gz diff --git a/devel/schilybase/Makefile b/devel/schilybase/Makefile index 13ffe3a1be59..aa4702c09cc5 100644 --- a/devel/schilybase/Makefile +++ b/devel/schilybase/Makefile @@ -38,7 +38,7 @@ COMPONENTS= conf \ libsiconv/tables \ libstreamar \ man \ - man/man4 + man/man5 post-patch-PROFILE-off: @${ECHO_MSG} '=> Patching Makefiles to disable profiled libraries' @@ -52,6 +52,10 @@ _LANGUAGES= C af am ar be bg ca cs da de el en es et eu fi fr ga he hi hr \ hu hy is it ja kk ko lt lv mn nb nl nn pl pt ro ru se sk sl sr \ sv tr uk zh +post-install: + # this is just a copy of the FreeBSD termcap file, no need to ship it again. + ${RM} ${STAGEDIR}${PREFIX}/etc/termcap + post-install-NLS-on: @${ECHO_MSG} '=> installing dummy message catalogues' ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES diff --git a/devel/schilybase/Makefile.master b/devel/schilybase/Makefile.master index 106bbdeb78b4..faaebea67866 100644 --- a/devel/schilybase/Makefile.master +++ b/devel/schilybase/Makefile.master @@ -1,5 +1,7 @@ -DISTVERSION= 2022-09-18 -MASTER_SITES= http://fuz.su/pub/schilytools/ +DISTVERSION= 2022-10-16 +MASTER_SITES= http://fuz.su/pub/schilytools/ \ + https://schilytools.pkgsrc.pub/pub/schilytools/ \ + https://mirrors.dotsrc.org/schilytools/ DISTNAME= schily-${DISTVERSION} MAINTAINER= fuz@fuz.su diff --git a/devel/schilybase/distinfo b/devel/schilybase/distinfo index f74a6d54612b..f1b3705ce2db 100644 --- a/devel/schilybase/distinfo +++ b/devel/schilybase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663463867 -SHA256 (schily-2022-09-18.tar.bz2) = 73aab13a15bfb4e2a418a7602365a914ed5f5bc782d8aef21580195e1e5e5b65 -SIZE (schily-2022-09-18.tar.bz2) = 4878648 +TIMESTAMP = 1665936453 +SHA256 (schily-2022-10-16.tar.bz2) = ce82ed7c2e634380b7db835c3c4a44db9c79a10bd8bd75b3eb8873d292484b66 +SIZE (schily-2022-10-16.tar.bz2) = 4864898 diff --git a/devel/schilybase/files/patch-RULES_i386-freebsd-clang.rul b/devel/schilybase/files/patch-RULES_i386-freebsd-clang.rul deleted file mode 100644 index 2fa91bea4bd6..000000000000 --- a/devel/schilybase/files/patch-RULES_i386-freebsd-clang.rul +++ /dev/null @@ -1,24 +0,0 @@ ---- RULES/i386-freebsd-clang.rul.orig 2022-07-05 01:45:06 UTC -+++ RULES/i386-freebsd-clang.rul -@@ -38,4 +38,21 @@ LIB_KVM= - - #LDOPTS= $(LIBS_PATH) $(LDPATH) - -+# -+# Sunpro C/C++ run on Solaris and Linux and both have linkers -+# that support mapfiles -+# -+MAPVERS= $(_MAPVERS) # This enables to use mapfiles -+# -+# The GNU linker is buggy and does not like the official order in linker map -+# files for symbol versioning. The following command reverses the order of -+# the version names in the linker map file. -+# -+MAPFILE_POST= | sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | tail -r | tr '@' '\012' -+ -+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) -+#LDOPTS= $(LIBS_PATH) $(LDPATH) -+LDOPTMAP= $(PMAPVERS:%=-Wl,--version-script=%) -+LDOPTDYN= -shared -Wl,-soname,$(TARGET) $(LDOPTMAP) -+ - RANLIB= $(NOECHO)echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib diff --git a/devel/schilybase/files/patch-RULES_i386-freebsd-gcc.rul b/devel/schilybase/files/patch-RULES_i386-freebsd-gcc.rul deleted file mode 100644 index ffc7975e7845..000000000000 --- a/devel/schilybase/files/patch-RULES_i386-freebsd-gcc.rul +++ /dev/null @@ -1,24 +0,0 @@ ---- RULES/i386-freebsd-gcc.rul.orig 2022-07-05 01:45:16 UTC -+++ RULES/i386-freebsd-gcc.rul -@@ -38,4 +38,21 @@ LIB_KVM= - - #LDOPTS= $(LIBS_PATH) $(LDPATH) - -+# -+# Sunpro C/C++ run on Solaris and Linux and both have linkers -+# that support mapfiles -+# -+MAPVERS= $(_MAPVERS) # This enables to use mapfiles -+# -+# The GNU linker is buggy and does not like the official order in linker map -+# files for symbol versioning. The following command reverses the order of -+# the version names in the linker map file. -+# -+MAPFILE_POST= | sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | tail -r | tr '@' '\012' -+ -+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) -+#LDOPTS= $(LIBS_PATH) $(LDPATH) -+LDOPTMAP= $(PMAPVERS:%=-Wl,--version-script=%) -+LDOPTDYN= -shared -Wl,-soname,$(TARGET) $(LDOPTMAP) -+ - RANLIB= $(NOECHO)echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib diff --git a/devel/schilybase/files/patch-btcflash_btcflash.1 b/devel/schilybase/files/patch-btcflash_btcflash.1 index 3b94063221d0..99a534bdc419 100644 --- a/devel/schilybase/files/patch-btcflash_btcflash.1 +++ b/devel/schilybase/files/patch-btcflash_btcflash.1 @@ -4,7 +4,7 @@ login shell. .SH "SEE ALSO" .BR cdrecord (1), --.BR scg (7), +-.BR scg (4), .BR rcmd (3), .BR ssh (1). .SH NOTES diff --git a/devel/schilybase/files/patch-cdrecord_cdrecord.1 b/devel/schilybase/files/patch-cdrecord_cdrecord.1 index 9e3d1c86eaf0..994a8a917d21 100644 --- a/devel/schilybase/files/patch-cdrecord_cdrecord.1 +++ b/devel/schilybase/files/patch-cdrecord_cdrecord.1 @@ -15,14 +15,14 @@ # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. ########################################################################### ---- cdrecord/cdrecord.1.orig 2020-09-03 23:04:33 UTC +--- cdrecord/cdrecord.1.orig 2022-10-16 15:57:08 UTC +++ cdrecord/cdrecord.1 -@@ -3226,8 +3226,6 @@ There must be at least one track per file. +@@ -3228,8 +3228,6 @@ There must be at least one track per file. .SH SEE ALSO .BR cdda2wav (1), .BR readcd (1), --.BR scg (7), --.BR fbk (7), +-.BR scg (4), +-.BR fbk (4), .BR mkisofs (8), .BR rcmd (3), .BR ssh (1). diff --git a/devel/schilybase/files/patch-mkisofs_mkisofs.8 b/devel/schilybase/files/patch-mkisofs_mkisofs.8 deleted file mode 100644 index 98363618ca4a..000000000000 --- a/devel/schilybase/files/patch-mkisofs_mkisofs.8 +++ /dev/null @@ -1,20 +0,0 @@ ---- mkisofs/mkisofs.8.orig 2020-09-04 13:24:04 UTC -+++ mkisofs/mkisofs.8 -@@ -2900,7 +2900,7 @@ but is kept to be compatible with - The format of the - .I magic - file is almost identical to the --.BR magic (4) -+.BR magic (5) - file used by the Linux - .BR file (1) - command - the routines for reading and decoding the -@@ -2939,7 +2939,7 @@ l l l l . - .TE - .PP - The format of the file is described in the --.BR magic (4) -+.BR magic (5) - man page. The only difference here is that for each entry in the magic file, the - .I message - for the initial offset diff --git a/devel/schilybase/files/patch-obosh_obosh.1 b/devel/schilybase/files/patch-obosh_obosh.1 new file mode 100644 index 000000000000..f2d14e29a260 --- /dev/null +++ b/devel/schilybase/files/patch-obosh_obosh.1 @@ -0,0 +1,90 @@ +--- obosh/obosh.1.orig 2022-10-16 15:57:08 UTC ++++ obosh/obosh.1 +@@ -65,30 +65,16 @@ sh, obosh, jsh \- standard and job control shell and c + .SH SYNOPSIS + .LP + .nf +-.B /usr/bin/sh\c +-.RB " [" \(miacefhikmnprstuvxP "] ["\c +-.IR argument ]... +-.fi +- +-.LP +-.nf +-.B /usr/bin/obosh\c ++.B obosh\c + .RB " [" \(miacefhikmnprstuvxP "] ["\c + .IR argument ]... + .fi + +-.LP +-.nf +-.B /usr/bin/jsh\c +-.RB " [" \(miacefhikmnprstuvxP "] ["\c +-.IR argument ]... +-.fi +- + .SH DESCRIPTION + .sp + .LP + The +-.B /usr/bin/sh ++.B obosh + utility is a command programming language that + executes commands read from a terminal or a file. + .LP +@@ -98,16 +84,7 @@ permits one to call this implementation even when + .B /usr/bin/sh + has been linked to another shell. + .LP +-The +-.B jsh +-utility is an interface to the shell that provides all of the +-functionality of +-.B sh +-and enables job control (see +-.B Job Control +-section below). +-Job control may also be enabled by calling the shell via the standard name +-and then calling ++Job control may be enabled by calling + .BR "set\ \-m" . + .sp + .LP +@@ -150,7 +127,7 @@ commands are initially read from + if such files exist. + Thereafter, commands are read as described below, which is also the case + when the shell is invoked as +-.BR /usr/bin/sh . ++.BR obosh . + + .SH OPTIONS + The options below are +@@ -3405,7 +3382,7 @@ The location of the restricted Bourne Shell binary. + See + .BR attributes (7) + for descriptions of the following attributes: +-.SS "/usr/bin/sh, /usr/bin/jsh" ++.SS "obosh" + .sp + + .sp +@@ -3439,9 +3416,6 @@ CSIEnabled + .BR login (1), + .BR newgrp (1), + .BR pbosh (1), +-.BR pfsh (1), +-.BR pfexec (1), +-.BR privileges (7), + .BR ps (1), + .BR pwd (1), + .BR set (1), +@@ -3468,8 +3442,6 @@ CSIEnabled + .BR profile (5), + .BR attributes (7), + .BR environ (7), +-.BR largefile (7), +-.BR XPG4 (7) + .hy 1 + .SH WARNINGS + .sp diff --git a/devel/schilybase/files/patch-pbosh_pbosh.1 b/devel/schilybase/files/patch-pbosh_pbosh.1 new file mode 100644 index 000000000000..be962012d7f1 --- /dev/null +++ b/devel/schilybase/files/patch-pbosh_pbosh.1 @@ -0,0 +1,6 @@ +--- pbosh/pbosh.1.orig 2022-09-24 00:18:51 UTC ++++ pbosh/pbosh.1 +@@ -1,2 +1,2 @@ +-.so man1/sh.1 ++.so man1/bosh.1 + .\" "@(#)pbosh.1 1.1 18/06/26 " diff --git a/devel/schilybase/files/patch-readcd_readcd.1 b/devel/schilybase/files/patch-readcd_readcd.1 index fb1729d7537f..efc60f2bda37 100644 --- a/devel/schilybase/files/patch-readcd_readcd.1 +++ b/devel/schilybase/files/patch-readcd_readcd.1 @@ -21,8 +21,8 @@ .SH SEE ALSO .BR cdrecord (1), .BR mkisofs (8), --.BR scg (7), --.BR fbk (7), +-.BR scg (4), +-.BR fbk (4), .BR rcmd (3), .BR ssh (1). diff --git a/devel/schilybase/files/patch-scgcheck_scgcheck.1 b/devel/schilybase/files/patch-scgcheck_scgcheck.1 index ed501f6d29ec..28282260b526 100644 --- a/devel/schilybase/files/patch-scgcheck_scgcheck.1 +++ b/devel/schilybase/files/patch-scgcheck_scgcheck.1 @@ -15,15 +15,13 @@ # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. ########################################################################### ---- scgcheck/scgcheck.1.orig 2016-01-26 21:48:54 UTC +--- scgcheck/scgcheck.1.orig 2022-10-16 15:57:08 UTC +++ scgcheck/scgcheck.1 -@@ -276,8 +276,7 @@ Specify the log file to be used instead - .SH SEE ALSO +@@ -276,7 +276,6 @@ Specify the log file to be used instead of .BR cdrecord (1), .BR readcd (1), --.BR mkisofs (1), --.BR scg (7). -+.BR mkisofs (8). + .BR mkisofs (1), +-.BR scg (4). .SH NOTES .PP diff --git a/devel/schilybase/files/patch-sh_jsh.1 b/devel/schilybase/files/patch-sh_jsh.1 new file mode 100644 index 000000000000..3c26514fcada --- /dev/null +++ b/devel/schilybase/files/patch-sh_jsh.1 @@ -0,0 +1,6 @@ +--- sh/jsh.1.orig 2022-09-24 00:17:51 UTC ++++ sh/jsh.1 +@@ -1,2 +1,2 @@ +-.so man1/sh.1 ++.so man1/bosh.1 + .\" "@(#)jsh.1 1.1 10/05/12 " diff --git a/devel/schilybase/files/patch-sh_sh.1 b/devel/schilybase/files/patch-sh_sh.1 index adf3590e5f77..71cda93dab82 100644 --- a/devel/schilybase/files/patch-sh_sh.1 +++ b/devel/schilybase/files/patch-sh_sh.1 @@ -1,8 +1,8 @@ ---- sh/sh.1.orig 2022-09-18 01:03:28 UTC +--- sh/sh.1.orig 2022-10-16 15:57:08 UTC +++ sh/sh.1 @@ -61,32 +61,25 @@ .if n .ds s sz - .TH sh 1 "2022/09/11" "Schily Bourne Shell" "User Commands" + .TH sh 1 "2022/10/06" "Schily Bourne Shell" "User Commands" .SH NAME -sh, bosh, jsh \- standard and job control shell and command interpreter +sh, bosh, jbosh \- standard and job control shell and command interpreter @@ -134,10 +134,29 @@ .sp @@ -8476,7 +8469,7 @@ The location of the restricted Bourne Shell binary. See - .BR attributes (5) + .BR attributes (7) for descriptions of the following attributes: -.SS "/usr/bin/sh, /usr/bin/jsh" -+.SS "sh, jbosh" ++.SS "bosh, jbosh" .sp .sp +@@ -8509,9 +8502,6 @@ CSIEnabled + .BR ksh93 (1), + .BR login (1), + .BR newgrp (1), +-.BR pfsh (1), +-.BR pfexec (1), +-.BR privileges (7), + .BR ps (1), + .BR pwd (1), + .BR set (1), +@@ -8541,8 +8531,6 @@ CSIEnabled + .BR profile (5), + .BR attributes (7), + .BR environ (7), +-.BR largefile (7), +-.BR XPG4 (7) + .hy 1 + .SH WARNINGS + .sp diff --git a/devel/schilybase/pkg-plist b/devel/schilybase/pkg-plist index b6ca6be4d089..8c6c0c840f08 100644 --- a/devel/schilybase/pkg-plist +++ b/devel/schilybase/pkg-plist @@ -1,4 +1,3 @@ -etc/termcap include/scg/aspi-dos.h include/scg/aspi-win32.h include/scg/scgcmd.h diff --git a/misc/schilytools/Makefile b/misc/schilytools/Makefile index 7f1981c9e54d..64bc10da7dea 100644 --- a/misc/schilytools/Makefile +++ b/misc/schilytools/Makefile @@ -1,5 +1,5 @@ PORTNAME= schilytools -DISTVERSION= 2 +DISTVERSION= 3 CATEGORIES= misc MAINTAINER= fuz@fuz.su @@ -13,14 +13,11 @@ RUN_DEPENDS= bosh>=2022.08.18.b:shells/bosh \ sccs>=2021.05.19:devel/sccs \ smake>=2021.05.19:devel/smake \ sunpromake>=2021.05.19:devel/sunpromake \ + tartest>=2022.09.18:archivers/tartest \ ved>=2021.05.19:editors/ved \ cdrtools>=2021.05.19:sysutils/cdrtools \ rscsi>=2021.05.19:net/rscsi USES= metaport -OPTIONS_DEFINE= DEPRECATED -DEPRECATED_DESC= include deprecated utilities -DEPRECATED_RUN_DEPENDS= man2html:textproc/man2html - .include diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile index 7a5d3aa2457b..e35a7299ff48 100644 --- a/sysutils/schilyutils/Makefile +++ b/sysutils/schilyutils/Makefile @@ -6,7 +6,7 @@ WWW= http://schilytools.sourceforge.net/ USES+= perl5 shebangfix USE_PERL5= run -SHEBANG_FILES= man2html/man2html cstyle/cstyle.pl +SHEBANG_FILES= cstyle/cstyle.pl # bin/bsh bin/calc bin/copy bin/count bin/fsdiff CONFLICTS_INSTALL= bsh calc deforaos-browser \