git: 2a40da7011b3 - main - misc/schilytools: Consolidate old schily's tools
Juraj Lutter
otis at FreeBSD.org
Thu Jul 1 21:15:01 UTC 2021
The branch main has been updated by otis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2a40da7011b3545ea4d9c3ec48eed369cc3b1aa3
commit 2a40da7011b3545ea4d9c3ec48eed369cc3b1aa3
Author: Robert Clausecker <fuz at fuz.su>
AuthorDate: 2021-07-01 08:01:55 +0000
Commit: Juraj Lutter <otis at FreeBSD.org>
CommitDate: 2021-07-01 21:11:52 +0000
misc/schilytools: Consolidate old schily's tools
- Update and consolidate schily's tools into more reasonable state
- Transfer maintenance to Robert Clausecker <fuz at fuz.su>
From Robert Clausecker <fuz at fuz.su> (new maintainer):
In 2018, Jörg Schilling consolidated all his projects into the
schilytools project and stopped providing new separate releases for the
individual projects (such as cdrtools, smake, star, and ved). Hence,
the FreeBSD ports of these projects have been stuck on outdated versions
for years.
With this changeset, the schilytools are added to the ports collection
as a collection of 10 ports:
devel/schilybase (libraries)
archivers/star
devel/sccs
devel/smake
devel/sunpromake
editors/ved
net/rscsi (split out from cdrtools for security reasons)
sysutils/cdrtools
sysutils/schilyutils (command line helpers, shells)
misc/schilytools (meta port for all of these)
Where appropriate, I've tried to keep existing patches and conventions
in tact. Some options have been renamed to more appropriate names,
others have been added or removed. The schilytools have been patched
not to install binaries with the same name as system binaries, though
some man pages with such names remain.
The split into slave ports largely follows the OpenCSW packages provided
by the author. Some differences are present:
* strar has been moved from schilyutils to star
* rscsi has been moved from cdrtools into a package on its own as it
needs to be installed setuid to function.
* mountcd is a Solaris only program and is not shipped
* man2html is not shipped as it's already available in textproc/man2html
* cdrecord, cdda2wav, and readcd are only installed setuid root if the
user specifically requests so using a non-default option
This changeset unobsoletes the editors/ved port.
This changeset obsoletes the sysutils/cdrtools-devel port as schilytools
provide a newer version than the old development version shipped therein.
This changeset overwrites the following ports, the maintainers have
previously been informed via PR and direct email but haven't responded.
They have also been added as reviewers to this changeset.
archivers/star (mm at freebsd.org)
devel/smake (no maintainer)
sysutils/cdrtools (marius at freebsd.org)
sysutils/cdrtools-devel (marius at freebsd.org)
PR: 256467
Differential Revision: https://reviews.freebsd.org/D30669
---
MOVED | 3 +-
archivers/star/Makefile | 76 +-
archivers/star/distinfo | 3 -
archivers/star/files/patch-rmt_Makefile | 18 -
archivers/star/files/patch-rmt_Makefile.man | 15 -
archivers/star/files/patch-star_Makefile | 22 -
archivers/star/pkg-plist | 93 +-
devel/Makefile | 3 +
devel/sccs/Makefile | 19 +
devel/sccs/pkg-descr | 6 +
devel/sccs/pkg-plist | 116 ++
devel/schilybase/Makefile | 45 +
devel/schilybase/Makefile.master | 88 ++
devel/schilybase/distinfo | 3 +
.../schilybase}/files/patch-btcflash_btcflash.1 | 0
devel/schilybase/files/patch-cal_Makefile | 11 +
devel/schilybase/files/patch-cal_Makefile.man | 11 +
.../schilybase}/files/patch-cdrecord_README.rscsi | 26 +-
.../schilybase}/files/patch-cdrecord_cdrecord.1 | 4 +-
.../schilybase}/files/patch-cdrecord_cdrecord.dfl | 0
devel/schilybase/files/patch-compare_Makefile | 11 +
devel/schilybase/files/patch-compare_Makefile.man | 11 +
devel/schilybase/files/patch-hdump_Makefile | 11 +
devel/schilybase/files/patch-hdump_od.mk1 | 11 +
.../schilybase}/files/patch-mkisofs_mkisofs.8 | 6 +-
devel/schilybase/files/patch-mt_Makefile | 20 +
devel/schilybase/files/patch-printf_Makefile | 11 +
devel/schilybase/files/patch-printf_Makefile.man | 11 +
.../schilybase}/files/patch-readcd_readcd.1 | 4 +-
devel/schilybase/files/patch-rmt_Makefile | 11 +
devel/schilybase/files/patch-rmt_Makefile.dfl | 11 +
devel/schilybase/files/patch-rmt_Makefile.doc | 13 +
devel/schilybase/files/patch-rmt_Makefile.man | 11 +
.../schilybase}/files/patch-rscsi_rscsi.dfl | 0
.../schilybase}/files/patch-scgcheck_scgcheck.1 | 0
devel/schilybase/files/patch-sh_Makefile | 13 +
devel/schilybase/files/patch-sh_Makefile.man | 11 +
devel/schilybase/files/patch-star_Makefile | 11 +
.../schilybase}/files/patch-star_star.1 | 6 +-
.../patch-sunpro_Make_bin_make_common_Makefile | 13 +
devel/schilybase/pkg-descr | 16 +
devel/schilybase/pkg-plist | 347 ++++++
devel/smake/Makefile | 35 +-
devel/smake/distinfo | 3 -
devel/smake/pkg-plist | 11 +-
devel/sunpromake/Makefile | 19 +
devel/sunpromake/pkg-descr | 8 +
devel/sunpromake/pkg-plist | 11 +
editors/Makefile | 1 +
editors/ved/Makefile | 15 +
editors/ved/pkg-descr | 8 +
editors/ved/pkg-plist | 10 +
misc/Makefile | 1 +
misc/schilytools/Makefile | 23 +
misc/schilytools/pkg-descr | 15 +
net/Makefile | 1 +
net/rscsi/Makefile | 14 +
net/rscsi/pkg-descr | 13 +
net/rscsi/pkg-message | 6 +
net/rscsi/pkg-plist | 4 +
sysutils/Makefile | 3 +-
sysutils/cdrtools-devel/Makefile | 220 ----
sysutils/cdrtools-devel/distinfo | 3 -
.../files/patch-DEFAULTS_Defaults.freebsd | 30 -
.../cdrtools-devel/files/patch-RULES_cc-gcc.rul | 87 --
sysutils/cdrtools-devel/files/patch-inc_avoffset.c | 44 -
sysutils/cdrtools-devel/files/patch-inc_getfp.c | 37 -
.../files/patch-include_schily_sha2.h | 15 -
.../cdrtools-devel/files/patch-libschily_fnmatch.c | 16 -
.../cdrtools-devel/files/patch-libschily_getfp.c | 37 -
sysutils/cdrtools-devel/files/pkg-message.in | 15 -
sysutils/cdrtools-devel/pkg-descr | 22 -
sysutils/cdrtools-devel/pkg-install.rscsi | 61 --
sysutils/cdrtools-devel/pkg-plist | 118 --
sysutils/cdrtools/Makefile | 240 +----
sysutils/cdrtools/distinfo | 5 -
.../files/patch-DEFAULTS__Defaults.freebsd | 30 -
sysutils/cdrtools/files/patch-RULES__cc-gcc.rul | 88 --
sysutils/cdrtools/files/patch-btcflash__btcflash.1 | 10 -
.../cdrtools/files/patch-cdrecord__README.rscsi | 36 -
sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 | 28 -
.../cdrtools/files/patch-cdrecord__cdrecord.dfl | 64 --
sysutils/cdrtools/files/patch-inc_avoffset.c | 28 -
sysutils/cdrtools/files/patch-inc_getfp.c | 37 -
.../cdrtools/files/patch-include__schily__sha2.h | 15 -
sysutils/cdrtools/files/patch-libschily_getfp.c | 37 -
sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 | 20 -
sysutils/cdrtools/files/patch-readcd__readcd.1 | 28 -
sysutils/cdrtools/files/patch-rscsi__rscsi.dfl | 19 -
sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 | 29 -
sysutils/cdrtools/files/pkg-message.in | 15 -
sysutils/cdrtools/pkg-descr | 1 -
sysutils/cdrtools/pkg-install.rscsi | 61 --
sysutils/cdrtools/pkg-plist | 168 +--
sysutils/schilyutils/Makefile | 53 +
sysutils/schilyutils/pkg-descr | 7 +
sysutils/schilyutils/pkg-plist | 88 ++
sysutils/sformat/Makefile | 62 --
sysutils/sformat/distinfo | 4 -
.../sformat/files/patch-RULES__i386-freebsd-cc.rul | 32 -
sysutils/sformat/files/patch-RULES__rules.cnf | 12 -
sysutils/sformat/files/patch-TARGETS__Targetdirs | 9 -
sysutils/sformat/files/patch-libscg__scsiopen.c | 11 -
sysutils/sformat/files/patch-libscg__scsitransp.c | 11 -
sysutils/sformat/files/patch-sformat__bcrypt.c | 84 --
sysutils/sformat/files/patch-sformat__datio.c | 28 -
sysutils/sformat/files/patch-sformat__fmt.c | 11 -
sysutils/sformat/files/patch-sformat__sformat.1 | 1125 --------------------
sysutils/sformat/pkg-descr | 27 -
sysutils/sformat/pkg-plist | 3 -
110 files changed, 1356 insertions(+), 3197 deletions(-)
diff --git a/MOVED b/MOVED
index 6e89a57e1041..01f3fc365b3f 100644
--- a/MOVED
+++ b/MOVED
@@ -5974,7 +5974,6 @@ java/linux-sun-jdk16||2014-05-11|Has expired: Unsupported and known for multiple
ports-mgmt/pver||2014-05-11|Has expired: does not support pkgng
databases/firebird20-client|databases/firebird25-client|2014-05-11|Firebird 2.0 is EOLed
databases/firebird20-server|databases/firebird25-server|2014-05-11|Firebird 2.0 is EOLed
-editors/ved||2014-05-15|Has expired: Depends on deprecated smake
japanese/chasen||2014-05-15|Has expired: Unmaintained since 2001
www/openx|www/revive-adserver|2014-05-15|Upstream obsolete, forked
security/clamav-devel||2014-05-16|Retire, older than security/clamav
@@ -16457,3 +16456,5 @@ www/demoroniser||2021-06-26|Removed, made for Microsoft Powerpoint 9x with Perl
x11-toolkits/v||2021-06-27|Has expired: Dead upstream, unmaintained and no consumers
sysutils/ssid|sysutils/setsid|2021-06-27|Move to more obvious package name
databases/pgpool-II-35||2021-07-01|Has expired: EOL since January 2021, please use one of the other pgpool-II-* ports
+sysutils/cdrtools-devel|sysutils/cdrtools|2021-07-01|Obsolete, use sysutils/cdrtools instead
+sysutils/sformat|sysutils/schilyutils|2021-07-01|Subsumed under sysutils/schilyutils
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index cf7edd78a4a2..fda93701fe85 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,70 +1,22 @@
-# Created by: Andreas Klemm <andreas at klemm.gtn.com>
-
PORTNAME= star
-PORTVERSION= 1.6
-PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= SF/s-tar
-MAINTAINER= mm at FreeBSD.org
COMMENT= Unique standard tape archiver with many enhancements
-LICENSE= CDDL GPLv2
-LICENSE_COMB= multi
-LICENSE_FILE= ${WRKSRC}/CDDL.Schily.txt
-
-BROKEN_riscv64= fails to configure in autoconf: checking whether the C compiler (riscv64-freebsd-clang) works... no
-
-USES= gmake gettext iconv tar:bzip2
-BINARY_WRAPPERS= gm4
-
-MAKE_ARGS= GMAKE_NOWARN=true DESTDIR=${STAGEDIR} INS_BASE=${PREFIX} \
- MANBASE=
-
-PORTDOCS= README README.crash README.mtio README.pattern STARvsGNUTAR \
- README.ACL README.largefiles README.otherbugs \
- README.posix-2001
-
-OPTIONS_DEFINE= DOCS
-
-post-patch:
- @${MV} ${WRKSRC}/rmt/rmt.1 ${WRKSRC}/rmt/srmt.1
- @${REINPLACE_CMD} -e "s@/etc/default@${PREFIX}/etc at g" \
- ${WRKSRC}/Mcsw \
- ${WRKSRC}/include/schily/deflts.h \
- ${WRKSRC}/rmt/rmt.c \
- ${WRKSRC}/rmt/rmt.dfl \
- ${WRKSRC}/rmt/srmt.1 \
- ${WRKSRC}/star/Makefile.dfl \
- ${WRKSRC}/star/defaults.c \
- ${WRKSRC}/star/star.1 \
- ${WRKSRC}/star/star.c \
- ${WRKSRC}/star/star.dfl \
- ${WRKSRC}/star/suntar.c
-
-pre-build:
- @${WRKSRC}/conf/cc-config.sh cc cc ${WRKSRC}/incs/Dcc.${ARCH}-freebsd
- @cd ${WRKSRC}/RULES && ${SH} ./MKLINKS
+OPTIONS_DEFINE+=DOCS TARTEST
+OPTIONS_SUB= yes
+TARTEST_DESC= Install tartest and test scripts
+TARTEST_VARS= COMPONENTS+=tartest
-post-stage:
- @${RM} ${STAGEDIR}/${PREFIX}/bin/mt \
- ${STAGEDIR}/${PREFIX}/include/schily/*.h \
- ${STAGEDIR}/${PREFIX}/include/schily/*/*.h \
- ${STAGEDIR}/${PREFIX}/lib/*.a \
- ${STAGEDIR}/${PREFIX}/lib/profiled/*.a \
- ${STAGEDIR}/${PREFIX}/man/man1/match.1* \
- ${STAGEDIR}/${PREFIX}/man/man1/mt.1* \
- ${STAGEDIR}/${PREFIX}/man/man3/*.3* \
- ${STAGEDIR}/${PREFIX}/man/man5/makerules.5* \
- ${STAGEDIR}/${PREFIX}/man/man5/makefiles.5*
- @${RMDIR} ${STAGEDIR}/${PREFIX}/include/schily/* \
- ${STAGEDIR}/${PREFIX}/include/schily \
- ${STAGEDIR}/${PREFIX}/lib/profiled
+MASTERDIR= ${.CURDIR}/../../devel/schilybase
+COMPONENTS= mt \
+ rmt \
+ star \
+ star_sym \
+ strar
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for FILE in ${PORTDOCS}
- (cd ${WRKSRC}/star && ${INSTALL_DATA} ${FILE} ${STAGEDIR}${DOCSDIR}/${FILE})
-.endfor
+post-install-DOCS-off:
+ ${RM} ${STAGEDIR}share/doc/star/README*
+ ${RM} ${STAGEDIR}share/doc/star/STARvsGNUTAR
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile.master"
diff --git a/archivers/star/distinfo b/archivers/star/distinfo
deleted file mode 100644
index 55876ce5358e..000000000000
--- a/archivers/star/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1555798131
-SHA256 (star-1.6.tar.bz2) = 1b18662ebae6c3509020953d4464e654c7ded4752774de987d8dc307dc43f776
-SIZE (star-1.6.tar.bz2) = 1154422
diff --git a/archivers/star/files/patch-rmt_Makefile b/archivers/star/files/patch-rmt_Makefile
deleted file mode 100644
index 6affa15542a3..000000000000
--- a/archivers/star/files/patch-rmt_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- rmt/Makefile.orig 2011-04-15 20:06:22 UTC
-+++ rmt/Makefile
-@@ -6,13 +6,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
- ###########################################################################
-
- INSDIR= sbin
--TARGET= rmt
-+TARGET= srmt
- CPPOPTS += -DUSE_REMOTE
- CPPOPTS += -DUSE_LARGEFILES
- CFILES= rmt.c
- #HFILES=
- LIBS= -ldeflt -lschily $(LIB_SOCKET)
--XMK_FILE= Makefile.man Makefile.dfl Makefile.doc
-+XMK_FILE= Makefile.man
-
- ###########################################################################
- include $(SRCROOT)/$(RULESDIR)/rules.cmd
diff --git a/archivers/star/files/patch-rmt_Makefile.man b/archivers/star/files/patch-rmt_Makefile.man
deleted file mode 100644
index 5898f2547021..000000000000
--- a/archivers/star/files/patch-rmt_Makefile.man
+++ /dev/null
@@ -1,15 +0,0 @@
---- rmt/Makefile.man.orig 2000-12-04 21:25:51 UTC
-+++ rmt/Makefile.man
-@@ -8,10 +8,10 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
- ###########################################################################
-
- MANDIR= man
--TARGETMAN= rmt
-+TARGETMAN= srmt
- MANSECT= $(MANSECT_CMD)
- MANSUFFIX= $(MANSUFF_CMD)
--MANFILE= rmt.1
-+MANFILE= srmt.1
-
- ###########################################################################
- include $(SRCROOT)/$(RULESDIR)/rules.man
diff --git a/archivers/star/files/patch-star_Makefile b/archivers/star/files/patch-star_Makefile
deleted file mode 100644
index 4a7fa9d69d3d..000000000000
--- a/archivers/star/files/patch-star_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- star/Makefile.orig 2013-11-05 22:36:07 UTC
-+++ star/Makefile
-@@ -15,7 +15,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
- INSDIR= bin
- TARGET= star
- #SYMLINKS= ustar tar
--SYMLINKS= ustar tar gnutar suntar scpio spax
-+SYMLINKS= ustar suntar scpio spax
- CPPOPTS += -D__STAR__
- CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
- #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
-@@ -55,8 +55,8 @@ LIBS= -ldeflt -lrmt -lfind -lschily $(L
- #
- # Wenn -lfind, dann auch $(LIB_INTL)
- #
--XMK_FILE= Makefile.man ustarman.mk starformatman.mk scpioman.mk gnutarman.mk \
-- spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
-+XMK_FILE= Makefile.man starformatman.mk scpioman.mk \
-+ spaxman.mk suntarman.mk
-
- star_fat.c: star.c
- $(RM) $(RM_FORCE) $@; cp star.c $@
diff --git a/archivers/star/pkg-plist b/archivers/star/pkg-plist
index f8896ba431bb..24a2cb5de549 100644
--- a/archivers/star/pkg-plist
+++ b/archivers/star/pkg-plist
@@ -1,18 +1,91 @@
+bin/gnutar
bin/scpio
bin/smt
bin/spax
bin/star
bin/star_sym
-bin/tartest
+bin/strar
bin/suntar
+%%TARTEST%%bin/tartest
bin/ustar
-man/man1/scpio.1.gz
-man/man1/smt.1.gz
-man/man1/spax.1.gz
-man/man1/srmt.1.gz
-man/man1/star.1.gz
-man/man1/star_sym.1.gz
-man/man1/suntar.1.gz
-man/man1/tartest.1.gz
-man/man5/star.5.gz
+etc/default/srmt
+etc/default/star
sbin/srmt
+share/doc/srmt/default-srmt.sample
+%%PORTDOCS%%share/doc/star/README
+%%PORTDOCS%%share/doc/star/README.ACL
+%%PORTDOCS%%share/doc/star/README.crash
+%%PORTDOCS%%share/doc/star/README.largefiles
+%%PORTDOCS%%share/doc/star/README.mtio
+%%PORTDOCS%%share/doc/star/README.otherbugs
+%%PORTDOCS%%share/doc/star/README.pattern
+%%PORTDOCS%%share/doc/star/README.posix-2001
+%%PORTDOCS%%share/doc/star/STARvsGNUTAR
+%%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
+share/man/man1/gnutar.1.gz
+share/man/man1/srmt.1.gz
+share/man/man1/scpio.1.gz
+share/man/man1/smt.1.gz
+share/man/man1/spax.1.gz
+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/devel/Makefile b/devel/Makefile
index 3cb9db621904..2a303d6e2579 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6798,6 +6798,8 @@
SUBDIR += scalatest
SUBDIR += scandoc
SUBDIR += sccache
+ SUBDIR += sccs
+ SUBDIR += schilybase
SUBDIR += scons
SUBDIR += sd-mux-ctrl
SUBDIR += sdl12
@@ -6882,6 +6884,7 @@
SUBDIR += subversion-book
SUBDIR += subversion-lts
SUBDIR += subversive
+ SUBDIR += sunpromake
SUBDIR += svk
SUBDIR += svn2git
SUBDIR += svn_load_dirs
diff --git a/devel/sccs/Makefile b/devel/sccs/Makefile
new file mode 100644
index 000000000000..fcb2dca96b83
--- /dev/null
+++ b/devel/sccs/Makefile
@@ -0,0 +1,19 @@
+PORTNAME= sccs
+CATEGORIES= devel
+
+COMMENT= Source Code Control System (SCCS)
+
+MASTERDIR= ${.CURDIR}/../../devel/schilybase
+COMPONENTS= patch \
+ sccs
+
+# 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
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/opatch.1
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/patch.1
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/spatch.1
+
+.include "${MASTERDIR}/Makefile.master"
diff --git a/devel/sccs/pkg-descr b/devel/sccs/pkg-descr
new file mode 100644
index 000000000000..3cdfbdafaad9
--- /dev/null
+++ b/devel/sccs/pkg-descr
@@ -0,0 +1,6 @@
+SCCS is an implementation of the POSIX standard Source Code Control
+System. It provides actively maintained code based on the original UNIX
+SCCS code OpenSourced by Sun as part of OpenSolaris and was made
+portable to other platforms.
+
+WWW: http://sccs.sourceforge.net/
diff --git a/devel/sccs/pkg-plist b/devel/sccs/pkg-plist
new file mode 100644
index 000000000000..9e4b8fd6b2c3
--- /dev/null
+++ b/devel/sccs/pkg-plist
@@ -0,0 +1,116 @@
+bin/sccs
+ccs/bin/admin
+ccs/bin/bdiff
+ccs/bin/cdc
+ccs/bin/comb
+ccs/bin/delta
+ccs/bin/diff
+ccs/bin/fsdiff
+ccs/bin/get
+ccs/bin/help
+ccs/bin/prs
+ccs/bin/prt
+ccs/bin/rcs2sccs
+ccs/bin/rmchg
+ccs/bin/rmdel
+ccs/bin/sact
+ccs/bin/sccs
+ccs/bin/sccscvt
+ccs/bin/sccsdiff
+ccs/bin/sccslog
+ccs/bin/sccspatch
+ccs/bin/unget
+ccs/bin/val
+ccs/bin/vc
+ccs/bin/what
+ccs/lib/diffh
+ccs/lib/help/locale/C/ad
+ccs/lib/help/locale/C/bd
+ccs/lib/help/locale/C/cb
+ccs/lib/help/locale/C/cm
+ccs/lib/help/locale/C/cmds
+ccs/lib/help/locale/C/co
+ccs/lib/help/locale/C/de
+ccs/lib/help/locale/C/default
+ccs/lib/help/locale/C/ge
+ccs/lib/help/locale/C/he
+ccs/lib/help/locale/C/pr
+ccs/lib/help/locale/C/prs
+ccs/lib/help/locale/C/rc
+ccs/lib/help/locale/C/sc
+ccs/lib/help/locale/C/un
+ccs/lib/help/locale/C/ut
+ccs/lib/help/locale/C/va
+ccs/lib/help/locale/C/vc
+ccs/lib/libcassi.a
+ccs/lib/libcomobj.a
+ccs/lib/libmpw.a
+ccs/lib/libsccs.a
+share/man/man1/admin.1.gz
+share/man/man1/bdiff.1.gz
+share/man/man1/cdc.1.gz
+share/man/man1/comb.1.gz
+share/man/man1/delta.1.gz
+share/man/man1/diff.1.gz
+share/man/man1/get.1.gz
+share/man/man1/help.1.gz
+share/man/man1/prs.1.gz
+share/man/man1/prt.1.gz
+share/man/man1/rcs2sccs.1.gz
+share/man/man1/rmdel.1.gz
+share/man/man1/sact.1.gz
+share/man/man1/sccs-add.1.gz
+share/man/man1/sccs-admin.1.gz
+share/man/man1/sccs-branch.1.gz
+share/man/man1/sccs-cdc.1.gz
+share/man/man1/sccs-check.1.gz
+share/man/man1/sccs-clean.1.gz
+share/man/man1/sccs-comb.1.gz
+share/man/man1/sccs-commit.1.gz
+share/man/man1/sccs-create.1.gz
+share/man/man1/sccs-cvt.1.gz
+share/man/man1/sccs-deledit.1.gz
+share/man/man1/sccs-delget.1.gz
+share/man/man1/sccs-delta.1.gz
+share/man/man1/sccs-diffs.1.gz
+share/man/man1/sccs-edit.1.gz
+share/man/man1/sccs-editor.1.gz
+share/man/man1/sccs-enter.1.gz
+share/man/man1/sccs-fix.1.gz
+share/man/man1/sccs-get.1.gz
+share/man/man1/sccs-help.1.gz
+share/man/man1/sccs-histfile.1.gz
+share/man/man1/sccs-info.1.gz
+share/man/man1/sccs-init.1.gz
+share/man/man1/sccs-istext.1.gz
+share/man/man1/sccs-ldiffs.1.gz
+share/man/man1/sccs-log.1.gz
+share/man/man1/sccs-print.1.gz
+share/man/man1/sccs-prs.1.gz
+share/man/man1/sccs-prt.1.gz
+share/man/man1/sccs-rcs2sccs.1.gz
+share/man/man1/sccs-remove.1.gz
+share/man/man1/sccs-rename.1.gz
+share/man/man1/sccs-rmdel.1.gz
+share/man/man1/sccs-root.1.gz
+share/man/man1/sccs-sact.1.gz
+share/man/man1/sccs-sccsdiff.1.gz
+share/man/man1/sccs-status.1.gz
+share/man/man1/sccs-tell.1.gz
+share/man/man1/sccs-unedit.1.gz
+share/man/man1/sccs-unget.1.gz
+share/man/man1/sccs-val.1.gz
+share/man/man1/sccs.1.gz
+share/man/man1/sccscvt.1.gz
+share/man/man1/sccsdiff.1.gz
+share/man/man1/sccslog.1.gz
+share/man/man1/sccspatch.1.gz
+share/man/man1/unget.1.gz
+share/man/man1/val.1.gz
+share/man/man1/vc.1.gz
+share/man/man1/what.1.gz
+share/man/man5/changeset.5.gz
+share/man/man5/sccschangeset.5.gz
+share/man/man5/sccsfile.5.gz
+xpg4/bin/get
+xpg4/bin/sccs
diff --git a/devel/schilybase/Makefile b/devel/schilybase/Makefile
new file mode 100644
index 000000000000..41998f7982a3
--- /dev/null
+++ b/devel/schilybase/Makefile
@@ -0,0 +1,45 @@
+PORTNAME= schilybase
+CATEGORIES= devel
+
+COMMENT= Support files and libraries for the schilytools
+
+USE_LDCONFIG= yes
+
+OPTIONS_DEFINE= PROFILE DOCS
+OPTIONS_DEFAULT=DOCS
+OPTIONS_SUB= yes
+
+# do not reorder: order required for build to succeed
+BOOTSTRAP_SMAKE?= yes
+COMPONENTS= conf \
+ inc \
+ include \
+ include/schily \
+ libschily \
+ libdeflt \
+ libscg \
+ libscg/scg \
+ libxtermcap \
+ libcdrdeflt \
+ libdbgmalloc \
+ libedc \
+ libfile \
+ libfind \
+ libgetopt \
+ libhfs_iso \
+ libmdigest \
+ libparanoia \
+ librmt \
+ librscg \
+ libscgcmd \
+ libshedit \
+ libsiconv \
+ libsiconv/tables \
+ libstreamar \
+ man \
+ man/man4
+
+post-install-PROFILE-off:
+ ${RM} -r ${STAGEDIR}${PREFIX}/lib/profiled
+
+.include "Makefile.master"
diff --git a/devel/schilybase/Makefile.master b/devel/schilybase/Makefile.master
new file mode 100644
index 000000000000..2cc18ccec56c
--- /dev/null
+++ b/devel/schilybase/Makefile.master
@@ -0,0 +1,88 @@
+DISTVERSION= 2021-06-07
+MASTER_SITES= SF/schilytools
+DISTNAME= schily-${DISTVERSION}
+
+MAINTAINER= fuz at fuz.su
+
+LICENSE= CDDL ${COMPONENTS:@c@${LICENSE.${c}}@:O:u}
+LICENSE.autoconf= GPLv2
+LICENSE.libhfs_iso= GPLv2
+LICENSE.man2html= GPLv2
+LICENSE.mkisofs= GPLv2
+LICENSE.libparanoia= LGPL21
+LICENSE.cpp= BSD3CLAUSE
+LICENSE.libmdigest= BSD2CLAUSE
+LICENSE.libfile= BSD2CLAUSE
+LICENSE.patch= BSD1CLAUSE
+LICENSE.lndir= MIT
+LICENSE_COMB= ${${LICENSE:[#]}>1:?multi:single}
+LICENSE_FILE_CDDL= ${WRKSRC}/CDDL.Schily.txt
+LICENSE_FILE_GPLv2= ${WRKSRC}/GPL-2.0.txt
+LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL-2.1.txt
+LICENSE_FILE_BSD1CLAUSE= ${WRKSRC}/patch/LICENSE
+LICENSE_NAME_BSD1CLAUSE= BSD 1-clause LICENSE
+LICENSE_PERMS_BSD1CLAUSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+# schilybase has all the libraries
+.if ${PORTNAME} != "schilybase"
+BUILD_DEPENDS+= schilybase=${PORTVERSION}:devel/schilybase
+RUN_DEPENDS+= schilybase=${PORTVERSION}:devel/schilybase
+.endif
+
+.if "${BOOTSTRAP_SMAKE:tl}" != "yes"
+BUILD_DEPENDS+= smake:devel/smake
+.endif
+
+USES+= tar:bz2 compiler gettext-runtime iconv
+
+MAKE_ARGS= INS_BASE=${PREFIX} \
+ INS_RBASE=${PREFIX} \
+ LINKMODE=dynamic \
+ DESTDIR=${STAGEDIR} \
+ STRIPFLAGS=${WITH_DEBUG:D:U-s} \
+ CCOM=${COMPILER_TYPE} \
+ CC=${CC} \
+ CCC=${CXX} \
+ COPTX="${CFLAGS}" \
+ C++OPTX="${CXXFLAGS}" \
+ NOECHO=
+MAKE_CMD= ${"${BOOTSTRAP_SMAKE}" == "yes":?${WRKSRC}/psmake/smake:smake}
+
+PLIST_SUB+= ARCH=${ARCH} COMPILER_TYPE=${COMPILER_TYPE}
+PLIST= ${.CURDIR}/pkg-plist
+PKGMESSAGE= ${.CURDIR}/pkg-message
+DESCR= ${.CURDIR}/pkg-descr
+
+post-extract:
+ cd ${WRKSRC}/rmt && ${MV} rmt.dfl srmt.dfl
+ cd ${WRKSRC}/rmt && ${MV} default-rmt.sample default-srmt.sample
+
+.if "${BOOTSTRAP_SMAKE:tl}" == "yes"
+# build a bootstrap smake as MAKE_CMD
+pre-configure:
+ cd ${WRKSRC}/psmake && ${SETENV} ${MAKE_ENV} ${SH} ./MAKE-all
+.endif
+
+do-configure:
+ for component in ${COMPONENTS} ; \
+ do \
+ cd ${WRKSRC}/$$component && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config ; \
+ done
+
+do-build:
+ for component in ${COMPONENTS} ; \
+ do \
+ cd ${WRKSRC}/$$component && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all ; \
+ done
+
+do-install:
+ for component in ${COMPONENTS} ; \
+ do \
+ cd ${WRKSRC}/$$component && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install ; \
+ done
+ [ -z "${COMPONENTS:Mlib*}" ] || ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
+
+.include <bsd.port.mk>
diff --git a/devel/schilybase/distinfo b/devel/schilybase/distinfo
new file mode 100644
index 000000000000..c7981cecfe19
--- /dev/null
+++ b/devel/schilybase/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1623063845
+SHA256 (schily-2021-06-07.tar.bz2) = ca7ecb3b749d7579a65b61708828153ab8d4f0081b5e2171fc8b98d75cacce2d
+SIZE (schily-2021-06-07.tar.bz2) = 4905609
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1 b/devel/schilybase/files/patch-btcflash_btcflash.1
similarity index 100%
rename from sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1
rename to devel/schilybase/files/patch-btcflash_btcflash.1
diff --git a/devel/schilybase/files/patch-cal_Makefile b/devel/schilybase/files/patch-cal_Makefile
new file mode 100644
index 000000000000..40c88d23458e
--- /dev/null
+++ b/devel/schilybase/files/patch-cal_Makefile
@@ -0,0 +1,11 @@
+--- cal/Makefile.orig 2021-06-06 21:32:57 UTC
++++ cal/Makefile
+@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
+
+ INSDIR= bin
+ # Calendar
+-TARGET= cal
++TARGET= scal
+
+ CPPOPTS += -DVSHNAME='"bosh"' # Shell name variant (bosh/osh/pbosh)
+
diff --git a/devel/schilybase/files/patch-cal_Makefile.man b/devel/schilybase/files/patch-cal_Makefile.man
new file mode 100644
index 000000000000..c23a71123036
--- /dev/null
+++ b/devel/schilybase/files/patch-cal_Makefile.man
@@ -0,0 +1,11 @@
+--- cal/Makefile.man.orig 2021-06-06 21:33:22 UTC
++++ cal/Makefile.man
+@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
+ ###########################################################################
+
+ MANDIR= man
+-TARGETMAN= cal
++TARGETMAN= scal
+ MANSECT= $(MANSECT_CMD)
+ MANSUFFIX= $(MANSUFF_CMD)
+ MANFILE= cal.1
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi b/devel/schilybase/files/patch-cdrecord_README.rscsi
similarity index 85%
rename from sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
rename to devel/schilybase/files/patch-cdrecord_README.rscsi
index 03277e4e065f..5c9811ad70a0 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
+++ b/devel/schilybase/files/patch-cdrecord_README.rscsi
@@ -1,30 +1,30 @@
--- cdrecord/README.rscsi.orig 2004-05-19 14:12:05 UTC
+++ cdrecord/README.rscsi
-@@ -18,24 +18,21 @@ There are three possible ways to control
+@@ -18,24 +18,21 @@ There are three possible ways to control access to the
NOTE: In this case, rscsi must be installed suid root.
**** This is the preferred method ****
--To enable remote SCSI via the login shell method you should do the following:
--
-- - Add an entry to /etc/passwd in the form:
--
-- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
+ The FreeBSD port automatically installs the rscsi binary suid
+ root and creates the user "rscsi".
++
+ To enable remote SCSI via the login shell method you should do the following:
-- (modify this according to your OS). And don't forget to
-- modify /etc/shadow the way it needs to be on your OS.
-+To enable remote SCSI via the login shell method you should do the following:
-
-- - Create a home directory for this user and add a .rhosts file
-- to allow access to all users you like.
+- - Add an entry to /etc/passwd in the form:
+ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf
+ and inetd(8) is running.
-- - Install rscsi suid root into /opt/schily/sbin
+- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
+ - Edit /usr/local/rscsi/.rhosts to allow access to all users you
+ like.
+- (modify this according to your OS). And don't forget to
+- modify /etc/shadow the way it needs to be on your OS.
+-
+- - Create a home directory for this user and add a .rhosts file
+- to allow access to all users you like.
+-
+- - Install rscsi suid root into /opt/schily/sbin
+-
- - Install a file /etc/default/rscsi and define access rights.
+ - Edit /usr/local/etc/rscsi and define access rights.
Without this file, rscsi will not work at all.
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1 b/devel/schilybase/files/patch-cdrecord_cdrecord.1
similarity index 90%
rename from sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
rename to devel/schilybase/files/patch-cdrecord_cdrecord.1
index 2ada85f584d1..9e3d1c86eaf0 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
+++ b/devel/schilybase/files/patch-cdrecord_cdrecord.1
@@ -15,9 +15,9 @@
# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
###########################################################################
---- cdrecord/cdrecord.1.orig 2017-09-21 14:11:50 UTC
+--- cdrecord/cdrecord.1.orig 2020-09-03 23:04:33 UTC
+++ cdrecord/cdrecord.1
-@@ -3169,8 +3169,6 @@ There must be at least one track per fil
+@@ -3226,8 +3226,6 @@ There must be at least one track per file.
.SH SEE ALSO
.BR cdda2wav (1),
.BR readcd (1),
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl b/devel/schilybase/files/patch-cdrecord_cdrecord.dfl
similarity index 100%
rename from sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl
rename to devel/schilybase/files/patch-cdrecord_cdrecord.dfl
diff --git a/devel/schilybase/files/patch-compare_Makefile b/devel/schilybase/files/patch-compare_Makefile
new file mode 100644
index 000000000000..e87e17a91e54
--- /dev/null
+++ b/devel/schilybase/files/patch-compare_Makefile
@@ -0,0 +1,11 @@
+--- compare/Makefile.orig 2021-06-21 15:02:35 UTC
++++ compare/Makefile
+@@ -6,7 +6,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
+ ###########################################################################
+
+ INSDIR= bin
+-TARGET= compare
++TARGET= scompare
+ CPPOPTS += -DUSE_LARGEFILES
+ CPPOPTS += -DSCHILY_PRINT
+
diff --git a/devel/schilybase/files/patch-compare_Makefile.man b/devel/schilybase/files/patch-compare_Makefile.man
new file mode 100644
index 000000000000..102120012da8
--- /dev/null
+++ b/devel/schilybase/files/patch-compare_Makefile.man
@@ -0,0 +1,11 @@
+--- compare/Makefile.man.orig 2021-06-21 15:02:55 UTC
++++ compare/Makefile.man
+@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
+ ###########################################################################
+
+ MANDIR= man
+-TARGETMAN= compare
++TARGETMAN= scompare
+ MANSECT= $(MANSECT_CMD)
+ MANSUFFIX= $(MANSUFF_CMD)
+ MANFILE= compare.1
diff --git a/devel/schilybase/files/patch-hdump_Makefile b/devel/schilybase/files/patch-hdump_Makefile
new file mode 100644
index 000000000000..470c788e7c89
--- /dev/null
+++ b/devel/schilybase/files/patch-hdump_Makefile
@@ -0,0 +1,11 @@
+--- hdump/Makefile.orig 2021-06-06 21:34:56 UTC
++++ hdump/Makefile
+@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
+
+ INSDIR= bin
+ TARGET= hdump
+-HARDLINKS= od ../xpg4/bin/od
++HARDLINKS= sod ../xpg4/bin/od
+ #HARDLINKS= ../xpg4/bin/od
+ CPPOPTS += -DUSE_LARGEFILES
+ CPPOPTS += -DSCHILY_PRINT
diff --git a/devel/schilybase/files/patch-hdump_od.mk1 b/devel/schilybase/files/patch-hdump_od.mk1
new file mode 100644
index 000000000000..d3d831cffbd0
--- /dev/null
+++ b/devel/schilybase/files/patch-hdump_od.mk1
@@ -0,0 +1,11 @@
+--- hdump/od.mk1.orig 2021-06-06 21:34:41 UTC
++++ hdump/od.mk1
+@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
+ ###########################################################################
+
+ MANDIR= man
*** 4552 LINES SKIPPED ***
More information about the dev-commits-ports-all
mailing list