From nobody Mon Sep 19 15:37:59 2022 X-Original-To: dev-commits-ports-main@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 4MWTMq5xWnz4dC4v; Mon, 19 Sep 2022 15:37:59 +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 4MWTMq5Y8kz3W3N; Mon, 19 Sep 2022 15:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663601879; 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=ZUHPov6Dld32ygiEw6dt7VRUqofMfofDTzjqz0Wg9DA=; b=AK+/KZsLVsaifSxT3eQWLcP9VWO9NG7E7aBTWrEYry0GtH71lK/AXYcY2v5e4e4+xwKgPq 1DZk1sEnrARoNGyI+AvKc7PIX2Z8SfGmPwZx/O4q3rrzogZ1Y36WoFTs1idZZwSlDLCQcl 7MNhYcWsh1WxOrekpzBLEnKPYFvMrTGm+EHfLr+uBFY6zozXQ7nFbuusuHwYCPWXyWyRO+ 7v4UOrcooKEdrusgvpdZiS6eIffkhUME0TFIYGGoBzrifO5nZT0UTNuxJXS8DeKFAe80n2 o3dDZ9SSIMaN4CjNqR8vOl2EBoBlinNdAPrp8lRvH1AXiZylLj82s3HCHANi6A== 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 4MWTMq4LbdzQdX; Mon, 19 Sep 2022 15:37:59 +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 28JFbxGE037748; Mon, 19 Sep 2022 15:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28JFbxKb037747; Mon, 19 Sep 2022 15:37:59 GMT (envelope-from git) Date: Mon, 19 Sep 2022 15:37:59 GMT Message-Id: <202209191537.28JFbxKb037747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: e69a1817a6ad - main - devel/schilybase: update to 2022-09-18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e69a1817a6ad75f0b081a88895aad0fa4d120e5e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663601879; 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=ZUHPov6Dld32ygiEw6dt7VRUqofMfofDTzjqz0Wg9DA=; b=n9SjXb0n3sKdOuG6bG1P1gbswuhPwcHQyYRwlwHIWxFwQsJ3ft6xOSuc3Y8OnhNWG6d/iW AGPE1B6BeQgd5gZXA/za6fXfe5PaXircTqiZsKW9ABs27BTcyOtQlTHREDAB8aLyVe4Ubu LHdJIGHkhaXLPcf+iXb2PcdeVLazzKLC0Ej4ivyJiBVu9kxv6L1sDOGcZoUTEF/1cEXU0T WwUOMz5qTYl2zQLXTkKDUvoAUmOYOP1tp6gqXDqh474mwasCJ1m793X6ePfkHZMp43OQWd BjDOj1oanY9IqY4LH/Oq8/x/uhggr3YK041L/Tmc3TT1cqtIRnRLRU23RLrraw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663601879; a=rsa-sha256; cv=none; b=vvrPoPQRuU1EdgmiGUBFaxwdmcw15MfV7CzuJ2Xe/WZvauoKQaZyhpw56Qa7IJGfMWLGp/ aHa6vBOLQ/qRg5XBdvRvBNAg7BIRpZ/C74OYfk6LgFJCU5itnF0NIo3NZ3c9v1h9bDu16o cCNznXCxNKsYHNXbF5mdoAKjUf3Im2r9LKXMKzra09J0Fmm2FuOo+1FX2DtodEP/sRhIIr obrJi9fCmAlBaOnKkYZAMBYHUVIl+wMblRtlJoVOILv/7qSOHw85jzY0/hZzV9+2NUQdBC ATvTFFZz63f/DnTx8DyCDMXfySzSvYgQZbO+xNENKOrhLEyHiiPRhaPFm1bp1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=e69a1817a6ad75f0b081a88895aad0fa4d120e5e commit e69a1817a6ad75f0b081a88895aad0fa4d120e5e Author: Robert Clausecker AuthorDate: 2022-08-18 20:53:34 +0000 Commit: Neel Chauhan CommitDate: 2022-09-19 15:37:34 +0000 devel/schilybase: update to 2022-09-18 - point MASTER_SITES to new upstream - split bosh from sysutils/schilyutils into new port shells/bosh - stop installing pfbosh, a SunOS-only feature - install jsh as jbosh to avoid a conflict - patch shell names in man pages - point WWW to subproject-specific sites if available - misc/schilytools: deprecate man2html component - devel/schilybase: add missing file to pkg-plist - make test suite work better - do not pass INS_*BASE/DESTDIR to smake tests - account for devel/sccs placing files in /tmp - make sh/tests/common/test-common find bosh after we patched out the hardlink to sh - Test suite passes on armv7 except for archivers/star. Will have to investigate further. - sysutils/schilyutils: add vctags command I forgot about that one when I made the port initially. The ctags link is not installed to avoid conflicts. Changelog: http://fuz.su/pub/schilytools/AN-2022-09-18.txt PR: 266475 --- archivers/star/Makefile | 2 +- devel/sccs/Makefile | 16 ++- devel/schilybase/Makefile | 1 - devel/schilybase/Makefile.master | 17 ++- devel/schilybase/distinfo | 6 +- devel/schilybase/files/patch-cdrecord_cdrecord.dfl | 57 +------- devel/schilybase/files/patch-ctags_Makefile | 10 ++ devel/schilybase/files/patch-sh_Makefile | 21 ++- devel/schilybase/files/patch-sh_jsh.mk1 | 11 ++ devel/schilybase/files/patch-sh_sh.1 | 143 +++++++++++++++++++++ .../files/patch-sh_tests_common_test-common | 17 +++ devel/schilybase/pkg-plist | 1 + devel/smake/Makefile | 1 - devel/sunpromake/Makefile | 2 +- editors/ved/Makefile | 2 +- misc/schilytools/Makefile | 12 +- net/rscsi/Makefile | 4 +- shells/Makefile | 1 + shells/bosh/Makefile | 16 +++ shells/bosh/pkg-descr | 23 ++++ shells/bosh/pkg-plist | 11 ++ sysutils/cdrtools/Makefile | 2 +- sysutils/schilyutils/Makefile | 10 +- sysutils/schilyutils/pkg-plist | 15 +-- 24 files changed, 297 insertions(+), 104 deletions(-) diff --git a/archivers/star/Makefile b/archivers/star/Makefile index 2809e61e8270..cf35e8beb6fe 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -2,7 +2,7 @@ PORTNAME= star CATEGORIES= archivers COMMENT= Unique standard tape archiver with many enhancements -WWW= https://codeberg.org/schilytools/schilytools +WWW= http://cdrtools.sourceforge.net/private/star.html PORTDOCS= README* STARvsGNUTAR diff --git a/devel/sccs/Makefile b/devel/sccs/Makefile index 3c992e956b11..963c9b70fa68 100644 --- a/devel/sccs/Makefile +++ b/devel/sccs/Makefile @@ -2,14 +2,17 @@ PORTNAME= sccs CATEGORIES= devel COMMENT= Source Code Control System (SCCS) -WWW= https://codeberg.org/schilytools/schilytools +WWW= http://sccs.sourceforge.net/ + +TEST_DEPENDS= star:archivers/star MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= patch \ sccs +TESTCOMPONENTS= ${COMPONENTS:Npatch} -# these files are installed by the patch target, -# but they belong to sysutils/schilyutils +# These files are installed by the patch target, +# but they belong to sysutils/schilyutils. post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/opatch ${RM} ${STAGEDIR}${PREFIX}/bin/spatch @@ -17,4 +20,11 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/patch.1 ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/spatch.1 +# This test suite installs a temp copy of the schilytools to /tmp. +# The directories are hard-coded unfortunately. +pre-test: + @${ECHO_MSG} '=> cleaning old test files' + ${RM} -r /tmp/sccstests /tmp/SCCSTEST + @${ECHO_MSG} '=> running test suite' + .include "${MASTERDIR}/Makefile.master" diff --git a/devel/schilybase/Makefile b/devel/schilybase/Makefile index 1c3ae685536b..13ffe3a1be59 100644 --- a/devel/schilybase/Makefile +++ b/devel/schilybase/Makefile @@ -2,7 +2,6 @@ PORTNAME= schilybase CATEGORIES= devel COMMENT= Support files and libraries for the schilytools -WWW= https://codeberg.org/schilytools/schilytools NLS_USES= gettext-tools USE_LDCONFIG= yes diff --git a/devel/schilybase/Makefile.master b/devel/schilybase/Makefile.master index 71a36612b07b..106bbdeb78b4 100644 --- a/devel/schilybase/Makefile.master +++ b/devel/schilybase/Makefile.master @@ -1,10 +1,9 @@ -DISTVERSION= 2021-09-18 -PORTREVISION= 2 -MASTER_SITES= SF/schilytools \ - http://fuz.su/~fuz/distfiles/schilytools/ +DISTVERSION= 2022-09-18 +MASTER_SITES= http://fuz.su/pub/schilytools/ DISTNAME= schily-${DISTVERSION} MAINTAINER= fuz@fuz.su +WWW?= https://codeberg.org/schilytools/schilytools LICENSE= CDDL ${COMPONENTS:@c@${LICENSE.${c}}@:O:u} LICENSE.autoconf= GPLv2 @@ -13,6 +12,7 @@ LICENSE.man2html= GPLv2 LICENSE.mkisofs= GPLv2 LICENSE.libparanoia= LGPL21 LICENSE.cpp= BSD3CLAUSE +LICENSE.ctags= BSD3CLAUSE LICENSE.libmdigest= BSD2CLAUSE LICENSE.libfile= BSD2CLAUSE LICENSE.patch= BSD1CLAUSE @@ -40,7 +40,7 @@ MAKE_ARGS= INS_BASE=${PREFIX} \ INS_RBASE=${PREFIX} \ LINKMODE=dynamic \ DESTDIR=${STAGEDIR} \ - STRIPFLAGS=${WITH_DEBUG:D:U-s} \ + STRIPFLAGS=${STRIP} \ CCOM=${COMPILER_TYPE} \ CC=${CC} \ CCC=${CXX} \ @@ -54,6 +54,8 @@ PLIST= ${.CURDIR}/pkg-plist PKGMESSAGE?= ${.CURDIR}/pkg-message DESCR= ${.CURDIR}/pkg-descr +TESTCOMPONENTS?= ${COMPONENTS} + post-extract: @cd ${WRKSRC}/rmt && ${MV} rmt.dfl srmt.dfl @cd ${WRKSRC}/rmt && ${MV} default-rmt.sample default-srmt.sample @@ -81,9 +83,10 @@ do-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.* .endif +# the test suite gets moody if we set INS_BASE/INS_RBASE/DESTDIR do-test: -.for component in ${COMPONENTS} - cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} tests +.for component in ${TESTCOMPONENTS} + cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS:NINS_*BASE=*:NDESTDIR=*} tests .endfor .include diff --git a/devel/schilybase/distinfo b/devel/schilybase/distinfo index e91a033031f0..f74a6d54612b 100644 --- a/devel/schilybase/distinfo +++ b/devel/schilybase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632527018 -SHA256 (schily-2021-09-18.tar.bz2) = 7c93f43d22c6e3de0eafe018ceb26ddd5cc6c543dc301f307d1e6ca313248aa4 -SIZE (schily-2021-09-18.tar.bz2) = 4952788 +TIMESTAMP = 1663463867 +SHA256 (schily-2022-09-18.tar.bz2) = 73aab13a15bfb4e2a418a7602365a914ed5f5bc782d8aef21580195e1e5e5b65 +SIZE (schily-2022-09-18.tar.bz2) = 4878648 diff --git a/devel/schilybase/files/patch-cdrecord_cdrecord.dfl b/devel/schilybase/files/patch-cdrecord_cdrecord.dfl index 85aceeb63486..6be71a76c2fa 100644 --- a/devel/schilybase/files/patch-cdrecord_cdrecord.dfl +++ b/devel/schilybase/files/patch-cdrecord_cdrecord.dfl @@ -1,33 +1,6 @@ ---- cdrecord/cdrecord.dfl.orig 2014-01-03 21:59:27 UTC +--- cdrecord/cdrecord.dfl.orig 2022-09-18 01:03:28 UTC +++ cdrecord/cdrecord.dfl -@@ -3,7 +3,7 @@ - # This file is /etc/default/cdrecord - # It contains defaults that are used if no command line option - # or environment is present. --# -+# - # The default device, if not specified elswhere - # Note that since Sommer 2006, cdrecord by default searches for a - # single CD-ROM device. You should set CDR_DEVICE= together with -@@ -11,15 +11,14 @@ - # one CR-ROM drive in your system. - # - #CDR_DEVICE=yamaha --#CDR_DEVICE=default - --# -+# - # The default speed (speed=), if not specified elswhere - # - # Note that newer cdrecord versions do not default - # to speed=1. For MMC compliant drives, the default - # is to write at maximum speed, so it in general does --# not make sense to set up a default speed in /etc/default/cdrecord -+# not make sense to set up a default speed in /etc/default/cdrecord - # - #CDR_SPEED=40 - -@@ -34,7 +33,7 @@ +@@ -34,7 +34,7 @@ # Linux and Solaris have problems with bigger transfer sizes. # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k # @@ -36,29 +9,3 @@ # # The following definitions allow abstract device names. -@@ -56,14 +55,14 @@ - # - # drive name device speed fifosize driveropts transfersize - # --my-default= 1,0,0 -1 -1 burnfree 63k --sol-default= USCSI:1,0,0 -1 -1 burnfree --ricoh-u= USCSI:0,2,0 -1 -1 burnfree --teac= 1,3,0 -1 -1 "" --teac-max-ts= 1,3,0 -1 -1 "" 32k --panasonic= 1,4,0 -1 -1 "" --plextor= 1,4,0 -1 -1 "" --sanyo= 1,4,0 -1 -1 burnfree --yamaha= 1,5,0 -1 -1 "" --cdrom= 0,6,0 2 1m "" --remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree -+#my-default= 1,0,0 -1 -1 burnfree 63k -+#sol-default= USCSI:1,0,0 -1 -1 burnfree -+#ricoh-u= USCSI:0,2,0 -1 -1 burnfree -+#teac= 1,3,0 -1 -1 "" -+#teac-max-ts= 1,3,0 -1 -1 "" 32k -+#panasonic= 1,4,0 -1 -1 "" -+#plextor= 1,4,0 -1 -1 "" -+#sanyo= 1,4,0 -1 -1 burnfree -+#yamaha= 1,5,0 -1 -1 "" -+#cdrom= 0,6,0 2 1m "" -+#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree diff --git a/devel/schilybase/files/patch-ctags_Makefile b/devel/schilybase/files/patch-ctags_Makefile new file mode 100644 index 000000000000..7063f723e728 --- /dev/null +++ b/devel/schilybase/files/patch-ctags_Makefile @@ -0,0 +1,10 @@ +--- ctags/Makefile.orig 2022-09-10 14:28:08 UTC ++++ ctags/Makefile +@@ -7,7 +7,6 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + + INSDIR= bin + TARGET= vctags +-SYMLINKS += ctags + + CPPOPTS += -DUSE_LARGEFILES + CPPOPTS += -DVED_STATS diff --git a/devel/schilybase/files/patch-sh_Makefile b/devel/schilybase/files/patch-sh_Makefile index 7b6132d950a4..f907ce226b35 100644 --- a/devel/schilybase/files/patch-sh_Makefile +++ b/devel/schilybase/files/patch-sh_Makefile @@ -1,13 +1,24 @@ ---- sh/Makefile.orig 2021-06-04 17:19:38 UTC +--- sh/Makefile.orig 2022-08-18 18:38:26 UTC +++ sh/Makefile -@@ -7,9 +7,8 @@ include $(SRCROOT)/$(RULESDIR)/rules.top +@@ -7,10 +7,8 @@ include $(SRCROOT)/$(RULESDIR)/rules.top INSDIR= bin # Shell -TARGET= sh -+TARGET= bosh - SYMLINKS= pfsh # Profile Bourne Shell +-SYMLINKS= pfsh # Profile Bourne Shell -SYMLINKS += bosh # Bourne Shell - SYMLINKS += jsh # Job control Bourne Shell +-SYMLINKS += jsh # Job control Bourne Shell ++TARGET= bosh ++SYMLINKS += jbosh # Job control Bourne Shell HARDLINKS += ../xpg4/bin/sh # POSIX Bourne Shell + ##CPPOPTS += -DNO_USER_MALLOC # Do not use our own malloc() +@@ -196,7 +194,7 @@ LIBS= $(LIB_SECDB) -lshedit -lxtermcap -lgetopt \ + $(LIB_ACL_TEST) \ + $(LIB_INTL) $(LIB_DL) + #LIBS= -lgen -lsecdb +-XMK_FILE= Makefile.dot Makefile.man bosh.mk1 jsh.mk1 pfsh.mk1 ++XMK_FILE= Makefile.dot Makefile.man bosh.mk1 jsh.mk1 + + signames.c abbrev.c abbrev.h: + @echo " ==> MAKING SYMLINKS in ."; sh ./MKLINKS diff --git a/devel/schilybase/files/patch-sh_jsh.mk1 b/devel/schilybase/files/patch-sh_jsh.mk1 new file mode 100644 index 000000000000..059dc88bc859 --- /dev/null +++ b/devel/schilybase/files/patch-sh_jsh.mk1 @@ -0,0 +1,11 @@ +--- sh/jsh.mk1.orig 2022-09-11 13:08:33 UTC ++++ sh/jsh.mk1 +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + MANDIR= man +-TARGETMAN= jsh ++TARGETMAN= jbosh + MANSECT= $(MANSECT_CMD) + MANSUFFIX= $(MANSUFF_CMD) + MANFILE= jsh.1 diff --git a/devel/schilybase/files/patch-sh_sh.1 b/devel/schilybase/files/patch-sh_sh.1 new file mode 100644 index 000000000000..adf3590e5f77 --- /dev/null +++ b/devel/schilybase/files/patch-sh_sh.1 @@ -0,0 +1,143 @@ +--- sh/sh.1.orig 2022-09-18 01:03:28 UTC ++++ sh/sh.1 +@@ -61,32 +61,25 @@ + .if n .ds s sz + .TH sh 1 "2022/09/11" "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 + .SH SYNOPSIS + .LP + .nf +-.B /usr/bin/sh\c +-.RB " [" \(miabCcefhikmnprstuvxP "] ["\c +-.IR argument ]... +-.fi +- +-.LP +-.nf +-.B /usr/bin/bosh\c ++.B bosh\c + .RB " [" \(miabCcefhikmnprstuvxP "] ["\c + .IR argument ]... + .fi + + .LP + .nf +-.B /usr/bin/pbosh\c ++.B pbosh\c + .RB " [" \(miabCcefhikmnprstuvxP "] ["\c + .IR argument ]... + .fi + + .LP + .nf +-.B /usr/bin/jsh\c ++.B jbosh\c + .RB " [" \(miabCcefhikmnprstuvxP "] ["\c + .IR argument ]... + .fi +@@ -95,18 +88,18 @@ sh, bosh, jsh \- standard and job control shell and co + .sp + .LP + The +-.B /usr/bin/sh ++.B bosh + utility is a command programming language that + executes commands read from a terminal or a file. + .LP + The name + .B bosh + permits to call this implementation even when +-.B /usr/bin/sh ++.B sh + has been linked to another shell. + .LP + The +-.B jsh ++.B jbosh + utility is an interface to the shell that provides all of the + functionality of + .B sh +@@ -121,7 +114,7 @@ or + Since + .B POSIX + requires that job control is auto-enabled for interactive shells, +-.B jsh ++.B jbosh + can be seen as an artefact from the historic Bourne Shell, but is kept for + compatibility. + .LP +@@ -180,7 +173,7 @@ if the file exists (by default this is the file + .BR $HOME/.shrc ). + Thereafter, commands are read as described below, which is also the case + when the shell is invoked as +-.BR /usr/bin/sh . ++.BR bosh . + + .SH OPTIONS + The options below are +@@ -5827,7 +5820,7 @@ those that precede the command name. + Switch job control mode on. + All jobs are run in their own process groups. + See section +-.B "Job Control (jsh)" ++.B "Job Control (jbosh)" + below. + On systems with job control, this flag is turned on automatically + for interactive shells. +@@ -7516,7 +7509,7 @@ termination status. + The process identifier + .I n + may either be a UNIX process id or a shell job id. See +-.B "Job Control (jsh)" ++.B "Job Control (jbosh)" + section below for information on shell job ids. + .sp + The return code of +@@ -7544,11 +7537,11 @@ in the section + .B Parameter Substitution + above. + +-.SS "Job Control (jsh)" ++.SS "Job Control (jbosh)" + .sp + .LP + When the shell is invoked as +-.BR jsh , ++.BR jbosh , + when the shell is invoked as interactive shell + or after + .B set -m +@@ -8362,7 +8355,7 @@ See + for an extended description of the behavior of + .B sh + and +-.B jsh ++.B jbosh + when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes). + .SH EXIT STATUS + .sp +@@ -8373,11 +8366,11 @@ execution of the shell file is abandoned. Otherwise, t + exit status of the last command executed (see also the + .B exit + command above). +-.SS "jsh Only" ++.SS "jbosh Only" + .sp + .LP + If the shell is invoked as +-.B jsh ++.B jbosh + and an attempt is made to exit the + shell while there are stopped jobs, the shell issues one warning: + .sp +@@ -8476,7 +8469,7 @@ The location of the restricted Bourne Shell binary. + See + .BR attributes (5) + for descriptions of the following attributes: +-.SS "/usr/bin/sh, /usr/bin/jsh" ++.SS "sh, jbosh" + .sp + + .sp diff --git a/devel/schilybase/files/patch-sh_tests_common_test-common b/devel/schilybase/files/patch-sh_tests_common_test-common new file mode 100644 index 000000000000..4d5273f17712 --- /dev/null +++ b/devel/schilybase/files/patch-sh_tests_common_test-common @@ -0,0 +1,17 @@ +--- sh/tests/common/test-common.orig 2022-08-19 19:43:40 UTC ++++ sh/tests/common/test-common +@@ -19,10 +19,10 @@ powerpc-aix-*) + ;; + esac + +-if [ -f ../../../OBJ/$OARCH/sh ]; then +- shell=${shell:=../../../OBJ/$OARCH/sh} +-elif [ -f ../../OBJ/$OARCH/sh ]; then +- shell=${shell:=../../OBJ/$OARCH/sh} ++if [ -f ../../../OBJ/$OARCH/bosh ]; then ++ shell=${shell:=../../../OBJ/$OARCH/bosh} ++elif [ -f ../../OBJ/$OARCH/bosh ]; then ++ shell=${shell:=../../OBJ/$OARCH/bosh} + fi + SHELL="$shell" + export SHELL diff --git a/devel/schilybase/pkg-plist b/devel/schilybase/pkg-plist index e4f56fc3ba1c..b6ca6be4d089 100644 --- a/devel/schilybase/pkg-plist +++ b/devel/schilybase/pkg-plist @@ -20,6 +20,7 @@ include/schily/alloca.h include/schily/archdefs.h include/schily/assert.h include/schily/avoffset.h +include/schily/blake2.h include/schily/btorder.h include/schily/ccomdefs.h include/schily/checkerr.h diff --git a/devel/smake/Makefile b/devel/smake/Makefile index 52635065001b..a8b69d926784 100644 --- a/devel/smake/Makefile +++ b/devel/smake/Makefile @@ -2,7 +2,6 @@ PORTNAME= smake CATEGORIES= devel COMMENT= Portable make program with automake features -WWW= https://codeberg.org/schilytools/schilytools MASTERDIR= ${.CURDIR}/../../devel/schilybase BOOTSTRAP_SMAKE?= yes diff --git a/devel/sunpromake/Makefile b/devel/sunpromake/Makefile index 119e9c2f835a..0cdb1edfd52e 100644 --- a/devel/sunpromake/Makefile +++ b/devel/sunpromake/Makefile @@ -2,7 +2,7 @@ PORTNAME= sunpromake CATEGORIES= devel parallel COMMENT= Parallel-execution enabled SunOS make program, enhanced to fit POSIX -WWW= https://codeberg.org/schilytools/schilytools +WWW= http://schilytools.sourceforge.net/sunpromake.html USE_LDCONFIG= yes diff --git a/editors/ved/Makefile b/editors/ved/Makefile index a7bcfdae43bc..2277610eca36 100644 --- a/editors/ved/Makefile +++ b/editors/ved/Makefile @@ -2,7 +2,7 @@ PORTNAME= ved CATEGORIES= editors COMMENT= Visual editor (easy to learn, fast, and lean) -WWW= https://codeberg.org/schilytools/schilytools +WWW= http://schilytools.sourceforge.net/ved.html OPTIONS_DEFINE= DOCS diff --git a/misc/schilytools/Makefile b/misc/schilytools/Makefile index fd6f9c9d9fc8..7f1981c9e54d 100644 --- a/misc/schilytools/Makefile +++ b/misc/schilytools/Makefile @@ -1,12 +1,13 @@ PORTNAME= schilytools -DISTVERSION= 1 +DISTVERSION= 2 CATEGORIES= misc MAINTAINER= fuz@fuz.su COMMENT= Collection of tools and libraries by J. Schilling (metaport) WWW= https://codeberg.org/schilytools/schilytools -RUN_DEPENDS= schilybase>=2021.05.19:devel/schilybase \ +RUN_DEPENDS= bosh>=2022.08.18.b:shells/bosh \ + schilybase>=2021.05.19:devel/schilybase \ schilyutils>=2021.05.19:sysutils/schilyutils \ star>=2021.05.19:archivers/star \ sccs>=2021.05.19:devel/sccs \ @@ -14,9 +15,12 @@ RUN_DEPENDS= schilybase>=2021.05.19:devel/schilybase \ sunpromake>=2021.05.19:devel/sunpromake \ ved>=2021.05.19:editors/ved \ cdrtools>=2021.05.19:sysutils/cdrtools \ - rscsi>=2021.05.19:net/rscsi \ - man2html:textproc/man2html + 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/net/rscsi/Makefile b/net/rscsi/Makefile index 9ddc2ade9bd3..4cddc4e9e811 100644 --- a/net/rscsi/Makefile +++ b/net/rscsi/Makefile @@ -2,9 +2,7 @@ PORTNAME= rscsi CATEGORIES= net COMMENT= Remote SCSI transport server program (daemon) -WWW= https://codeberg.org/schilytools/schilytools - -CONFLICTS= cdrtools-devel +WWW= http://cdrtools.sourceforge.net/private/cdrecord.html USERS= rscsi GROUPS= rscsi diff --git a/shells/Makefile b/shells/Makefile index bd4ce24c9f24..87699be71067 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -9,6 +9,7 @@ SUBDIR += bash-static SUBDIR += bashc SUBDIR += bicon + SUBDIR += bosh SUBDIR += ch SUBDIR += dash SUBDIR += elvish diff --git a/shells/bosh/Makefile b/shells/bosh/Makefile new file mode 100644 index 000000000000..d86a066d29a3 --- /dev/null +++ b/shells/bosh/Makefile @@ -0,0 +1,16 @@ +PORTNAME= bosh +CATEGORIES= shells + +COMMENT= Bourne Shell extended by J. Schilling +MAINTAINER= fuz@fuz.su +WWW= http://schilytools.sourceforge.net/bosh.html + +# bin/bosh +CONFLICTS_INSTALL= bosh-cli + +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= obosh \ + pbosh \ + sh + +.include "${MASTERDIR}/Makefile.master" diff --git a/shells/bosh/pkg-descr b/shells/bosh/pkg-descr new file mode 100644 index 000000000000..a3265a9555f4 --- /dev/null +++ b/shells/bosh/pkg-descr @@ -0,0 +1,23 @@ +The Schily Bourne Shell was derived from the Bourne Shell sources from +OpenSolaris. The Schily Bourne Shell is actively maintained and +enhanced on a regular base. It can be compiled into three variants: + +Non-POSIX SVr4/OpenSolaris variant (obosh) + The portable but not extended variant obosh allows script + portability testing. Most scripts that run in the old Schily + Bourne Shell will run with any Unix shell that is still in use + since 1990. + +Minimal POSIX compliant variant (pbosh) + This version implements the minimal set of POSIX features and + this version is always in strict POSIX mode. The features are + similar to the features in dash, but since pbosh supports multi + byte characters, it is really POSIX compliant. The pbosh + variant allows script portability testing aginst the POSIX + feature set. + +The POSIX compliant extended variant (bosh) + This version has been verified to work as the system shell on + Gentoo Linux and OpenSolaris (SchilliX). The enhanced Schily + Bourne Shell (bosh) implements many features that are missing + in the OpenSolaris Bourne Shell listed above. diff --git a/shells/bosh/pkg-plist b/shells/bosh/pkg-plist new file mode 100644 index 000000000000..62dbe9a533e1 --- /dev/null +++ b/shells/bosh/pkg-plist @@ -0,0 +1,11 @@ +@shell bin/bosh +@shell bin/jbosh +@shell bin/obosh +@shell bin/pbosh +%%DOCSDIR%%/dotfiles.tar.bz2 +share/man/man1/bosh.1.gz +share/man/man1/jbosh.1.gz +share/man/man1/obosh.1.gz +share/man/man1/pbosh.1.gz +@shell xpg4/bin/bosh +@shell xpg4/bin/sh diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 7bc7d27c2c2e..83087c1f231f 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -2,7 +2,7 @@ PORTNAME= cdrtools CATEGORIES= sysutils audio COMMENT= Tools for ripping from and recording to CDs and DVDs -WWW= https://codeberg.org/schilytools/schilytools +WWW= http://cdrtools.sourceforge.net/private/cdrecord.html LAME_RUN_DEPENDS= lame:audio/lame VORBIS_RUN_DEPENDS= oggenc:audio/vorbis-tools diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile index 7358d8f9249d..7a5d3aa2457b 100644 --- a/sysutils/schilyutils/Makefile +++ b/sysutils/schilyutils/Makefile @@ -2,13 +2,15 @@ PORTNAME= schilyutils CATEGORIES= sysutils converters deskutils textproc shells COMMENT= Collection of utilities from J. Schilling -WWW= https://codeberg.org/schilytools/schilytools +WWW= http://schilytools.sourceforge.net/ USES+= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= man2html/man2html cstyle/cstyle.pl -CONFLICTS_INSTALL= bosh-cli bsh calc clusterit deforaos-browser heirloom-sh latte-integrale p5-Math-SigFigs radmind # bin/bosh bin/bsh bin/calc bin/copy bin/count bin/fsdiff bin/jsh +# bin/bsh bin/calc bin/copy bin/count bin/fsdiff +CONFLICTS_INSTALL= bsh calc deforaos-browser \ + latte-integrale p5-Math-SigFigs radmind MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= bsh \ @@ -22,6 +24,7 @@ COMPONENTS= bsh \ count \ cpp \ cstyle \ + ctags \ cut \ fifo \ label \ @@ -29,17 +32,14 @@ COMPONENTS= bsh \ lndir \ match \ mdigest \ - obosh \ p \ paste \ patch \ - pbosh \ printf \ sdd \ sfind \ sformat \ sgrow \ - sh \ termcap \ translit \ udiff diff --git a/sysutils/schilyutils/pkg-plist b/sysutils/schilyutils/pkg-plist index 69c085536d95..5af815ca2d28 100644 --- a/sysutils/schilyutils/pkg-plist +++ b/sysutils/schilyutils/pkg-plist @@ -1,5 +1,4 @@ bin/Cstyle -@shell bin/bosh @shell bin/bsh bin/btcflash bin/calc @@ -12,18 +11,14 @@ bin/fdiff bin/fifo bin/fsdiff bin/hdump -@shell bin/jsh bin/krcpp bin/label bin/lndir bin/match bin/mdigest -@shell bin/obosh bin/opatch bin/p -bin/pbosh bin/pfbsh -bin/pfsh bin/scal bin/scompare bin/scut @@ -38,12 +33,11 @@ bin/sprintf bin/termcap bin/translit bin/udiff +bin/vctags etc/sformat.dat lib/cpp -share/doc/bosh/dotfiles.tar.bz2 share/doc/bsh/dotfiles.tar.bz2 share/man/de/man1/sdd.1.gz -share/man/man1/bosh.1.gz share/man/man1/bsh.1.gz share/man/man1/btcflash.1.gz share/man/man1/calc.1.gz @@ -56,19 +50,15 @@ share/man/man1/fdiff.1.gz share/man/man1/fifo.1.gz share/man/man1/fsdiff.1.gz share/man/man1/hdump.1.gz -share/man/man1/jsh.1.gz share/man/man1/krcpp.1.gz share/man/man1/label.1.gz share/man/man1/lndir.1.gz share/man/man1/match.1.gz share/man/man1/mdigest.1.gz -share/man/man1/obosh.1.gz share/man/man1/opatch.1.gz share/man/man1/p.1.gz share/man/man1/patch.1.gz -share/man/man1/pbosh.1.gz share/man/man1/pfbsh.1.gz -share/man/man1/pfsh.1.gz share/man/man1/scal.1.gz share/man/man1/scompare.1.gz share/man/man1/scut.1.gz @@ -82,7 +72,6 @@ share/man/man1/sprintf.1.gz share/man/man1/termcap.1.gz share/man/man1/translit.1.gz share/man/man1/udiff.1.gz +share/man/man1/vctags.1.gz share/man/man8/sformat.8.gz -xpg4/bin/bosh xpg4/bin/od -@shell xpg4/bin/sh