diff options
| author | Robert Clausecker <fuz@fuz.su> | 2021-07-01 08:01:55 +0000 |
|---|---|---|
| committer | Juraj Lutter <otis@FreeBSD.org> | 2021-07-01 21:11:52 +0000 |
| commit | 2a40da7011b3545ea4d9c3ec48eed369cc3b1aa3 (patch) | |
| tree | 585068288186cfbfa5f001761df225f1eb309f4c | |
| parent | ceb35631b0c426e7811671b4020d1989c0a7e4f4 (diff) | |
| download | ports-2a40da7011b3545ea4d9c3ec48eed369cc3b1aa3.tar.gz ports-2a40da7011b3545ea4d9c3ec48eed369cc3b1aa3.zip | |
misc/schilytools: Consolidate old schily's tools
- Update and consolidate schily's tools into more reasonable state
- Transfer maintenance to Robert Clausecker <fuz@fuz.su>
From Robert Clausecker <fuz@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@freebsd.org)
devel/smake (no maintainer)
sysutils/cdrtools (marius@freebsd.org)
sysutils/cdrtools-devel (marius@freebsd.org)
PR: 256467
Differential Revision: https://reviews.freebsd.org/D30669
110 files changed, 1356 insertions, 3197 deletions
@@ -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@klemm.gtn.com> - PORTNAME= star -PORTVERSION= 1.6 -PORTREVISION= 1 CATEGORIES= archivers -MASTER_SITES= SF/s-tar -MAINTAINER= mm@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@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@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 index 3b94063221d0..3b94063221d0 100644 --- a/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1 +++ b/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 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 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 index 85aceeb63486..85aceeb63486 100644 --- a/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl +++ b/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 +-TARGETMAN= od ++TARGETMAN= sod + MANSECT= $(MANSECT_CMD) + MANSUFFIX= $(MANSUFF_CMD) + MANFILE= od.1 diff --git a/sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8 b/devel/schilybase/files/patch-mkisofs_mkisofs.8 index 3d2a81ccfdf2..98363618ca4a 100644 --- a/sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8 +++ b/devel/schilybase/files/patch-mkisofs_mkisofs.8 @@ -1,6 +1,6 @@ ---- mkisofs/mkisofs.8.orig 2017-12-10 18:47:50 UTC +--- mkisofs/mkisofs.8.orig 2020-09-04 13:24:04 UTC +++ mkisofs/mkisofs.8 -@@ -2739,7 +2739,7 @@ but is kept to be compatible with +@@ -2900,7 +2900,7 @@ but is kept to be compatible with The format of the .I magic file is almost identical to the @@ -9,7 +9,7 @@ file used by the Linux .BR file (1) command - the routines for reading and decoding the -@@ -2778,7 +2778,7 @@ l l l l . +@@ -2939,7 +2939,7 @@ l l l l . .TE .PP The format of the file is described in the diff --git a/devel/schilybase/files/patch-mt_Makefile b/devel/schilybase/files/patch-mt_Makefile new file mode 100644 index 000000000000..cf2d9c5cc929 --- /dev/null +++ b/devel/schilybase/files/patch-mt_Makefile @@ -0,0 +1,20 @@ +--- mt/Makefile.orig 2021-06-07 13:29:48 UTC ++++ mt/Makefile +@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + + INSDIR= bin + TARGET= smt +-SYMLINKS= mt ++#SYMLINKS= mt + CPPOPTS += -DUSE_REMOTE + CPPOPTS += -DSCHILY_PRINT + +@@ -17,7 +17,7 @@ CFILES= mt.c + # LIB_CAP is needed for Linux capability support in librmt. + # + LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP) +-XMK_FILE= Makefile.man mt.mk1 ++XMK_FILE= Makefile.man + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/rules.cmd diff --git a/devel/schilybase/files/patch-printf_Makefile b/devel/schilybase/files/patch-printf_Makefile new file mode 100644 index 000000000000..1de571862e69 --- /dev/null +++ b/devel/schilybase/files/patch-printf_Makefile @@ -0,0 +1,11 @@ +--- printf/Makefile.orig 2021-06-06 21:36:13 UTC ++++ printf/Makefile +@@ -6,7 +6,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + INSDIR= bin +-TARGET= printf ++TARGET= sprintf + OINCSDIR += -I. # Use local defs.h + CPPOPTS += -DUSE_LARGEFILES + CPPOPTS += -DSCHILY_PRINT diff --git a/devel/schilybase/files/patch-printf_Makefile.man b/devel/schilybase/files/patch-printf_Makefile.man new file mode 100644 index 000000000000..d0ca58be7c3c --- /dev/null +++ b/devel/schilybase/files/patch-printf_Makefile.man @@ -0,0 +1,11 @@ +--- printf/Makefile.man.orig 2021-06-06 21:36:29 UTC ++++ printf/Makefile.man +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + MANDIR= man +-TARGETMAN= printf ++TARGETMAN= sprintf + MANSECT= $(MANSECT_CMD) + MANSUFFIX= $(MANSUFF_CMD) + MANFILE= printf.1 diff --git a/sysutils/cdrtools-devel/files/patch-readcd_readcd.1 b/devel/schilybase/files/patch-readcd_readcd.1 index 27693336b41c..fb1729d7537f 100644 --- a/sysutils/cdrtools-devel/files/patch-readcd_readcd.1 +++ b/devel/schilybase/files/patch-readcd_readcd.1 @@ -15,9 +15,9 @@ # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. ########################################################################### ---- readcd/readcd.1.orig 2017-06-06 18:15:16 UTC +--- readcd/readcd.1.orig 2020-09-03 23:04:21 UTC +++ readcd/readcd.1 -@@ -641,8 +641,6 @@ is mapped to +@@ -644,8 +644,6 @@ is mapped to .SH SEE ALSO .BR cdrecord (1), .BR mkisofs (8), diff --git a/devel/schilybase/files/patch-rmt_Makefile b/devel/schilybase/files/patch-rmt_Makefile new file mode 100644 index 000000000000..f0166fbec4ae --- /dev/null +++ b/devel/schilybase/files/patch-rmt_Makefile @@ -0,0 +1,11 @@ +--- rmt/Makefile.orig 2021-06-04 16:09:01 UTC ++++ rmt/Makefile +@@ -6,7 +6,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + INSDIR= sbin +-TARGET= rmt ++TARGET= srmt + CPPOPTS += -DUSE_REMOTE + CPPOPTS += -DUSE_LARGEFILES + CFILES= rmt.c diff --git a/devel/schilybase/files/patch-rmt_Makefile.dfl b/devel/schilybase/files/patch-rmt_Makefile.dfl new file mode 100644 index 000000000000..da91a134887c --- /dev/null +++ b/devel/schilybase/files/patch-rmt_Makefile.dfl @@ -0,0 +1,11 @@ +--- rmt/Makefile.dfl.orig 2021-06-04 16:13:36 UTC ++++ rmt/Makefile.dfl +@@ -10,7 +10,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + INSMODE= 0644 + INSDIR= etc/default + INSBASE= $(INS_RBASE:%/=%) +-TARGET= rmt ++TARGET= srmt + AUXSRCEXT= .dfl + #XMK_FILE= Makefile.man + diff --git a/devel/schilybase/files/patch-rmt_Makefile.doc b/devel/schilybase/files/patch-rmt_Makefile.doc new file mode 100644 index 000000000000..ba2549eaad1c --- /dev/null +++ b/devel/schilybase/files/patch-rmt_Makefile.doc @@ -0,0 +1,13 @@ +--- rmt/Makefile.doc.orig 2021-06-04 16:12:30 UTC ++++ rmt/Makefile.doc +@@ -7,8 +7,8 @@ RULESDIR= RULES + include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + +-INSDIR= share/doc/rmt +-TARGET= default-rmt.sample ++INSDIR= share/doc/srmt ++TARGET= default-srmt.sample + #XMK_FILE= Makefile.man + + ########################################################################### diff --git a/devel/schilybase/files/patch-rmt_Makefile.man b/devel/schilybase/files/patch-rmt_Makefile.man new file mode 100644 index 000000000000..44d2f985cf70 --- /dev/null +++ b/devel/schilybase/files/patch-rmt_Makefile.man @@ -0,0 +1,11 @@ +--- rmt/Makefile.man.orig 2021-06-04 16:09:18 UTC ++++ rmt/Makefile.man +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + MANDIR= man +-TARGETMAN= rmt ++TARGETMAN= srmt + MANSECT= $(MANSECT_CMD) + MANSUFFIX= $(MANSUFF_CMD) + MANFILE= rmt.1 diff --git a/sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl b/devel/schilybase/files/patch-rscsi_rscsi.dfl index 133c60e01a50..133c60e01a50 100644 --- a/sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl +++ b/devel/schilybase/files/patch-rscsi_rscsi.dfl diff --git a/sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1 b/devel/schilybase/files/patch-scgcheck_scgcheck.1 index ed501f6d29ec..ed501f6d29ec 100644 --- a/sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1 +++ b/devel/schilybase/files/patch-scgcheck_scgcheck.1 diff --git a/devel/schilybase/files/patch-sh_Makefile b/devel/schilybase/files/patch-sh_Makefile new file mode 100644 index 000000000000..7b6132d950a4 --- /dev/null +++ b/devel/schilybase/files/patch-sh_Makefile @@ -0,0 +1,13 @@ +--- sh/Makefile.orig 2021-06-04 17:19:38 UTC ++++ sh/Makefile +@@ -7,9 +7,8 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + + INSDIR= bin + # Shell +-TARGET= sh ++TARGET= bosh + SYMLINKS= pfsh # Profile Bourne Shell +-SYMLINKS += bosh # Bourne Shell + SYMLINKS += jsh # Job control Bourne Shell + HARDLINKS += ../xpg4/bin/sh # POSIX Bourne Shell + diff --git a/devel/schilybase/files/patch-sh_Makefile.man b/devel/schilybase/files/patch-sh_Makefile.man new file mode 100644 index 000000000000..7cb18f08d426 --- /dev/null +++ b/devel/schilybase/files/patch-sh_Makefile.man @@ -0,0 +1,11 @@ +--- sh/Makefile.man.orig 2021-06-04 17:20:33 UTC ++++ sh/Makefile.man +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + MANDIR= man +-TARGETMAN= sh ++TARGETMAN= bosh + MANSECT= $(MANSECT_CMD) + MANSUFFIX= $(MANSUFF_CMD) + MANFILE= sh.1 diff --git a/devel/schilybase/files/patch-star_Makefile b/devel/schilybase/files/patch-star_Makefile new file mode 100644 index 000000000000..9f7a85a51920 --- /dev/null +++ b/devel/schilybase/files/patch-star_Makefile @@ -0,0 +1,11 @@ +--- star/Makefile.orig 2021-06-04 16:14:05 UTC ++++ star/Makefile +@@ -15,7 +15,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + INSDIR= bin + TARGET= star + #SYMLINKS= ustar tar +-SYMLINKS= ustar tar gnutar suntar scpio spax ++SYMLINKS= ustar suntar gnutar scpio spax + CPPOPTS += -D__STAR__ + CPPOPTS += -DSET_CTIME # Include timestorm code to set ctime + CPPOPTS += -DFIFO # Include FIFO code diff --git a/archivers/star/files/patch-star_star.1 b/devel/schilybase/files/patch-star_star.1 index e4cd5c224792..07192e518615 100644 --- a/archivers/star/files/patch-star_star.1 +++ b/devel/schilybase/files/patch-star_star.1 @@ -1,7 +1,7 @@ ---- star/star.1.orig 2011-04-12 17:34:22 UTC +--- star/star.1.orig 2021-06-04 16:15:43 UTC +++ star/star.1 -@@ -32,14 +32,6 @@ star \- unique standard tape archiver - .I file1 .\|.\|. filen +@@ -43,14 +43,6 @@ star \- unique standard tape archiver + \fB\-find\fP [\fIfind_expr\fP] .br -.ie n .B "tar\ \ " diff --git a/devel/schilybase/files/patch-sunpro_Make_bin_make_common_Makefile b/devel/schilybase/files/patch-sunpro_Make_bin_make_common_Makefile new file mode 100644 index 000000000000..36a51b684975 --- /dev/null +++ b/devel/schilybase/files/patch-sunpro_Make_bin_make_common_Makefile @@ -0,0 +1,13 @@ +--- sunpro/Make/bin/make/common/Makefile.orig 2021-06-04 16:47:25 UTC ++++ sunpro/Make/bin/make/common/Makefile +@@ -8,8 +8,8 @@ include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + + INSDIR= bin +-TARGET= make +-HARDLINKS= dmake svr4.make ../lib/svr4.make ../xpg4/bin/make ++TARGET= dmake ++HARDLINKS= svr4.make ../lib/svr4.make ../xpg4/bin/make + CPPOPTS += -I../../../../include + CPPOPTS += -I../../../include + #CPPOPTS += -compat=4 diff --git a/devel/schilybase/pkg-descr b/devel/schilybase/pkg-descr new file mode 100644 index 000000000000..c2ca3e12e998 --- /dev/null +++ b/devel/schilybase/pkg-descr @@ -0,0 +1,16 @@ +Support files and libraries for schilytools, a collection +of programs by Joerg Schilling. This includes among others + + * libedc -- CD sector formatting library + * libfind -- find(1) as a library + * libhfs -- library to handle Apple HFS extensions + * libmdigest -- message digest library + * libparanoia -- Portable CD Audio paranoia extraction library + * librscg -- remote SCSI transport library + * libsiconv -- NLS library for Unicode and iconv wrapper + * libscg -- portable SCSI transport library + * libschily -- portable extensions to the POSIX API + * libshedit -- bsh command line editor + * libxtermcap -- extended termcap library + +WWW: http://schilytools.sourceforge.net diff --git a/devel/schilybase/pkg-plist b/devel/schilybase/pkg-plist new file mode 100644 index 000000000000..fa78c84092b9 --- /dev/null +++ b/devel/schilybase/pkg-plist @@ -0,0 +1,347 @@ +etc/termcap +include/scg/aspi-dos.h +include/scg/aspi-win32.h +include/scg/scgcmd.h +include/scg/scgio.h +include/scg/scgops.h +include/scg/scsicdb.h +include/scg/scsidefs.h +include/scg/scsireg.h +include/scg/scsisense.h +include/scg/scsitransp.h +include/scg/spti-wnt.h +include/scg/srb_os2.h +include/schily/_regex.h +include/schily/%%ARCH%%-freebsd-%%COMPILER_TYPE%%/align.h +include/schily/%%ARCH%%-freebsd-%%COMPILER_TYPE%%/avoffset.h +include/schily/%%ARCH%%-freebsd-%%COMPILER_TYPE%%/xconfig.h +include/schily/align.h +include/schily/alloca.h +include/schily/archdefs.h +include/schily/assert.h +include/schily/avoffset.h +include/schily/btorder.h +include/schily/ccomdefs.h +include/schily/checkerr.h +include/schily/ctype.h +include/schily/dbgmalloc.h +include/schily/deflts.h +include/schily/device.h +include/schily/dirent.h +include/schily/dlfcn.h +include/schily/err_arch.h +include/schily/err_bit.h +include/schily/err_char.h +include/schily/err_type.h +include/schily/errno.h +include/schily/fcntl.h +include/schily/fetchdir.h +include/schily/find.h +include/schily/float.h +include/schily/fnmatch.h +include/schily/fstream.h +include/schily/getargs.h +include/schily/getcwd.h +include/schily/getopt.h +include/schily/grp.h +include/schily/hostname.h +include/schily/iconv.h +include/schily/idcache.h +include/schily/in.h +include/schily/inet.h +include/schily/intcvt.h +include/schily/inttypes.h +include/schily/io.h +include/schily/ioctl.h +include/schily/ipc.h +include/schily/jmpdefs.h +include/schily/libgen.h +include/schily/libport.h +include/schily/librmt.h +include/schily/limits.h +include/schily/locale.h +include/schily/math.h +include/schily/maxpath.h +include/schily/mconfig.h +include/schily/md4.h +include/schily/md5.h +include/schily/mman.h +include/schily/mtio.h +include/schily/netdb.h +include/schily/nlsdefs.h +include/schily/param.h +include/schily/patmatch.h +include/schily/poll.h +include/schily/priv.h +include/schily/procfs.h +include/schily/prototyp.h +include/schily/pwd.h +include/schily/regex.h +include/schily/resource.h +include/schily/rmd160.h +include/schily/rmtio.h +include/schily/schily.h +include/schily/schilyp.h +include/schily/select.h +include/schily/sem.h +include/schily/setjmp.h +include/schily/sha1.h +include/schily/sha2.h +include/schily/sha3.h +include/schily/shadow.h +include/schily/shcall.h +include/schily/shedit.h +include/schily/shm.h +include/schily/siconv.h +include/schily/sigblk.h +include/schily/signal.h +include/schily/sigset.h +include/schily/socket.h +include/schily/standard.h +include/schily/stat.h +include/schily/stdarg.h +include/schily/stdint.h +include/schily/stdio.h +include/schily/stdlib.h +include/schily/stkframe.h +include/schily/strar.h +include/schily/string.h +include/schily/sunos4_proto.h +include/schily/sysexits.h +include/schily/syslog.h +include/schily/systeminfo.h +include/schily/termcap.h +include/schily/termios.h +include/schily/time.h +include/schily/timeb.h +include/schily/times.h +include/schily/type_val.h +include/schily/types.h +include/schily/unistd.h +include/schily/utime.h +include/schily/utsname.h +include/schily/utypes.h +include/schily/values.h +include/schily/varargs.h +include/schily/vfork.h +include/schily/wait.h +include/schily/walk.h +include/schily/wchar.h +include/schily/wctype.h +include/schily/windows.h +include/schily/xconfig.h +include/schily/xmconfig.h +lib/libcdrdeflt.a +lib/libcdrdeflt.so +lib/libcdrdeflt.so.1.0 +lib/libdbgmalloc.a +lib/libdeflt.a +lib/libdeflt.so +lib/libdeflt.so.1.0 +lib/libedc_ecc.a +lib/libedc_ecc.so +lib/libedc_ecc.so.1.0 +lib/libedc_ecc_dec.a +lib/libedc_ecc_dec.so +lib/libedc_ecc_dec.so.1.0 +lib/libfile.a +lib/libfile.so +lib/libfile.so.1.0 +lib/libfind.a +lib/libfind.so +lib/libfind.so.4.0 +lib/libgetopt.a +lib/libhfs.a +lib/libhfs.so +lib/libhfs.so.1.0 +lib/libmdigest.a +lib/libmdigest.so +lib/libmdigest.so.1.0 +lib/libparanoia.a +lib/libparanoia.so +lib/libparanoia.so.1.0 +lib/librmt.a +lib/librmt.so +lib/librmt.so.1.0 +lib/librscg.a +lib/librscg.so +lib/librscg.so.1.0 +lib/libscg.a +lib/libscg.so +lib/libscg.so.1.0 +lib/libscgcmd.a +lib/libscgcmd.so +lib/libscgcmd.so.1.0 +lib/libschily.a +lib/libschily.so +lib/libschily.so.2.0 +lib/libshedit.a +lib/libshedit.so +lib/libshedit.so.1.0 +lib/libsiconv.a +lib/libsiconv.so +lib/libsiconv.so.1.0 +lib/libstreamar.a +lib/libstreamar.so +lib/libstreamar.so.1.0 +lib/libxtermcap.a +lib/libxtermcap.so +lib/libxtermcap.so.1.0 +%%PROFILE%%lib/profiled/libcdrdeflt.a +%%PROFILE%%lib/profiled/libdeflt.a +%%PROFILE%%lib/profiled/libedc_ecc.a +%%PROFILE%%lib/profiled/libedc_ecc_dec.a +%%PROFILE%%lib/profiled/libfile.a +%%PROFILE%%lib/profiled/libfind.a +%%PROFILE%%lib/profiled/libhfs.a +%%PROFILE%%lib/profiled/libmdigest.a +%%PROFILE%%lib/profiled/libparanoia.a +%%PROFILE%%lib/profiled/librmt.a +%%PROFILE%%lib/profiled/librscg.a +%%PROFILE%%lib/profiled/libscg.a +%%PROFILE%%lib/profiled/libscgcmd.a +%%PROFILE%%lib/profiled/libschily.a +%%PROFILE%%lib/profiled/libshedit.a +%%PROFILE%%lib/profiled/libsiconv.a +%%PROFILE%%lib/profiled/libxtermcap.a +%%PORTDOCS%%share/doc/libparanoia/README.interface +%%PORTDOCS%%share/doc/libparanoia/README.paranoia +share/lib/siconv/cp10000 +share/lib/siconv/cp10006 +share/lib/siconv/cp10007 +share/lib/siconv/cp10029 +share/lib/siconv/cp10079 +share/lib/siconv/cp10081 +share/lib/siconv/cp1250 +share/lib/siconv/cp1251 +share/lib/siconv/cp1252 +share/lib/siconv/cp1253 +share/lib/siconv/cp1254 +share/lib/siconv/cp1255 +share/lib/siconv/cp1256 +share/lib/siconv/cp1257 +share/lib/siconv/cp1258 +share/lib/siconv/cp437 +share/lib/siconv/cp737 +share/lib/siconv/cp775 +share/lib/siconv/cp850 +share/lib/siconv/cp852 +share/lib/siconv/cp855 +share/lib/siconv/cp857 +share/lib/siconv/cp860 +share/lib/siconv/cp861 +share/lib/siconv/cp862 +share/lib/siconv/cp863 +share/lib/siconv/cp864 +share/lib/siconv/cp865 +share/lib/siconv/cp866 +share/lib/siconv/cp869 +share/lib/siconv/cp874 +share/lib/siconv/iso8859-1 +share/lib/siconv/iso8859-10 +share/lib/siconv/iso8859-11 +share/lib/siconv/iso8859-13 +share/lib/siconv/iso8859-14 +share/lib/siconv/iso8859-15 +share/lib/siconv/iso8859-16 +share/lib/siconv/iso8859-2 +share/lib/siconv/iso8859-3 +share/lib/siconv/iso8859-4 +share/lib/siconv/iso8859-5 +share/lib/siconv/iso8859-6 +share/lib/siconv/iso8859-7 +share/lib/siconv/iso8859-8 +share/lib/siconv/iso8859-9 +share/lib/siconv/koi8-r +share/lib/siconv/koi8-u +share/man/man3/absfpath.3.gz +share/man/man3/absnpath.3.gz +share/man/man3/abspath.3.gz +share/man/man3/astoi.3.gz +share/man/man3/astol.3.gz +share/man/man3/breakline.3.gz +share/man/man3/cmpbytes.3.gz +share/man/man3/comerr.3.gz +share/man/man3/comerrno.3.gz +share/man/man3/errmsg.3.gz +share/man/man3/errmsgno.3.gz +share/man/man3/error.3.gz +share/man/man3/fdown.3.gz +share/man/man3/fdup.3.gz +share/man/man3/fexecl.3.gz +share/man/man3/fexecle.3.gz +share/man/man3/fexecv.3.gz +share/man/man3/fexecve.3.gz +share/man/man3/fgetline.3.gz +share/man/man3/file_raise.3.gz +share/man/man3/fileclose.3.gz +share/man/man3/fileluopen.3.gz +share/man/man3/fileopen.3.gz +share/man/man3/filepos.3.gz +share/man/man3/fileread.3.gz +share/man/man3/filereopen.3.gz +share/man/man3/fileseek.3.gz +share/man/man3/filesize.3.gz +share/man/man3/filestat.3.gz +share/man/man3/filewrite.3.gz +share/man/man3/findline.3.gz +share/man/man3/flush.3.gz +share/man/man3/fnmatch.3.gz +share/man/man3/format.3.gz +share/man/man3/fpipe.3.gz +share/man/man3/fprintf.3.gz +share/man/man3/getallargs.3.gz +share/man/man3/getargerror.3.gz +share/man/man3/getarginit.3.gz +share/man/man3/getargs.3.gz +share/man/man3/geterrno.3.gz +share/man/man3/getfiles.3.gz +share/man/man3/getlallargs.3.gz +share/man/man3/getlargs.3.gz +share/man/man3/getlfiles.3.gz +share/man/man3/getline.3.gz +share/man/man3/getopt.3.gz +share/man/man3/getsubopt.3.gz +share/man/man3/getvallargs.3.gz +share/man/man3/getvargs.3.gz +share/man/man3/getvfiles.3.gz +share/man/man3/handlecond.3.gz +share/man/man3/librmt.3.gz +share/man/man3/movebytes.3.gz +share/man/man3/mtg2rmtg.3.gz +share/man/man3/ofindline.3.gz +share/man/man3/patcompile.3.gz +share/man/man3/patmatch.3.gz +share/man/man3/peekc.3.gz +share/man/man3/printf.3.gz +share/man/man3/raisecond.3.gz +share/man/man3/resolvefpath.3.gz +share/man/man3/resolvenpath.3.gz +share/man/man3/resolvepath.3.gz +share/man/man3/rmtclose.3.gz +share/man/man3/rmtdebug.3.gz +share/man/man3/rmtfilename.3.gz +share/man/man3/rmtg2mtg.3.gz +share/man/man3/rmtgetconn.3.gz +share/man/man3/rmthostname.3.gz +share/man/man3/rmtinit.3.gz +share/man/man3/rmtioctl.3.gz +share/man/man3/rmtopen.3.gz +share/man/man3/rmtread.3.gz +share/man/man3/rmtrmt.3.gz +share/man/man3/rmtrsh.3.gz +share/man/man3/rmtseek.3.gz +share/man/man3/rmtstatus.3.gz +share/man/man3/rmtwrite.3.gz +share/man/man3/rmtxstatus.3.gz +share/man/man3/spawnl.3.gz +share/man/man3/spawnv.3.gz +share/man/man3/sprintf.3.gz +share/man/man3/starthandlecond.3.gz +share/man/man3/strcatl.3.gz +share/man/man3/streql.3.gz +share/man/man3/strlen.3.gz +share/man/man3/unhandlecond.3.gz +share/man/man5/makefiles.5.gz +share/man/man5/makerules.5.gz +share/man/man5/streamarchive.5.gz diff --git a/devel/smake/Makefile b/devel/smake/Makefile index bab5db6a4ce3..a8b69d926784 100644 --- a/devel/smake/Makefile +++ b/devel/smake/Makefile @@ -1,37 +1,10 @@ -# Created by: Martin Matuska <mm@FreeBSD.org> - PORTNAME= smake -PORTVERSION= 1.2.5 CATEGORIES= devel -MASTER_SITES= SF/s-make -MAINTAINER= ports@FreeBSD.org COMMENT= Portable make program with automake features -LICENSE= CDDL GPLv2 -LICENSE_COMB= multi -LICENSE_FILE_CDDL= ${WRKSRC}/CDDL.Schily.txt - -BROKEN_i386= fails to compile -NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 riscv64 -NOT_FOR_ARCHS_REASON= unknown rule to build: ./RULES/<arch>-freebsd-/nxb-bin/usr/bin/cc.rul - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.a.*//g} - -USES= gmake tar:bzip2 -MAKE_ENV= CCOM="${CC}" -MAKE_ARGS= INS_BASE=${PREFIX} DEFMANBASE=. CC="${CC}" CCOM="${CC}" - -PLIST_SUB= RULESUSED="${ARCH}-freebsd-cc" - -MKLINKS= ${WRKSRC}/RULES/MKLINKS -GCCRULE= ${WRKSRC}/RULES/cc-gcc.rul - -pre-build: - @${REINPLACE_CMD} -e 's|gcc$$|${CC}|' ${GCCRULE} - @${ECHO_CMD} "\$$symlink i386-freebsd-cc.rul ${ARCH}-freebsd-${CC}.rul" >> ${MKLINKS} - -pre-install: - ${STRIP_CMD} ${WRKSRC}/smake/OBJ/${ARCH}-freebsd-${CC}/smake +MASTERDIR= ${.CURDIR}/../../devel/schilybase +BOOTSTRAP_SMAKE?= yes +COMPONENTS= smake -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile.master" diff --git a/devel/smake/distinfo b/devel/smake/distinfo deleted file mode 100644 index 65e0add8cea9..000000000000 --- a/devel/smake/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1472251622 -SHA256 (smake-1.2.5.tar.bz2) = 27566aa731a400c791cd95361cc755288b44ff659fa879933d4ea35d052259d4 -SIZE (smake-1.2.5.tar.bz2) = 427993 diff --git a/devel/smake/pkg-plist b/devel/smake/pkg-plist index ec13d51002f0..ea469d5d80f1 100644 --- a/devel/smake/pkg-plist +++ b/devel/smake/pkg-plist @@ -1,10 +1,3 @@ bin/smake -include/schily/%%RULESUSED%%/align.h -include/schily/%%RULESUSED%%/avoffset.h -include/schily/%%RULESUSED%%/xconfig.h -lib/defaults.smk -lib/libschily.a -lib/profiled/libschily.a -man/man1/smake.1.gz -man/man5/makefiles.5.gz -man/man5/makerules.5.gz +share/lib/smake/defaults.smk +share/man/man1/smake.1.gz diff --git a/devel/sunpromake/Makefile b/devel/sunpromake/Makefile new file mode 100644 index 000000000000..45db77f2dea4 --- /dev/null +++ b/devel/sunpromake/Makefile @@ -0,0 +1,19 @@ +PORTNAME= sunpromake +CATEGORIES= devel parallel + +COMMENT= Parallel-execution enabled SunOS make program, enhanced to fit POSIX + +USE_LDCONFIG= yes + +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= sunpro + +# these libraries are installed by the sunpro component +# but are internal to the program. The author recommends +# not shipping them, so we don't. +post-install: + ${RM} ${STAGEDIR}${PREFIX}/lib/libbsd.a + ${RM} ${STAGEDIR}${PREFIX}/lib/libmksh.a + ${RM} ${STAGEDIR}${PREFIX}/lib/libvroot.a + +.include "${MASTERDIR}/Makefile.master" diff --git a/devel/sunpromake/pkg-descr b/devel/sunpromake/pkg-descr new file mode 100644 index 000000000000..d08523545f69 --- /dev/null +++ b/devel/sunpromake/pkg-descr @@ -0,0 +1,8 @@ +SunPro Make is a parallel make program from SUN Microsystems. +This package was derived from the SunPro Make sources from +OpenSolaris. While the distributed make functionality has +never been open-sourced and is missing from this version of +SunPro Make, the parallel make functionality was succesfully +reconstructed from the present source. + +WWW: http://schilytools.sourceforge.net/sunpromake.html diff --git a/devel/sunpromake/pkg-plist b/devel/sunpromake/pkg-plist new file mode 100644 index 000000000000..c359f1e55ed7 --- /dev/null +++ b/devel/sunpromake/pkg-plist @@ -0,0 +1,11 @@ +bin/dmake +bin/svr4.make +lib/libmakestate.so +lib/libmakestate.so.1.0 +lib/svr4.make +share/lib/make/make.rules +share/lib/make/svr4.make.rules +share/man/man1/dmake.1.gz +share/man/man1/make.1.gz +share/man/man1/sysV-make.1.gz +xpg4/bin/make diff --git a/editors/Makefile b/editors/Makefile index 4f49be1dc5d6..a81ad28eccea 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -254,6 +254,7 @@ SUBDIR += tweak SUBDIR += uemacs SUBDIR += uzap + SUBDIR += ved SUBDIR += vigor SUBDIR += vile SUBDIR += vim diff --git a/editors/ved/Makefile b/editors/ved/Makefile new file mode 100644 index 000000000000..68fb5476f2e8 --- /dev/null +++ b/editors/ved/Makefile @@ -0,0 +1,15 @@ +PORTNAME= ved +CATEGORIES= editors + +COMMENT= Visual editor (easy to learn, fast, and lean) + +OPTIONS_DEFINE= DOCS + +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= ved + +post-install-DOCS-off: + ${RM} ${STAGEDIR}share/doc/vedsheet.* + ${RM} ${STAGEDIR}share/man/help/ved.help.gz + +.include "${MASTERDIR}/Makefile.master" diff --git a/editors/ved/pkg-descr b/editors/ved/pkg-descr new file mode 100644 index 000000000000..7510c7e582d2 --- /dev/null +++ b/editors/ved/pkg-descr @@ -0,0 +1,8 @@ +Ved is a fast and easy to learn screen oriented editor, that implements +no file size limits. The user interface is somewhere between emacs and +vi and does not limit the work speed even of experienced users. + +Ved has been inspired by an editor of the same name that appeared in +1980 as system editor on UNOS (the first UNIX clone). + +WWW: http://schilytools.sourceforge.net/ved.html diff --git a/editors/ved/pkg-plist b/editors/ved/pkg-plist new file mode 100644 index 000000000000..5825fa7bd3be --- /dev/null +++ b/editors/ved/pkg-plist @@ -0,0 +1,10 @@ +bin/ved +bin/ved-e +bin/ved-w +%%DOCSDIR%%/dotfiles.tar.bz2 +%%PORTDOCS%%%%DOCSDIR%%/vedsheet.ps +%%PORTDOCS%%%%DOCSDIR%%/vedsheet.tr +%%PORTDOCS%%share/man/help/ved.help.gz +share/man/man1/ved-e.1.gz +share/man/man1/ved-w.1.gz +share/man/man1/ved.1.gz diff --git a/misc/Makefile b/misc/Makefile index f1a4d818cbe8..eefd3804a87d 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -455,6 +455,7 @@ SUBDIR += rubygem-vpim SUBDIR += rump SUBDIR += ruut + SUBDIR += schilytools SUBDIR += sdformat SUBDIR += seabios SUBDIR += sent diff --git a/misc/schilytools/Makefile b/misc/schilytools/Makefile new file mode 100644 index 000000000000..e6027ead3637 --- /dev/null +++ b/misc/schilytools/Makefile @@ -0,0 +1,23 @@ +PORTNAME= schilytools +DISTVERSION= 1 +CATEGORIES= misc + +MAINTAINER= fuz@fuz.su +COMMENT= Collection of tools and libraries by J. Schilling (metaport) + +LICENSE= PD + +RUN_DEPENDS= schilybase>=2021.05.19:devel/schilybase \ + schilyutils>=2021.05.19:sysutils/schilyutils \ + star>=2021.05.19:archivers/star \ + sccs>=2021.05.19:devel/sccs \ + smake>=2021.05.19:devel/smake \ + 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 + +USES= metaport + +.include <bsd.port.mk> diff --git a/misc/schilytools/pkg-descr b/misc/schilytools/pkg-descr new file mode 100644 index 000000000000..3f5b24aba9a5 --- /dev/null +++ b/misc/schilytools/pkg-descr @@ -0,0 +1,15 @@ +Schily-Tools are a set of tools developed or maintained by Joerg Schilling. +This is a meta port to install all packages derived from the Schily-Tools. + +Programs and tools included in the Schily-Tools bundle: + + * Cdrtools (cdrecord/cdda2wav/mkisofs/...) + * The Schily-Bourne Shell + * The Schily-SunPro Make + * A K&R cpp derived from the original cpp sources from John F. Reiser + * cstyle is a C-indentation lint tool derived from the OpenSolaris sources + * spatch is derived from the last patch from Larry Wall, POSIX compliant + and using a 1-clause BSD license. + * SCCS derived from OpenSolaris sources + * star, the oldest free TAR implementation, started in 1982 + * ved, A portable, easy to learn and extremely fast screen oriented editor. diff --git a/net/Makefile b/net/Makefile index b92f919e88f5..25f106c8672a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1188,6 +1188,7 @@ SUBDIR += routinator SUBDIR += rp-pppoe SUBDIR += rpki-client + SUBDIR += rscsi SUBDIR += rsocket-cpp SUBDIR += rsplib SUBDIR += rsync diff --git a/net/rscsi/Makefile b/net/rscsi/Makefile new file mode 100644 index 000000000000..b431918178e7 --- /dev/null +++ b/net/rscsi/Makefile @@ -0,0 +1,14 @@ +PORTNAME= rscsi +CATEGORIES= net + +COMMENT= Remote SCSI transport server program (daemon) + +CONFLICTS= cdrtools-devel + +USERS= rscsi +GROUPS= rscsi + +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= rscsi + +.include "${MASTERDIR}/Makefile.master" diff --git a/net/rscsi/pkg-descr b/net/rscsi/pkg-descr new file mode 100644 index 000000000000..a879d575d224 --- /dev/null +++ b/net/rscsi/pkg-descr @@ -0,0 +1,13 @@ +The rscsi command is a remote generic SCSI transport server program. +rscsi is a program that is run locally on the machine with SCSI +devices, it is used by remote programs like cdrecord(1), cdda2wav(1), +readcd(1), and sformat(1) that like to access SCSI devices through an +interprocess communication connection via libscg. rscsi is normally +started up with an rexec(3) or rcmd(3) call but it may also be +connected via an internal pipe to an ssh(1) session that was set up by +the remote user. + +The rscsi command must be installed setuid root for full functionality. +For this reason it is provided as a separate package to cdrtools. + +WWW: http://cdrtools.sourceforge.net/ diff --git a/net/rscsi/pkg-message b/net/rscsi/pkg-message new file mode 100644 index 000000000000..52b00f3a8070 --- /dev/null +++ b/net/rscsi/pkg-message @@ -0,0 +1,6 @@ +See /usr/local/share/doc/cdrtools/README.rscsi and /usr/local/etc/rscsi +for further information on how to configure remote access to SCSI-devies +via rscsi. + +Don't forget to add an entry for rshd(8) to /etc/inetd.conf in order to +be able to use the remote SCSI daemon. diff --git a/net/rscsi/pkg-plist b/net/rscsi/pkg-plist new file mode 100644 index 000000000000..ef2af9b37a80 --- /dev/null +++ b/net/rscsi/pkg-plist @@ -0,0 +1,4 @@ +@(root,,4711) sbin/rscsi +etc/default/rscsi +share/man/man1/rscsi.1.gz +share/doc/rscsi/default-rscsi.sample diff --git a/sysutils/Makefile b/sysutils/Makefile index 2f0cd87f0800..28918d81b7de 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -155,7 +155,6 @@ SUBDIR += cdrkit SUBDIR += cdroot SUBDIR += cdrtools - SUBDIR += cdrtools-devel SUBDIR += cfengine SUBDIR += cfengine-devel SUBDIR += cfengine-masterfiles @@ -1247,6 +1246,7 @@ SUBDIR += scanmem SUBDIR += scct SUBDIR += schedutils + SUBDIR += schilyutils SUBDIR += screen SUBDIR += screenfetch SUBDIR += screenfetch-nox11 @@ -1261,7 +1261,6 @@ SUBDIR += serf SUBDIR += setcdboot SUBDIR += setsid - SUBDIR += sformat SUBDIR += sg3_utils SUBDIR += shim SUBDIR += shlock diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile deleted file mode 100644 index 9f9ea2d94f32..000000000000 --- a/sysutils/cdrtools-devel/Makefile +++ /dev/null @@ -1,220 +0,0 @@ -########################################################################### -# This makefile was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - -PORTNAME= cdrtools -PORTVERSION= 3.02a09 -PORTEPOCH= 1 -CATEGORIES= sysutils audio -MASTER_SITES= SF/${PORTNAME}/alpha - -MAINTAINER= marius@FreeBSD.org -COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools - -LICENSE= BSD2CLAUSE CDDL GPLv2 LGPL21 -LICENSE_COMB= multi - -CONFLICTS= cdrkit-* cdrtools-[0-9]* cjk-cdrtools-* - -DOCS= README.FreeBSD README.mkisofs -CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO -CDRECORDDOCS= README README.ATAPI README.DiskT@2 README.WORM README.audio \ - README.cdplus README.cdrw README.cdtext README.clone \ - README.copy README.multi README.raw README.rscsi README.sony \ - README.verify -MKISOFSDOCS= README README.compression README.eltorito README.graft_dirs \ - README.hfs_boot README.hfs_magic README.hide README.joliet \ - README.macosx README.mkhybrid README.prep_boot README.rootinfo \ - README.session README.sort README.sparcboot README.sunx86boot -SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \ - cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ - cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 \ - cp862 cp863 cp864 cp865 cp866 cp869 cp874 iso8859-1 \ - iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ - iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \ - iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u - -USES= gmake tar:bzip2 -#CFLAGS+= -DSOURCE_MODIFIED -WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//} -SUB_FILES= pkg-message -MAKE_JOBS_UNSAFE= yes - -OPTIONS_DEFINE= CDDA2MP3 CDDA2OGG DOCS NLS RSCSI - -CDDA2MP3_DESC= Build cdda2mp3 (requires audio/lame) -CDDA2OGG_DESC= Build cdda2ogg (requires audio/vorbis-tools) -RSCSI_DESC= Build rscsi suid root remote SCSI access daemon - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCDDA2MP3} -PLIST_SUB+= CDDA2MP3="" -RUN_DEPENDS+= lame:audio/lame -.else -PLIST_SUB+= CDDA2MP3="@comment " -.endif -.if ${PORT_OPTIONS:MCDDA2OGG} -PLIST_SUB+= CDDA2OGG="" -RUN_DEPENDS+= oggenc:audio/vorbis-tools -.else -PLIST_SUB+= CDDA2OGG="@comment " -.endif -.if ${PORT_OPTIONS:MRSCSI} -PKGINSTALL= ${PKGDIR}/pkg-install.rscsi -PLIST_SUB+= RSCSI="" -PKGNAMESUFFIX= -rscsi-devel -.else -PLIST_SUB+= RSCSI="@comment " -.endif -PKGNAMESUFFIX?= -devel - -MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \ - INS_RBASE=${LOCALBASE} -CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc -CDRTLSXARCH!= ${UNAME} -m - -.if exists(/usr/include/iconv.h) -USES+= iconv -.endif -.if exists(${LOCALBASE}/lib/libiconv.a) || \ - exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS} -MAKE_ENV+= DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib -USES+= gettext iconv -.endif - -post-extract: -.for i in config.guess config.sub -.for j in autoconf conf cdda2wav - @${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j} -.endfor -.endfor -.if ${CDRTLSXARCH} != "i386" - @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul -.endif - -post-patch: - @${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man -.if !${PORT_OPTIONS:MRSCSI} - @${RM} ${WRKSRC}/TARGETS/55rscsi -.endif -.for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \ - cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \ - cdrecord/cdrecord.1 cdrecord/cdrecord.dfl include/schily/deflts.h \ - libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c readcd/readcd.1 \ - rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1 - @${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \ - s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \ - s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \ - s|^CDDA2WAV=|&${PREFIX}\/bin\/|g; \ - s|^MP_CODER=|&${LOCALBASE}\/bin\/|g' ${WRKSRC}/${i} -.endfor - @${MV} -f ${WRKSRC}/libparanoia/cdda_paranoia.h \ - ${WRKSRC}/libparanoia/js_cdda_paranoia.h -.for i in cdda2wav/cdda2wav.c cdda2wav/global.h libparanoia/gap.c \ - libparanoia/overlap.c libparanoia/p_block.c libparanoia/paranoia.c - @${REINPLACE_CMD} -e 's|cdda_paranoia\.h|js_cdda_paranoia.h|g' \ - ${WRKSRC}/${i} -.endfor -# @${REINPLACE_CMD} -E -e \ -# 's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \ -# ${WRKSRC}/cdrecord/cdrecord.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \ - ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MCDDA2MP3} - ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ - ${STAGEDIR}${PREFIX}/man/man1/cdda2mp3.1 -.endif -.if ${PORT_OPTIONS:MCDDA2OGG} - ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ - ${STAGEDIR}${PREFIX}/man/man1 -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \ - ${STAGEDIR}${PREFIX}/bin - ${LN} -sf cdda2wav ${STAGEDIR}${PREFIX}/bin/list_audio_tracks - ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \ - ${STAGEDIR}${PREFIX}/bin -.for i in devdump isodebug isodump isoinfo isovfy - ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \ - ${STAGEDIR}${PREFIX}/bin -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \ - ${STAGEDIR}${PREFIX}/bin - ${LN} -sf mkisofs ${STAGEDIR}${PREFIX}/bin/mkhybrid - ${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \ - ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MRSCSI} - ${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \ - ${STAGEDIR}${PREFIX}/sbin -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${STAGEDIR}${PREFIX}/man/man1 -.if ${PORT_OPTIONS:MRSCSI} - @${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif - ${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${STAGEDIR}${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 \ - ${STAGEDIR}${PREFIX}/man/man8 - ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ - ${STAGEDIR}${PREFIX}/etc/cdrecord.sample -.if !exists(${STAGEDIR}${PREFIX}/etc/cdrecord) - ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ - ${STAGEDIR}${PREFIX}/etc/cdrecord -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/siconv -.for i in ${SICONVTABLES} - ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} \ - ${STAGEDIR}${PREFIX}/lib/siconv -.endfor -.if ${PORT_OPTIONS:MRSCSI} - ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl \ - ${STAGEDIR}${PREFIX}/etc/rscsi.sample -.if !exists(${STAGEDIR}${PREFIX}/etc/rscsi) - ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${STAGEDIR}${PREFIX}/etc/rscsi -.endif -.endif - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdda2wav -.for i in ${CDDA2WAVDOCS} - ${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${STAGEDIR}${DOCSDIR}/cdda2wav -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdrecord -.for i in ${CDRECORDDOCS} - ${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${STAGEDIR}${DOCSDIR}/cdrecord -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR}/mkisofs -.for i in ${MKISOFSDOCS} - ${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${STAGEDIR}${DOCSDIR}/mkisofs -.endfor - -.include <bsd.port.mk> diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo deleted file mode 100644 index eab66b250425..000000000000 --- a/sysutils/cdrtools-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1526292215 -SHA256 (cdrtools-3.02a09.tar.bz2) = aa28438f458ef3f314b79f2029db27679dae1d5ffe1569b6de57742511915e81 -SIZE (cdrtools-3.02a09.tar.bz2) = 2156745 diff --git a/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd b/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd deleted file mode 100644 index 116baad30d75..000000000000 --- a/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd +++ /dev/null @@ -1,30 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- DEFAULTS/Defaults.freebsd.orig 2013-11-04 20:58:20 UTC -+++ DEFAULTS/Defaults.freebsd -@@ -29,8 +29,8 @@ DEFLINKMODE= static - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --DEFOSINCDIRS= /usr/local/include --LDPATH= -L/opt/schily/lib -L/usr/local/lib -+#DEFOSINCDIRS= /usr/local/include -+#LDPATH= -L/opt/schily/lib -L/usr/local/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work - - ########################################################################### diff --git a/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul b/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul deleted file mode 100644 index 6762c784a475..000000000000 --- a/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul +++ /dev/null @@ -1,87 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- RULES/cc-gcc.rul.orig 2017-05-28 21:47:50 UTC -+++ RULES/cc-gcc.rul -@@ -24,11 +24,12 @@ - GCC_OPT= - GCC_OPT32= -m32 - GCC_OPT64= -m64 --GCC_OPTXX= $(GCC_OPT$(C_ARCH:gcc%=%)) -+GCC_OPTXX= - - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) --C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) -+XCFLAGS:= $(CFLAGS) -+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) -+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) - - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) - COPTS= $(GCC_OPTXX) -@@ -36,12 +37,10 @@ COPTS= $(GCC_OPTXX) - CWOPTS= -Wall -Wtraditional - CWOPTS= -Wall -Wno-unknown-pragmas \ - -Wshadow -Wmissing-prototypes -Wstrict-prototypes --COPTOPT= -O - COPTDYN= -fpic - COPTGPROF= -pg - C++OPTS= $(GCC_OPTXX) - C++WOPTS= $(CWOPTS) --C++OPTOPT= $(COPTOPT) - C++OPTDYN= -fpic - C++OPTGPROF= -pg - -@@ -63,28 +62,18 @@ LNDYNLIB= @$(RM) $(RM_FORCE) $(PTARGET_B - - FLOAT_OPTIONS= - --__CC_COM= $(_UNIQ)$(CC) --___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) --CC_COM= $(___CC_COM:$(_UNIQ)%=%) -- --__CC++_COM= $(_UNIQ)$(CCC) --___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) --CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) -- --CC_COM_DEF= gcc --CC++_COM_DEF= g++ --CC= $(CC_COM_DEF) --CCC= $(CC++_COM_DEF) -+CC_COM= $(CC) -+CC++_COM= $(CXX) - --CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) $(GCC_OPTXX) --CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) $(GCC_OPTXX) --LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) $(GCC_OPTXX) --LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) $(GCC_OPTXX) --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) $(GCC_OPTXX) --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) $(GCC_OPTXX) -+CCCC = $(CC_COM) -+CC++ = $(CC++_COM) -+LDCC= $(CC_COM) -+LDCC++ = $(CC++_COM) -+DYNLD= $(CC_COM) -+DYNLDC++ = $(CC++_COM) - - RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) $(GCC_OPTXX) -M -+MKDEP= $(CC_COM) -M - MKDEP_OUT= --MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) $(GCC_OPTXX) -M -+MKC++DEP= $(CC++_COM) -M - MKC++DEP_OUT= diff --git a/sysutils/cdrtools-devel/files/patch-inc_avoffset.c b/sysutils/cdrtools-devel/files/patch-inc_avoffset.c deleted file mode 100644 index a2c0807ebfd0..000000000000 --- a/sysutils/cdrtools-devel/files/patch-inc_avoffset.c +++ /dev/null @@ -1,44 +0,0 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- inc/avoffset.c.orig 2017-08-01 18:10:02 UTC -+++ inc/avoffset.c -@@ -50,7 +50,7 @@ main(ac, av) - { - int stdir; - #ifdef HAVE_SCANSTACK -- register struct frame *fp; -+ volatile struct frame *fp; - register int i = 0; - register int o = 0; - -@@ -105,6 +105,7 @@ main(ac, av) - * does not affect the new code extended as well. - */ - while (i <= 1000 && fp->fr_savfp) { -+#if 0 - /* - * Workaround for the still buggy clang... - * clang version 4.0.0 on ARM64 FreeBSD has become worse. -@@ -113,6 +114,7 @@ main(ac, av) - * is never touched. - */ - write(-1, "", 0); -+#endif - if (fp->fr_savpc == 0) - break; - diff --git a/sysutils/cdrtools-devel/files/patch-inc_getfp.c b/sysutils/cdrtools-devel/files/patch-inc_getfp.c deleted file mode 100644 index 089bab7bf79a..000000000000 --- a/sysutils/cdrtools-devel/files/patch-inc_getfp.c +++ /dev/null @@ -1,37 +0,0 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- inc/getfp.c.orig 2015-12-23 20:18:33 UTC -+++ inc/getfp.c -@@ -80,7 +80,7 @@ getfp() - * We need this function to fool GCCs check for returning addresses - * from outside the functions local address space. - */ --EXPORT void ** -+EXPORT __noinline void ** - ___fpoff(cp) - char *cp; - { -@@ -104,7 +104,7 @@ flush_reg_windows(n) - - #else /* HAVE_SCANSTACK */ - --EXPORT void ** -+EXPORT __noinline void ** - getfp() - { - raisecond("getfp", 0); diff --git a/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h b/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h deleted file mode 100644 index 837c22b2b361..000000000000 --- a/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/schily/sha2.h.orig 2010-08-27 10:41:30 UTC -+++ include/schily/sha2.h -@@ -104,10 +104,12 @@ extern char *SHA256Data __PR((const UIn - - #ifdef HAVE_LONGLONG - extern void SHA384Init __PR((SHA2_CTX *)); -+#ifndef HAVE_PRAGMA_WEAK - extern void SHA384Transform __PR((UInt64_t state[8], - const UInt8_t [SHA384_BLOCK_LENGTH])); - extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); - extern void SHA384Pad __PR((SHA2_CTX *)); -+#endif - extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], - SHA2_CTX *)); - extern char *SHA384End __PR((SHA2_CTX *, char *)); diff --git a/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c b/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c deleted file mode 100644 index e016ebf1921b..000000000000 --- a/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c +++ /dev/null @@ -1,16 +0,0 @@ ---- libschily/fnmatch.c.orig 2017-08-29 23:04:40 UTC -+++ libschily/fnmatch.c -@@ -369,11 +369,11 @@ rangematch(pattern, test, flags, newp, p - /* - * Convert to the other case - */ -- if (strcmp(class, "upper") == 0) -+ if (strcmp(class, "upper") == 0) { - if (iswctype(otest, - wctype("lower"))) - ok = 1; -- else if (strcmp(class, "lower") == 0) -+ } else if (strcmp(class, "lower") == 0) - if (iswctype(otest, - wctype("upper"))) - ok = 1; diff --git a/sysutils/cdrtools-devel/files/patch-libschily_getfp.c b/sysutils/cdrtools-devel/files/patch-libschily_getfp.c deleted file mode 100644 index 6e7340f02b77..000000000000 --- a/sysutils/cdrtools-devel/files/patch-libschily_getfp.c +++ /dev/null @@ -1,37 +0,0 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- libschily/getfp.c.orig 2015-12-23 20:18:33 UTC -+++ libschily/getfp.c -@@ -80,7 +80,7 @@ getfp() - * We need this function to fool GCCs check for returning addresses - * from outside the functions local address space. - */ --EXPORT void ** -+EXPORT __noinline void ** - ___fpoff(cp) - char *cp; - { -@@ -104,7 +104,7 @@ flush_reg_windows(n) - - #else /* HAVE_SCANSTACK */ - --EXPORT void ** -+EXPORT __noinline void ** - getfp() - { - raisecond("getfp", 0); diff --git a/sysutils/cdrtools-devel/files/pkg-message.in b/sysutils/cdrtools-devel/files/pkg-message.in deleted file mode 100644 index 48b73aede39f..000000000000 --- a/sysutils/cdrtools-devel/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -[ -{ type: install - message: <<EOM -Note: The location of the cdrtools `defaults' files has been set to - - %%PREFIX%%/etc - -This is the FreeBSD ports standard config file location, NOT the cdrtools -standard location, which is /etc/default. - -The reason for this is that FreeBSD ports and packages should not use -configuration files outside of %%PREFIX%%. -EOM -} -] diff --git a/sysutils/cdrtools-devel/pkg-descr b/sysutils/cdrtools-devel/pkg-descr deleted file mode 100644 index 5d82f883df49..000000000000 --- a/sysutils/cdrtools-devel/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -The cdrtools software includes tools to create and/or extract -ISO-9660 filesystems, verify their integrity, and write them to -disc. - -This package contains the following programs: -- btcflash (a firmware flash utility for BTC DRW1008 DVD+/-RW recorder) -- cdda2wav (a digital CD audio extraction program) -- cdrecord (a CD/DVD/BluRay recording program) -- devdump (dump a device or file in hex) -- isodebug (show debug info contained in an ISO-9660 image) -- isodump (dump a device or file based on ISO-9660) -- isoinfo (analyze or list an ISO-9660 image) -- isovfy (verify an ISO-9660 image) -- mkisofs (an ISO-9660 filesystem image creator) -- mkhybrid (an ISO-9660/HFS filesystem image creator) - Link to mkisofs. -- readcd (a data CD reading and recording program) - May be used to write to DVD-RAM and to copy Solaris boot CD's. -- scgcheck (checks and validates the ABI of libscg) -- rscsi (daemon providing access to local SCSI-devices over the network) - -WWW: http://cdrecord.org/ diff --git a/sysutils/cdrtools-devel/pkg-install.rscsi b/sysutils/cdrtools-devel/pkg-install.rscsi deleted file mode 100644 index fe91941c71ae..000000000000 --- a/sysutils/cdrtools-devel/pkg-install.rscsi +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/sbin:/usr/bin - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} - -case $2 in - PRE-INSTALL) - ;; - - POST-INSTALL) - USER=rscsi - UID=99 - GROUP=${USER} - GID=${UID} - UCOMMENT="Remote SCSI" - UHOME=${PKG_PREFIX}/rscsi - USHELL=${PKG_PREFIX}/sbin/rscsi - - echo "===========================================================================" - echo - - if ! pw groupshow "${GROUP}" >/dev/null 2>&1; then - if ! pw groupadd ${GROUP} -g ${GID}; then - echo "Adding group \"${GROUP}\" failed." - exit 1 - fi - fi - - if ! pw usershow "${USER}" >/dev/null 2>&1; then - if ! pw useradd ${USER} -u ${UID} -c "${UCOMMENT}" \ - -d ${UHOME} -g ${GROUP} -s ${USHELL}; then - echo "Adding user \"${USER}\" failed." - exit 1 - fi - fi - - if ! [ -d ${UHOME} ] ; then - mkdir -p ${UHOME} - chown ${UID}:${GID} ${UHOME} - fi - - if ! [ -f ${UHOME}/.rhosts ] ; then - cp /usr/share/skel/dot.rhosts ${UHOME}/.rhosts - chown ${UID}:${GID} ${UHOME}/.rhosts - chmod 0600 ${UHOME}/.rhosts - fi - - echo "See ${PKG_PREFIX}/share/doc/cdrtools/README.rscsi and ${PKG_PREFIX}/etc/rscsi" - echo "for further information on how to configure remote access to SCSI-devices" - echo "via rscsi." - - if ! grep '^shell' /etc/inetd.conf >/dev/null 2>&1; then - echo "Don't forget to add an entry for rshd(8) to /etc/inetd.conf in order to" - echo "be able to use the remote SCSI daemon." - fi - - echo - - ;; -esac diff --git a/sysutils/cdrtools-devel/pkg-plist b/sysutils/cdrtools-devel/pkg-plist deleted file mode 100644 index 6430678bce42..000000000000 --- a/sysutils/cdrtools-devel/pkg-plist +++ /dev/null @@ -1,118 +0,0 @@ -bin/btcflash -%%CDDA2MP3%%bin/cdda2mp3 -%%CDDA2OGG%%bin/cdda2ogg -%%CDDA2MP3%%man/man1/cdda2mp3.1.gz -%%CDDA2OGG%%man/man1/cdda2ogg.1.gz -bin/cdda2wav -bin/cdrecord -bin/devdump -bin/isodebug -bin/isodump -bin/isoinfo -bin/isovfy -bin/list_audio_tracks -bin/mkhybrid -bin/mkisofs -bin/readcd -bin/scgcheck -lib/siconv/cp10000 -lib/siconv/cp10006 -lib/siconv/cp10007 -lib/siconv/cp10029 -lib/siconv/cp10079 -lib/siconv/cp10081 -lib/siconv/cp1250 -lib/siconv/cp1251 -lib/siconv/cp1252 -lib/siconv/cp1253 -lib/siconv/cp1254 -lib/siconv/cp1255 -lib/siconv/cp1256 -lib/siconv/cp1257 -lib/siconv/cp1258 -lib/siconv/cp437 -lib/siconv/cp737 -lib/siconv/cp775 -lib/siconv/cp850 -lib/siconv/cp852 -lib/siconv/cp855 -lib/siconv/cp857 -lib/siconv/cp860 -lib/siconv/cp861 -lib/siconv/cp862 -lib/siconv/cp863 -lib/siconv/cp864 -lib/siconv/cp865 -lib/siconv/cp866 -lib/siconv/cp869 -lib/siconv/cp874 -lib/siconv/iso8859-1 -lib/siconv/iso8859-10 -lib/siconv/iso8859-11 -lib/siconv/iso8859-13 -lib/siconv/iso8859-14 -lib/siconv/iso8859-15 -lib/siconv/iso8859-16 -lib/siconv/iso8859-2 -lib/siconv/iso8859-3 -lib/siconv/iso8859-4 -lib/siconv/iso8859-5 -lib/siconv/iso8859-6 -lib/siconv/iso8859-7 -lib/siconv/iso8859-8 -lib/siconv/iso8859-9 -lib/siconv/koi8-r -lib/siconv/koi8-u -man/man1/btcflash.1.gz -man/man1/cdda2wav.1.gz -man/man1/cdrecord.1.gz -man/man1/readcd.1.gz -man/man1/scgcheck.1.gz -man/man8/isoinfo.8.gz -man/man8/mkisofs.8.gz -%%RSCSI%%@(,,4555) sbin/rscsi -@sample etc/cdrecord.sample -%%RSCSI%%@sample etc/rscsi.sample -%%RSCSI%%@unexec if pw usershow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, user \"rscsi\" and its homedirectory must be removed manually."; fi -%%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi -%%RSCSI%%man/man1/rscsi.1.gz -%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD -%%PORTDOCS%%%%DOCSDIR%%/README.mkisofs -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/OtherProgs -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/README -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.ATAPI -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.DiskT@2 -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.WORM -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.audio -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdplus -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdrw -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdtext -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.clone -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.copy -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.multi -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.raw -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.rscsi -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.sony -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.verify -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.graft_dirs -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hfs_boot -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hfs_magic -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hide -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.joliet -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.macosx -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.mkhybrid -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.prep_boot -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.rootinfo -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.session -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sort -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sparcboot -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sunx86boot diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 39dc2c9ef73c..8a8865e2c8b1 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -1,224 +1,38 @@ -# Created by: Dirk Froemberg <dirk@FreeBSD.org> - -########################################################################### -# This makefile was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - PORTNAME= cdrtools -PORTVERSION= 3.01 -PORTREVISION= 1 CATEGORIES= sysutils audio -MASTER_SITES= SF/${PORTNAME} - -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch -PATCH_DIST_STRIP= -p1 - -MAINTAINER= marius@FreeBSD.org -COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools - -LICENSE= BSD2CLAUSE CDDL GPLv2 LGPL21 -LICENSE_COMB= multi - -CONFLICTS= cdrkit-* cdrtools-devel-* cjk-cdrtools-* - -DOCS= README.FreeBSD README.mkisofs -CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO -CDRECORDDOCS= README README.ATAPI README.DiskT@2 README.WORM README.audio \ - README.cdplus README.cdrw README.cdtext README.clone \ - README.copy README.multi README.raw README.rscsi README.sony \ - README.verify -MKISOFSDOCS= README README.compression README.eltorito README.graft_dirs \ - README.hfs_boot README.hfs_magic README.hide README.joliet \ - README.macosx README.mkhybrid README.prep_boot README.rootinfo \ - README.session README.sort README.sparcboot README.sunx86boot -SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \ - cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ - cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 \ - cp862 cp863 cp864 cp865 cp866 cp869 cp874 iso8859-1 \ - iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ - iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \ - iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u - -USES= gmake tar:bzip2 -#CFLAGS+= -DSOURCE_MODIFIED -SUB_FILES= pkg-message -MAKE_JOBS_UNSAFE= yes - -OPTIONS_DEFINE= CDDA2MP3 CDDA2OGG DOCS NLS RSCSI -CDDA2MP3_DESC= Build cdda2mp3 (requires audio/lame) -CDDA2OGG_DESC= Build cdda2ogg (requires audio/vorbis-tools) -RSCSI_DESC= Build rscsi suid root remote SCSI access daemon +COMMENT= Tools for ripping from and recording to CDs and DVDs -.include <bsd.port.options.mk> +LAME_RUN_DEPENDS= lame:audio/lame +VORBIS_RUN_DEPENDS= oggenc:audio/vorbis-tools -.if ${PORT_OPTIONS:MCDDA2MP3} -PLIST_SUB+= CDDA2MP3="" -RUN_DEPENDS+= lame:audio/lame -.else -PLIST_SUB+= CDDA2MP3="@comment " -.endif -.if ${PORT_OPTIONS:MCDDA2OGG} -PLIST_SUB+= CDDA2OGG="" -RUN_DEPENDS+= oggenc:audio/vorbis-tools -.else -PLIST_SUB+= CDDA2OGG="@comment " -.endif -.if ${PORT_OPTIONS:MRSCSI} -PKGINSTALL= ${PKGDIR}/pkg-install.rscsi -PLIST_SUB+= RSCSI="" -PKGNAMESUFFIX= -rscsi -.else -PLIST_SUB+= RSCSI="@comment " -.endif +OPTIONS_DEFINE= DOCS LAME VORBIS SETUID +OPTIONS_DEFAULT=DOCS LAME VORBIS +OPTIONS_SUB= yes +LAME_DESC= Install cdda2mp3 (requires audio/lame) +VORBIS_DESC= Install cdda2ogg (requires audio/vorbis-tools) +SETUID_DESC= Install cdrecord, cdda2wav, and readcd as setuid root +SETUID_PLIST_SUB= SUID="@(root,,4711) " +SETUID_PLIST_SUB_OFF= SUID="@(,,755) " -MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \ - INS_RBASE=${LOCALBASE} -CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc -CDRTLSXARCH!= ${UNAME} -m +CONFLICTS_INSTALL= cdrkit-* cdrtools-devel cdrtools-rscsi-devel -.if exists(/usr/include/iconv.h) -USES+= iconv -.endif -.if exists(${LOCALBASE}/lib/libiconv.a) || \ - exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS} -MAKE_ENV+= DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib -USES+= gettext iconv -.endif +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= cdda2wav \ + cdrecord \ + mkisofs \ + mkisofs/diag \ + readcd \ + scgcheck \ + scgskeleton -post-extract: -.for i in config.guess config.sub -.for j in autoconf conf cdda2wav - @${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j} -.endfor -.endfor -.if ${CDRTLSXARCH} != "i386" - @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul -.endif +post-install-LAME-off: + ${RM} ${STAGEDIR}${PREFIX}/bin/cdda2mp3 ${STAGEDIR}${PREFIX}share/man/man1/cdda2mp3.1 -post-patch: - @${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man -.if !${PORT_OPTIONS:MRSCSI} - @${RM} ${WRKSRC}/TARGETS/55rscsi -.endif -.for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \ - cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \ - cdrecord/cdrecord.1 cdrecord/cdrecord.dfl include/schily/deflts.h \ - libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c readcd/readcd.1 \ - rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1 - @${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \ - s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \ - s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \ - s|^CDDA2WAV=|&${PREFIX}\/bin\/|g; \ - s|^MP_CODER=|&${LOCALBASE}\/bin\/|g' ${WRKSRC}/${i} -.endfor - @${MV} -f ${WRKSRC}/libparanoia/cdda_paranoia.h \ - ${WRKSRC}/libparanoia/js_cdda_paranoia.h -.for i in cdda2wav/cdda2wav.c cdda2wav/global.h libparanoia/gap.c \ - libparanoia/overlap.c libparanoia/p_block.c libparanoia/paranoia.c - @${REINPLACE_CMD} -e 's|cdda_paranoia\.h|js_cdda_paranoia.h|g' \ - ${WRKSRC}/${i} -.endfor -# @${REINPLACE_CMD} -E -e \ -# 's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \ -# ${WRKSRC}/cdrecord/cdrecord.c +post-install-VORBIS-off: + ${RM} ${STAGEDIR}${PREFIX}/bin/cdda2ogg ${STAGEDIR}${PREFIX}share/man/man1/cdda2ogg.1 -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \ - ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MCDDA2MP3} - ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ - ${STAGEDIR}${PREFIX}/man/man1/cdda2mp3.1 -.endif -.if ${PORT_OPTIONS:MCDDA2OGG} - ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ - ${STAGEDIR}${PREFIX}/man/man1 -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \ - ${STAGEDIR}${PREFIX}/bin - ${LN} -sf cdda2wav ${STAGEDIR}${PREFIX}/bin/list_audio_tracks - ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \ - ${STAGEDIR}${PREFIX}/bin -.for i in devdump isodebug isodump isoinfo isovfy - ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \ - ${STAGEDIR}${PREFIX}/bin -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \ - ${STAGEDIR}${PREFIX}/bin - ${LN} -sf mkisofs ${STAGEDIR}${PREFIX}/bin/mkhybrid - ${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \ - ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MRSCSI} - ${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \ - ${STAGEDIR}${PREFIX}/sbin -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${STAGEDIR}${PREFIX}/man/man1 -.if ${PORT_OPTIONS:MRSCSI} - @${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif - ${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${STAGEDIR}${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 \ - ${STAGEDIR}${PREFIX}/man/man8 - ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ - ${STAGEDIR}${PREFIX}/etc/cdrecord.sample -.if !exists(${STAGEDIR}${PREFIX}/etc/cdrecord) - ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ - ${STAGEDIR}${PREFIX}/etc/cdrecord -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/siconv -.for i in ${SICONVTABLES} - ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} \ - ${STAGEDIR}${PREFIX}/lib/siconv -.endfor -.if ${PORT_OPTIONS:MRSCSI} - ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl \ - ${STAGEDIR}${PREFIX}/etc/rscsi.sample -.if !exists(${STAGEDIR}${PREFIX}/etc/rscsi) - ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${STAGEDIR}${PREFIX}/etc/rscsi -.endif -.endif - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdda2wav -.for i in ${CDDA2WAVDOCS} - ${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${STAGEDIR}${DOCSDIR}/cdda2wav -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdrecord -.for i in ${CDRECORDDOCS} - ${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${STAGEDIR}${DOCSDIR}/cdrecord -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR}/mkisofs -.for i in ${MKISOFSDOCS} - ${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${STAGEDIR}${DOCSDIR}/mkisofs -.endfor +post-install-DOCS-off: + ${RM} ${STAGEDIR}share/doc -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile.master" diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo deleted file mode 100644 index 81162ce12655..000000000000 --- a/sysutils/cdrtools/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1501001984 -SHA256 (cdrtools-3.01.tar.bz2) = ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f -SIZE (cdrtools-3.01.tar.bz2) = 2087416 -SHA256 (cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch) = 4e07a2be599c0b910ab3401744cec417dbdabf30ea867ee59030a7ad1906498b -SIZE (cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch) = 14606 diff --git a/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd b/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd deleted file mode 100644 index 5e08bb8ff554..000000000000 --- a/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd +++ /dev/null @@ -1,30 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 -+++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 -@@ -29,8 +29,8 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --DEFOSINCDIRS= /usr/local/include --LDPATH= -L/opt/schily/lib -L/usr/local/lib -+#DEFOSINCDIRS= /usr/local/include -+#LDPATH= -L/opt/schily/lib -L/usr/local/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work - - ########################################################################### diff --git a/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul b/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul deleted file mode 100644 index 549d244d4e4d..000000000000 --- a/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul +++ /dev/null @@ -1,88 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 -+++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -24,11 +24,12 @@ - GCC_OPT= - GCC_OPT32= -m32 - GCC_OPT64= -m64 --GCC_OPTXX= $(GCC_OPT$(C_ARCH:gcc%=%)) -+GCC_OPTXX= - - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) --C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) -+XCFLAGS:= $(CFLAGS) -+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) -+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) - - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) - COPTS= $(GCC_OPTXX) -@@ -36,12 +37,10 @@ - CWOPTS= -Wall -Wtraditional - CWOPTS= -Wall -Wno-unknown-pragmas \ - -Wshadow -Wmissing-prototypes -Wstrict-prototypes --COPTOPT= -O - COPTDYN= -fpic - COPTGPROF= -pg - C++OPTS= $(GCC_OPTXX) - C++WOPTS= $(CWOPTS) --C++OPTOPT= $(COPTOPT) - C++OPTDYN= -fpic - C++OPTGPROF= -pg - -@@ -61,28 +60,18 @@ - - FLOAT_OPTIONS= - --__CC_COM= $(_UNIQ)$(CC) --___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) --CC_COM= $(___CC_COM:$(_UNIQ)%=%) -- --__CC++_COM= $(_UNIQ)$(CCC) --___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) --CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) -- --CC_COM_DEF= gcc --CC++_COM_DEF= g++ --CC= $(CC_COM_DEF) --CCC= $(CC++_COM_DEF) -- --CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) $(GCC_OPTXX) --CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) $(GCC_OPTXX) --LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) $(GCC_OPTXX) --LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) $(GCC_OPTXX) --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) $(GCC_OPTXX) --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) $(GCC_OPTXX) -+CC_COM= $(CC) -+CC++_COM= $(CXX) -+ -+CCCC = $(CC_COM) -+CC++ = $(CC++_COM) -+LDCC= $(CC_COM) -+LDCC++ = $(CC++_COM) -+DYNLD= $(CC_COM) -+DYNLDC++ = $(CC++_COM) - - RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) $(GCC_OPTXX) -M -+MKDEP= $(CC_COM) -M - MKDEP_OUT= --MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) $(GCC_OPTXX) -M -+MKC++DEP= $(CC++_COM) -M - MKC++DEP_OUT= diff --git a/sysutils/cdrtools/files/patch-btcflash__btcflash.1 b/sysutils/cdrtools/files/patch-btcflash__btcflash.1 deleted file mode 100644 index c8b30d32f974..000000000000 --- a/sysutils/cdrtools/files/patch-btcflash__btcflash.1 +++ /dev/null @@ -1,10 +0,0 @@ ---- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 -+++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 -@@ -293,7 +293,6 @@ - login shell. - .SH "SEE ALSO" - .BR cdrecord (1), --.BR scg (7), - .BR rcmd (3), - .BR ssh (1). - .SH NOTES diff --git a/sysutils/cdrtools/files/patch-cdrecord__README.rscsi b/sysutils/cdrtools/files/patch-cdrecord__README.rscsi deleted file mode 100644 index 9398843e937a..000000000000 --- a/sysutils/cdrtools/files/patch-cdrecord__README.rscsi +++ /dev/null @@ -1,36 +0,0 @@ ---- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 -+++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 -@@ -18,24 +18,21 @@ - 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: -+ The FreeBSD port automatically installs the rscsi binary suid -+ root and creates the user "rscsi". - -- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi -- -- (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. -+ - 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 -+ - Edit /usr/local/rscsi/.rhosts to allow access to all users you -+ like. - -- - 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. - -- The template for this file is: rscsi/rscsi.dfl -+ The template for this file is: /usr/local/etc/rscsi.sample - - RSCSI Security: - diff --git a/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 b/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 deleted file mode 100644 index 88dc6bf0398f..000000000000 --- a/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 +++ /dev/null @@ -1,28 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 -+++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 -@@ -1738,8 +1738,6 @@ - .SH SEE ALSO - .BR cdda2wav (1), - .BR readcd (1), --.BR scg (7), --.BR fbk (7), - .BR mkisofs (8), - .BR rcmd (3), - .BR ssh (1). diff --git a/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl b/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl deleted file mode 100644 index 859f92768c34..000000000000 --- a/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl +++ /dev/null @@ -1,64 +0,0 @@ ---- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 -+++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 -@@ -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 @@ - # Linux and Solaris have problems with bigger transfer sizes. - # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k - # --#CDR_TRANSFERSIZE=32k -+CDR_TRANSFERSIZE=126k - - # - # 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/sysutils/cdrtools/files/patch-inc_avoffset.c b/sysutils/cdrtools/files/patch-inc_avoffset.c deleted file mode 100644 index ab1af624da6d..000000000000 --- a/sysutils/cdrtools/files/patch-inc_avoffset.c +++ /dev/null @@ -1,28 +0,0 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- inc/avoffset.c.orig 2011-11-28 19:28:41 UTC -+++ inc/avoffset.c -@@ -60,7 +60,7 @@ main(ac, av) - { - int stdir; - #ifdef HAVE_SCANSTACK -- register struct frame *fp; -+ volatile struct frame *fp; - register int i = 0; - register int o = 0; - diff --git a/sysutils/cdrtools/files/patch-inc_getfp.c b/sysutils/cdrtools/files/patch-inc_getfp.c deleted file mode 100644 index b2d71c3636be..000000000000 --- a/sysutils/cdrtools/files/patch-inc_getfp.c +++ /dev/null @@ -1,37 +0,0 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- inc/getfp.c.orig 2008-06-13 22:32:03 UTC -+++ inc/getfp.c -@@ -52,7 +52,7 @@ - - EXPORT void **___fpoff __PR((char *cp)); - --EXPORT void ** -+EXPORT __noinline void ** - getfp() - { - long **dummy[1]; -@@ -69,7 +69,7 @@ getfp() - * We need this function to fool GCCs check for returning addresses - * from outside the functions local address space. - */ --EXPORT void ** -+EXPORT __noinline void ** - ___fpoff(cp) - char *cp; - { diff --git a/sysutils/cdrtools/files/patch-include__schily__sha2.h b/sysutils/cdrtools/files/patch-include__schily__sha2.h deleted file mode 100644 index 5d526453cdb6..000000000000 --- a/sysutils/cdrtools/files/patch-include__schily__sha2.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/schily/sha2.h.orig 2009-08-09 14:29:59.000000000 +0200 -+++ include/schily/sha2.h 2012-10-20 14:25:05.000000000 +0200 -@@ -104,10 +104,12 @@ - - #ifdef HAVE_LONGLONG - extern void SHA384Init __PR((SHA2_CTX *)); -+#ifndef HAVE_PRAGMA_WEAK - extern void SHA384Transform __PR((UInt64_t state[8], - const UInt8_t [SHA384_BLOCK_LENGTH])); - extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); - extern void SHA384Pad __PR((SHA2_CTX *)); -+#endif - extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], - SHA2_CTX *)); - extern char *SHA384End __PR((SHA2_CTX *, char *)); diff --git a/sysutils/cdrtools/files/patch-libschily_getfp.c b/sysutils/cdrtools/files/patch-libschily_getfp.c deleted file mode 100644 index 0f0c1193a4d3..000000000000 --- a/sysutils/cdrtools/files/patch-libschily_getfp.c +++ /dev/null @@ -1,37 +0,0 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- libschily/getfp.c.orig 2008-06-13 22:32:03 UTC -+++ libschily/getfp.c -@@ -52,7 +52,7 @@ - - EXPORT void **___fpoff __PR((char *cp)); - --EXPORT void ** -+EXPORT __noinline void ** - getfp() - { - long **dummy[1]; -@@ -69,7 +69,7 @@ getfp() - * We need this function to fool GCCs check for returning addresses - * from outside the functions local address space. - */ --EXPORT void ** -+EXPORT __noinline void ** - ___fpoff(cp) - char *cp; - { diff --git a/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 b/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 deleted file mode 100644 index 26ae04ad8e71..000000000000 --- a/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 +++ /dev/null @@ -1,20 +0,0 @@ ---- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 -+++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 -@@ -1668,7 +1668,7 @@ - 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 -@@ -1707,7 +1707,7 @@ - .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/sysutils/cdrtools/files/patch-readcd__readcd.1 b/sysutils/cdrtools/files/patch-readcd__readcd.1 deleted file mode 100644 index f643d7dacbc4..000000000000 --- a/sysutils/cdrtools/files/patch-readcd__readcd.1 +++ /dev/null @@ -1,28 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 -+++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 -@@ -604,8 +604,6 @@ - .SH SEE ALSO - .BR cdrecord (1), - .BR mkisofs (8), --.BR scg (7), --.BR fbk (7), - .BR rcmd (3), - .BR ssh (1). - diff --git a/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl b/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl deleted file mode 100644 index edbd1340c469..000000000000 --- a/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl +++ /dev/null @@ -1,19 +0,0 @@ ---- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 -+++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 -@@ -18,14 +18,13 @@ - # Each USER= entry adds the listed user to the users who may run rscsi - # - # A typical passwd entry looks like this: --# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi -+# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi - # --# Add entries for all valid remote users to /export/home/rscsi/.rhosts -+# Add entries for all valid remote users to /usr/local/rscsi/.rhosts - # - # USER= entries are checked with a pattern matcher. USER=* matches all users. - # - USER=rscsi --#USER=joerg - - # - # Each ACCESS= entry adds a target or group of targets to the list of visible diff --git a/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 b/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 deleted file mode 100644 index d42f4c8c1c98..000000000000 --- a/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 +++ /dev/null @@ -1,29 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 -+++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 -@@ -234,8 +234,7 @@ - .SH SEE ALSO - .BR cdrecord (1), - .BR readcd (1), --.BR mkisofs (1), --.BR scg (7). -+.BR mkisofs (8). - - .SH NOTES - .PP diff --git a/sysutils/cdrtools/files/pkg-message.in b/sysutils/cdrtools/files/pkg-message.in deleted file mode 100644 index 48b73aede39f..000000000000 --- a/sysutils/cdrtools/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -[ -{ type: install - message: <<EOM -Note: The location of the cdrtools `defaults' files has been set to - - %%PREFIX%%/etc - -This is the FreeBSD ports standard config file location, NOT the cdrtools -standard location, which is /etc/default. - -The reason for this is that FreeBSD ports and packages should not use -configuration files outside of %%PREFIX%%. -EOM -} -] diff --git a/sysutils/cdrtools/pkg-descr b/sysutils/cdrtools/pkg-descr index 5d82f883df49..42c65306289a 100644 --- a/sysutils/cdrtools/pkg-descr +++ b/sysutils/cdrtools/pkg-descr @@ -17,6 +17,5 @@ This package contains the following programs: - readcd (a data CD reading and recording program) May be used to write to DVD-RAM and to copy Solaris boot CD's. - scgcheck (checks and validates the ABI of libscg) -- rscsi (daemon providing access to local SCSI-devices over the network) WWW: http://cdrecord.org/ diff --git a/sysutils/cdrtools/pkg-install.rscsi b/sysutils/cdrtools/pkg-install.rscsi deleted file mode 100644 index fe91941c71ae..000000000000 --- a/sysutils/cdrtools/pkg-install.rscsi +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/sbin:/usr/bin - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} - -case $2 in - PRE-INSTALL) - ;; - - POST-INSTALL) - USER=rscsi - UID=99 - GROUP=${USER} - GID=${UID} - UCOMMENT="Remote SCSI" - UHOME=${PKG_PREFIX}/rscsi - USHELL=${PKG_PREFIX}/sbin/rscsi - - echo "===========================================================================" - echo - - if ! pw groupshow "${GROUP}" >/dev/null 2>&1; then - if ! pw groupadd ${GROUP} -g ${GID}; then - echo "Adding group \"${GROUP}\" failed." - exit 1 - fi - fi - - if ! pw usershow "${USER}" >/dev/null 2>&1; then - if ! pw useradd ${USER} -u ${UID} -c "${UCOMMENT}" \ - -d ${UHOME} -g ${GROUP} -s ${USHELL}; then - echo "Adding user \"${USER}\" failed." - exit 1 - fi - fi - - if ! [ -d ${UHOME} ] ; then - mkdir -p ${UHOME} - chown ${UID}:${GID} ${UHOME} - fi - - if ! [ -f ${UHOME}/.rhosts ] ; then - cp /usr/share/skel/dot.rhosts ${UHOME}/.rhosts - chown ${UID}:${GID} ${UHOME}/.rhosts - chmod 0600 ${UHOME}/.rhosts - fi - - echo "See ${PKG_PREFIX}/share/doc/cdrtools/README.rscsi and ${PKG_PREFIX}/etc/rscsi" - echo "for further information on how to configure remote access to SCSI-devices" - echo "via rscsi." - - if ! grep '^shell' /etc/inetd.conf >/dev/null 2>&1; then - echo "Don't forget to add an entry for rshd(8) to /etc/inetd.conf in order to" - echo "be able to use the remote SCSI daemon." - fi - - echo - - ;; -esac diff --git a/sysutils/cdrtools/pkg-plist b/sysutils/cdrtools/pkg-plist index 6430678bce42..e1de36d2e7d7 100644 --- a/sysutils/cdrtools/pkg-plist +++ b/sysutils/cdrtools/pkg-plist @@ -1,118 +1,66 @@ -bin/btcflash -%%CDDA2MP3%%bin/cdda2mp3 -%%CDDA2OGG%%bin/cdda2ogg -%%CDDA2MP3%%man/man1/cdda2mp3.1.gz -%%CDDA2OGG%%man/man1/cdda2ogg.1.gz -bin/cdda2wav -bin/cdrecord +%%LAME%%bin/cdda2mp3 +%%VORBIS%%bin/cdda2ogg +%%SUID%%bin/cdda2wav +%%SUID%%bin/cdrecord bin/devdump bin/isodebug bin/isodump bin/isoinfo bin/isovfy -bin/list_audio_tracks bin/mkhybrid bin/mkisofs -bin/readcd +%%SUID%%bin/readcd bin/scgcheck -lib/siconv/cp10000 -lib/siconv/cp10006 -lib/siconv/cp10007 -lib/siconv/cp10029 -lib/siconv/cp10079 -lib/siconv/cp10081 -lib/siconv/cp1250 -lib/siconv/cp1251 -lib/siconv/cp1252 -lib/siconv/cp1253 -lib/siconv/cp1254 -lib/siconv/cp1255 -lib/siconv/cp1256 -lib/siconv/cp1257 -lib/siconv/cp1258 -lib/siconv/cp437 -lib/siconv/cp737 -lib/siconv/cp775 -lib/siconv/cp850 -lib/siconv/cp852 -lib/siconv/cp855 -lib/siconv/cp857 -lib/siconv/cp860 -lib/siconv/cp861 -lib/siconv/cp862 -lib/siconv/cp863 -lib/siconv/cp864 -lib/siconv/cp865 -lib/siconv/cp866 -lib/siconv/cp869 -lib/siconv/cp874 -lib/siconv/iso8859-1 -lib/siconv/iso8859-10 -lib/siconv/iso8859-11 -lib/siconv/iso8859-13 -lib/siconv/iso8859-14 -lib/siconv/iso8859-15 -lib/siconv/iso8859-16 -lib/siconv/iso8859-2 -lib/siconv/iso8859-3 -lib/siconv/iso8859-4 -lib/siconv/iso8859-5 -lib/siconv/iso8859-6 -lib/siconv/iso8859-7 -lib/siconv/iso8859-8 -lib/siconv/iso8859-9 -lib/siconv/koi8-r -lib/siconv/koi8-u -man/man1/btcflash.1.gz -man/man1/cdda2wav.1.gz -man/man1/cdrecord.1.gz -man/man1/readcd.1.gz -man/man1/scgcheck.1.gz -man/man8/isoinfo.8.gz -man/man8/mkisofs.8.gz -%%RSCSI%%@(,,4555) sbin/rscsi -@sample etc/cdrecord.sample -%%RSCSI%%@sample etc/rscsi.sample -%%RSCSI%%@unexec if pw usershow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, user \"rscsi\" and its homedirectory must be removed manually."; fi -%%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi -%%RSCSI%%man/man1/rscsi.1.gz -%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD -%%PORTDOCS%%%%DOCSDIR%%/README.mkisofs -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/OtherProgs -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/README -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS -%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.ATAPI -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.DiskT@2 -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.WORM -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.audio -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdplus -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdrw -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdtext -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.clone -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.copy -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.multi -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.raw -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.rscsi -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.sony -%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.verify -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.graft_dirs -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hfs_boot -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hfs_magic -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hide -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.joliet -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.macosx -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.mkhybrid -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.prep_boot -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.rootinfo -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.session -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sort -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sparcboot -%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sunx86boot +bin/scgskeleton +etc/default/cdrecord +%%PORTDOCS%%share/doc/cdda2wav/README +%%PORTDOCS%%share/doc/cdrecord/README +%%PORTDOCS%%share/doc/cdrecord/README.ATAPI +%%PORTDOCS%%share/doc/cdrecord/README.DiskT@2 +%%PORTDOCS%%share/doc/cdrecord/README.WORM +%%PORTDOCS%%share/doc/cdrecord/README.audio +%%PORTDOCS%%share/doc/cdrecord/README.cdplus +%%PORTDOCS%%share/doc/cdrecord/README.cdrw +%%PORTDOCS%%share/doc/cdrecord/README.cdtext +%%PORTDOCS%%share/doc/cdrecord/README.clone +%%PORTDOCS%%share/doc/cdrecord/README.copy +%%PORTDOCS%%share/doc/cdrecord/README.multi +%%PORTDOCS%%share/doc/cdrecord/README.parallel +%%PORTDOCS%%share/doc/cdrecord/README.raw +%%PORTDOCS%%share/doc/cdrecord/README.rscsi +%%PORTDOCS%%share/doc/cdrecord/README.solaris-x86-ATAPI-DMA +%%PORTDOCS%%share/doc/cdrecord/README.solaris-x86-ata-DMA +%%PORTDOCS%%share/doc/cdrecord/README.sony +%%PORTDOCS%%share/doc/cdrecord/README.sun-lofi +%%PORTDOCS%%share/doc/cdrecord/README.verify +%%PORTDOCS%%share/doc/cdrecord/README.volmgt +%%PORTDOCS%%share/doc/mkisofs/README +%%PORTDOCS%%share/doc/mkisofs/README.compression +%%PORTDOCS%%share/doc/mkisofs/README.eltorito +%%PORTDOCS%%share/doc/mkisofs/README.graft_dirs +%%PORTDOCS%%share/doc/mkisofs/README.hfs_boot +%%PORTDOCS%%share/doc/mkisofs/README.hfs_magic +%%PORTDOCS%%share/doc/mkisofs/README.hide +%%PORTDOCS%%share/doc/mkisofs/README.joliet +%%PORTDOCS%%share/doc/mkisofs/README.macosx +%%PORTDOCS%%share/doc/mkisofs/README.mkhybrid +%%PORTDOCS%%share/doc/mkisofs/README.prep_boot +%%PORTDOCS%%share/doc/mkisofs/README.rootinfo +%%PORTDOCS%%share/doc/mkisofs/README.session +%%PORTDOCS%%share/doc/mkisofs/README.sort +%%PORTDOCS%%share/doc/mkisofs/README.sparcboot +%%PORTDOCS%%share/doc/mkisofs/README.sunx86boot +%%LAME%%share/man/man1/cdda2mp3.1.gz +%%VORBIS%%share/man/man1/cdda2ogg.1.gz +share/man/man1/cdda2wav.1.gz +share/man/man1/cdrecord.1.gz +share/man/man1/readcd.1.gz +share/man/man1/scgcheck.1.gz +share/man/man1/scgskeleton.1.gz +share/man/man8/devdump.8.gz +share/man/man8/isodebug.8.gz +share/man/man8/isodump.8.gz +share/man/man8/isoinfo.8.gz +share/man/man8/isovfy.8.gz +share/man/man8/mkhybrid.8.gz +share/man/man8/mkisofs.8.gz diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile new file mode 100644 index 000000000000..a1cea66410ca --- /dev/null +++ b/sysutils/schilyutils/Makefile @@ -0,0 +1,53 @@ +PORTNAME= schilyutils +CATEGORIES= sysutils converters deskutils textproc shells + +COMMENT= Collection of utilities from J. Schilling + +RUN_DEPENDS= schilybase=${PORTVERSION}:devel/schilybase + +USES+= perl5 shebangfix +USE_PERL5= run +SHEBANG_FILES= man2html/man2html cstyle/cstyle.pl + +MASTERDIR= ${.CURDIR}/../../devel/schilybase +COMPONENTS= bsh \ + btcflash \ + cal \ + calc \ + calltree \ + change \ + compare \ + copy \ + count \ + cpp \ + cstyle \ + cut \ + fifo \ + label \ + hdump \ + lndir \ + match \ + mdigest \ + obosh \ + p \ + paste \ + patch \ + pbosh \ + printf \ + sdd \ + sfind \ + sformat \ + sgrow \ + sh \ + termcap \ + translit \ + udiff + +# these files are installed by the patch target, +# but they belong to devel/sccs. +post-install: + ${RM} ${STAGEDIR}${PREFIX}/ccs/bin/sccspatch + cd ${STAGEDIR}${PREFIX} && ${RMDIR} -p ccs/bin + ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/sccspatch.1 + +.include "${MASTERDIR}/Makefile.master" diff --git a/sysutils/schilyutils/pkg-descr b/sysutils/schilyutils/pkg-descr new file mode 100644 index 000000000000..6f3bf6ab8de9 --- /dev/null +++ b/sysutils/schilyutils/pkg-descr @@ -0,0 +1,7 @@ +Collection of miscellaneous utilities from the schilytools, including +a variety of shells (bosh, bsh, and obosh), a traditional K&R-style +preprocessor (krcpp), improved versions of standard UNIX utilities +(scal, sod, sprintf, scut, sdd, sfind, spatch), a C/C++ style checker +(cstyle.js, Cstyle) as well as various others. + +WWW: http://schilytools.sourceforge.net diff --git a/sysutils/schilyutils/pkg-plist b/sysutils/schilyutils/pkg-plist new file mode 100644 index 000000000000..69c085536d95 --- /dev/null +++ b/sysutils/schilyutils/pkg-plist @@ -0,0 +1,88 @@ +bin/Cstyle +@shell bin/bosh +@shell bin/bsh +bin/btcflash +bin/calc +bin/calltree +bin/change +bin/copy +bin/count +bin/cstyle.js +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 +bin/sdd +bin/sfind +bin/sformat +bin/sgrow +bin/sod +bin/spaste +bin/spatch +bin/sprintf +bin/termcap +bin/translit +bin/udiff +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 +share/man/man1/calltree.1.gz +share/man/man1/change.1.gz +share/man/man1/copy.1.gz +share/man/man1/count.1.gz +share/man/man1/cstyle.1.gz +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 +share/man/man1/sdd.1.gz +share/man/man1/sfind.1.gz +share/man/man1/sgrow.1.gz +share/man/man1/sod.1.gz +share/man/man1/spaste.1.gz +share/man/man1/spatch.1.gz +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/man8/sformat.8.gz +xpg4/bin/bosh +xpg4/bin/od +@shell xpg4/bin/sh diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile deleted file mode 100644 index 1a0470b62480..000000000000 --- a/sysutils/sformat/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# Created by: marius@alchemy.franken.de - -PORTNAME= sformat -PORTVERSION= 3.5 -PORTREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.berlios.de/pub/sformat/:sformat \ - LOCAL/marius:libschily,sformat -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sformat \ - ${LIBSCHILY}:libschily -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= marius@FreeBSD.org -COMMENT= Allows formatting/partitioning/analysis/repairing of SCSI disks - -LIBSCHILY= libschily-2.01.01a07.tar.gz -USES= gmake - -.include <bsd.port.pre.mk> - -CCOM!= ${BASENAME} ${CC} -MAKE_ENV+= CCOM=${CCOM} -SFMTTARGET= ${ARCH}-freebsd-${CCOM} -SFMTXARCH!= ${UNAME} -m - -post-extract: - @cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/${LIBSCHILY} ${EXTRACT_AFTER_ARGS} -.for i in config.guess config.sub - @${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf -.endfor -.if ${SFMTTARGET} != "i386-freebsd-cc" - @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${SFMTXARCH}-${OPSYS:tl}-cc.rul -.endif - -post-patch: -.for i in datio.c sformat.1 - @${REINPLACE_CMD} -i "" -e 's:%%DATADIR%%:${DATADIR}:g;' \ - ${WRKSRC}/sformat/${i} -.endfor -.for i in include/schily.h libschily/fexec.c libschily/libschily-mapvers - @${REINPLACE_CMD} -e 's|fexecve|js_fexecve|g' ${WRKSRC}/${i} -.endfor - @${REINPLACE_CMD} -e 's|int getline|int get_line|g' ${WRKSRC}/include/schily.h - @${REINPLACE_CMD} -e 's|(getline(|(get_line(|g' ${WRKSRC}/sformat/io.c \ - ${WRKSRC}/libscg/scsitransp.c - @${REINPLACE_CMD} -e 's| getline(| get_line(|g' ${WRKSRC}/sformat/io.c \ - ${WRKSRC}/sformat/defect.c - @${REINPLACE_CMD} -e 's|^getline|get_line|g' ${WRKSRC}/libschily/stdio/fgetline.c - @${REINPLACE_CMD} -e 's|)getline|)get_line|g' ${WRKSRC}/sformat/diskfmt.c \ - ${WRKSRC}/sformat/makelabel.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sformat/OBJ/${SFMTTARGET}/sformat \ - ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sformat/sformat.dat ${STAGEDIR}${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/sformat/sformat.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1 - -.include <bsd.port.post.mk> diff --git a/sysutils/sformat/distinfo b/sysutils/sformat/distinfo deleted file mode 100644 index 120700bcd0ba..000000000000 --- a/sysutils/sformat/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (sformat-3.5.tar.gz) = bbfbf309aaa7afbc6559e5fc8d230129d6ab3dcfc26734d8426c896b152a8b4c -SIZE (sformat-3.5.tar.gz) = 526375 -SHA256 (libschily-2.01.01a07.tar.gz) = 946568da0756366ed1835c8a022d1a8ff64509e223731fb8077cf47f845ee0a5 -SIZE (libschily-2.01.01a07.tar.gz) = 99473 diff --git a/sysutils/sformat/files/patch-RULES__i386-freebsd-cc.rul b/sysutils/sformat/files/patch-RULES__i386-freebsd-cc.rul deleted file mode 100644 index 1b76323e1ac7..000000000000 --- a/sysutils/sformat/files/patch-RULES__i386-freebsd-cc.rul +++ /dev/null @@ -1,32 +0,0 @@ ---- RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002 -+++ RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002 -@@ -24,7 +24,8 @@ - ########################################################################### - - CPPFLAGS= $(CPPOPTS) $(CPPOPTX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX) -+XCFLAGS:= $(CFLAGS) -+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX) - - CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) - COPTS= -@@ -57,14 +58,14 @@ - - FLOAT_OPTIONS= - --CC= @echo " ==> COMPILING \"$@\""; gcc --LDCC= @echo " ==> LINKING \"$@\""; gcc --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc --RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib -+CCCOM= $(CC) -+LDCC= $(CCCOM) -+DYNLD= $(CCCOM) -+RANLIB= ranlib - ARFLAGS= cr - LORDER= lorder - TSORT= tsort - - RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= $(CCCOM) -M - MKDEP_OUT= diff --git a/sysutils/sformat/files/patch-RULES__rules.cnf b/sysutils/sformat/files/patch-RULES__rules.cnf deleted file mode 100644 index f7148061bd95..000000000000 --- a/sysutils/sformat/files/patch-RULES__rules.cnf +++ /dev/null @@ -1,12 +0,0 @@ ---- RULES/rules.cnf.orig Sun Jan 27 16:11:31 2002 -+++ RULES/rules.cnf Sun Jun 1 18:58:37 2003 -@@ -33,8 +33,7 @@ - # - # Hack until the <mach>-<os>-*cc.rul files are updated - # --_HCCCOM= $(OARCH:%-gcc=gcc) --HCCCOM= $(_HCCCOM:%-cc=cc) -+HCCCOM= $(C_ARCH) - - _CCCOM= $(_UNIQ)$(CCCOM) - __CCCOM= $(_CCCOM:$(_UNIQ)=$(HCCCOM)) diff --git a/sysutils/sformat/files/patch-TARGETS__Targetdirs b/sysutils/sformat/files/patch-TARGETS__Targetdirs deleted file mode 100644 index 9c4d8d735f34..000000000000 --- a/sysutils/sformat/files/patch-TARGETS__Targetdirs +++ /dev/null @@ -1,9 +0,0 @@ ---- TARGETS/Targetdirs.orig Mon Dec 16 15:33:41 2002 -+++ TARGETS/Targetdirs Mon Dec 16 15:34:30 2002 -@@ -1,5 +1,4 @@ - #ident %W% %E% %Q% - ########################################################################### --DIRS= patches conf inc lib libdeflt libscg librscg \ -- sformat rscsi man -+DIRS= conf inc libschily libscg sformat - ########################################################################### diff --git a/sysutils/sformat/files/patch-libscg__scsiopen.c b/sysutils/sformat/files/patch-libscg__scsiopen.c deleted file mode 100644 index 2a3e9878f1d3..000000000000 --- a/sysutils/sformat/files/patch-libscg__scsiopen.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libscg/scsiopen.c.orig Sun Mar 18 14:54:18 2001 -+++ libscg/scsiopen.c Tue May 20 22:58:07 2003 -@@ -239,7 +239,7 @@ - } - if (scg__open(scgp, devname) <= 0) { - if (errs && scgp->errstr) -- js_snprintf(errs, slen, scgp->errstr); -+ js_snprintf(errs, slen, "%s", scgp->errstr); - scg_sfree(scgp); - return ((SCSI *)0); - } diff --git a/sysutils/sformat/files/patch-libscg__scsitransp.c b/sysutils/sformat/files/patch-libscg__scsitransp.c deleted file mode 100644 index 057fec4f2bb9..000000000000 --- a/sysutils/sformat/files/patch-libscg__scsitransp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libscg/scsitransp.c.orig Fri Apr 20 10:38:05 2001 -+++ libscg/scsitransp.c Wed May 28 19:36:31 2003 -@@ -1016,7 +1016,7 @@ - register Uchar *cp; - register int n; - { -- js_fprintf(f, s); -+ js_fprintf(f, "%s", s); - while (--n >= 0) - js_fprintf(f, " %02X", *cp++); - js_fprintf(f, "\n"); diff --git a/sysutils/sformat/files/patch-sformat__bcrypt.c b/sysutils/sformat/files/patch-sformat__bcrypt.c deleted file mode 100644 index de739861d7e4..000000000000 --- a/sysutils/sformat/files/patch-sformat__bcrypt.c +++ /dev/null @@ -1,84 +0,0 @@ ---- sformat/bcrypt.c.orig Fri Oct 9 21:13:57 1998 -+++ sformat/bcrypt.c Thu Apr 13 19:09:55 2006 -@@ -27,10 +27,9 @@ - #include <unixstd.h> - #include <stdxlib.h> - #include <strdefs.h> -+#include <utypes.h> - #include "fmt.h" - --typedef unsigned long Ulong; -- - EXPORT char *getnenv __PR((const char *, int)); - EXPORT Ulong my_gethostid __PR((void)); - EXPORT BOOL bsecurity __PR((int)); -@@ -104,17 +103,17 @@ - Ulong bcrypt(i) - Ulong i; - { -- register Ulong k; -- register Ulong erg; -+ register Uint k; -+ register Uint erg; - -- k = i + 19991; -+ k = ((Uint)i) + 19991; - erg = 0; - do { - erg += 1 + k / 19; - erg *= 1 + k % 19; - k /= 11; - } while (k != 0); -- return (erg); -+ return ((Ulong)erg); - } - - -@@ -128,22 +127,24 @@ - char *bmap(i) - register Ulong i; - { -+ register Uint l; - register int c; - static char buf[8]; - register char *bp; - -+ l = (Uint)i; - bp = &buf[7]; - *bp = '\0'; - do { -- c = i % 64; -- i /= 64; -+ c = l % 64; -+ l /= 64; - c += '.'; - if(c > '9') - c += 7; - if(c > 'Z') - c += 6; - *--bp = c; -- } while (i); -+ } while (l); - return (bp); - } - -@@ -158,10 +159,10 @@ - Ulong bunmap(s) - register const char *s; - { -- register Ulong l; -+ register Uint l; - register int c; - -- l = 0L; -+ l = 0; - while (*s) { - c = *s++; - if(c > 'Z') -@@ -172,5 +173,5 @@ - l *= 64; - l += c; - } -- return (l); -+ return ((Ulong)l); - } diff --git a/sysutils/sformat/files/patch-sformat__datio.c b/sysutils/sformat/files/patch-sformat__datio.c deleted file mode 100644 index 9162f6ee04f3..000000000000 --- a/sysutils/sformat/files/patch-sformat__datio.c +++ /dev/null @@ -1,28 +0,0 @@ ---- sformat/datio.c.orig Mon Dec 16 16:04:37 2002 -+++ sformat/datio.c Mon Dec 16 16:05:11 2002 -@@ -81,11 +81,7 @@ - - char *datpath[] = { - "", -- "/opt/schily/etc/", -- "/usr/bert/etc/", -- "/etc/", -- "/usr/etc/", -- "/opt/schily/etc/", -+ "%%DATADIR%%/", - NULL - }; - -@@ -166,9 +162,9 @@ - { - char *word; - register unsigned char *p; -- register long sum = 0L; -- register long xsum = 0L; -- register long n; -+ register int sum = 0; -+ register int xsum = 0; -+ register int n; - BOOL chksum_ok = FALSE; - - while ((n = fgetline(dat_file, linebuf, sizeof(linebuf))) >= 0) { diff --git a/sysutils/sformat/files/patch-sformat__fmt.c b/sysutils/sformat/files/patch-sformat__fmt.c deleted file mode 100644 index 27cf28ec66e6..000000000000 --- a/sysutils/sformat/files/patch-sformat__fmt.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sformat/fmt.c.orig Mon Dec 16 16:26:00 2002 -+++ sformat/fmt.c Mon Dec 16 16:27:51 2002 -@@ -482,7 +482,7 @@ - } - - printf("sformat SCSI format/analysis/repair utilities\n"); -- printf("Release 3.4, Copyright J. Schilling\n\n"); -+ printf("Release %s, Copyright J. Schilling\n\n", fmt_version); - - if (!datfile_chk) { - if (datfile_present) diff --git a/sysutils/sformat/files/patch-sformat__sformat.1 b/sysutils/sformat/files/patch-sformat__sformat.1 deleted file mode 100644 index 3bb9faa35e40..000000000000 --- a/sysutils/sformat/files/patch-sformat__sformat.1 +++ /dev/null @@ -1,1125 +0,0 @@ ---- sformat/sformat.1.orig Mon Dec 16 19:18:21 2002 -+++ sformat/sformat.1 Mon Dec 16 19:20:33 2002 -@@ -13,7 +13,7 @@ - .if n .ds o oe - .if n .ds u ue - .if n .ds s sz --.TH "SFORMAT draft" 1L "01/04/25" "J\*org Schilling" "Schily\'s USER COMMANDS" -+.TH "SFORMAT draft" 1 "01/04/25" "J\*org Schilling" "Schily\'s USER COMMANDS" - .SH NAME - sformat \- SCSI disk formatting/partitioning/analysis/repair utility - .SH SYNOPSIS -@@ -25,37 +25,37 @@ - - .PP - The first form will select the named disk directly. --Have a look at the chapter about -+Have a look at the chapter about - .B "Following The Main Thread - for more details. - .PP - The second form will scan all SCSI busses and enter a selection menu. --Have a look at the chapter about -+Have a look at the chapter about - .B "The SCSI Selection Menu - for more details. - .PP - .B Sformat - will never destroy or modify any data unless explicitly confirmed - just before the (possibly) destructive action. --Have a look at the chapter about --.B "How To Answer Questions -+Have a look at the chapter about -+.B "How To Answer Questions - first. - - .SH DESCRIPTION - .B Sformat --is the first SCSI disk formatting utility that runs under -+is the first SCSI disk formatting utility that runs under - .IR SunOS . - Long before Sun decided that formatting and partitioning a disk - from a stand alone program is less convenient than doing this job --from a running UNIX, --.B sformat -+from a running UNIX, -+.B sformat - has been available. - .PP - .B Sformat - leads the beginner through a thread menu and allows the experienced - user to do more things than he could do with other disk maintenance - programs. All partitioning jobs can be done without the need for --a desc calculator. -+a desk calculator. - .PP - If you want to do more than simple things, you should carefully read the whole - manual. It contains many tips and tricks that will help you to recover -@@ -68,11 +68,11 @@ - - .SH "Disk Database Entries - .PP --Be nice to other users of -+Be nice to other users of - .BR sformat . - Create database (sformat.dat) entries for disks that are not in the data base --using the --.B \-Proto -+using the -+.B \-Proto - flag and mail them to the author. - This helps other users and you too. - See section on -@@ -82,15 +82,15 @@ - .SH OPTIONS - .TP 18 - .BR \-help ", " \-h --Print a summary of the most important options for -+Print a summary of the most important options for - .BR sformat . - .TP - .B \-xhelp --Print a summary of less frequently used options for -+Print a summary of less frequently used options for - .BR sformat . - .TP - .B \-version --Prints the -+Prints the - .B sformat - version number string and exists. - .TP -@@ -100,7 +100,7 @@ - .TP - .BR \-auto ", " \-a - autoformat mode (for production systems). --When this option is in effect, -+When this option is in effect, - .B sformat - will not ask whether to modify the format and partition parameters - and will only format disks that are known in the data base. -@@ -127,33 +127,33 @@ - .TP - .BI CWveri= "#, " CW= # - Number of blocks/write-verify. --The limitation noted with the -+The limitation noted with the - .B Cveri - option applies here again and even on newer disks. - .TP - .BI data= name - Name of disk database file (default: 'sformat.dat'). --Use this option to force -+Use this option to force - .B sformat - to use a different disk database than the default. --In any case, -+In any case, - .B sformat - will search in the current directory first. - If no file of the appropriate name was found in the current directory, - .B sformat - looks in the following path: - .br --.I /opt schily/etc, /etc, /usr/etc. -+.I %%DATADIR%%. - .TP - .BI debug= "#, " -d - Set the misc debug value to # (with debug=#) or increment - the misc debug level by one (with -d). If you specify - .I -dd, --this equals to -+this equals to - .BR debug=2. - .TP - .BI kdebug= "#, " kd= "# --Tell the -+Tell the - .BR scg -driver - to modify the kernel debug value while SCSI commands are running. - .TP -@@ -161,12 +161,12 @@ - Set the debug level for the parser of the external disk database. - .TP - .B \-defmodes --Get default mode parameters from disk. Normally --.B sformat -+Get default mode parameters from disk. Normally -+.B sformat - retrieves the default modes parameters from the disk by default - when the disk is unformatted or has no sun label and the - current mode parameter if the disk has a valid sun label. --This option tells -+This option tells - .B sformat - retrieve the default mode parameters in any case. - .TP -@@ -189,30 +189,30 @@ - .B \-greassign - Reassign blocks. - This is the guru mode, don't use this. Read the description --for the -+for the - .I \-reassign - option for more details. --This option will simply prompt for block numbers -+This option will simply prompt for block numbers - and then reassign them regardless of if they need to be --reassigned or not. On some disks the block may seem to be -+reassigned or not. On some disks the block may seem to be - defective even after reassigning it because the old data - is copied to the new location without recomputing the CRC. - On other disk the old data will be lost. These problems --will not arise if you use the --.I \-reassign -+will not arise if you use the -+.I \-reassign - option instead. - .TP - .B \-ign_not_found - Ignore record not found errors while verifying the disk. - This option is useful when trying to repair disks with --many defects (see -+many defects (see - .I maxbad - option). Some disk errors may cause the whole track - to appear bad. If the reported error in these cases --is -+is - .BR "record not found" , - You should first try to repair as many blocks as possible --with this option in effect and then repair the remaining -+with this option in effect and then repair the remaining - blocks without this option. - .TP - .B \-inq -@@ -236,7 +236,7 @@ - one bad block (maxbad=1), this problem will go away. - .TP - .B \-modes --Intercative modesense/modeselect. -+Interactive modesense/modeselect. - Each mode page exists in 4 versions: - .br - default (PROM), current (RAM), saved (DISK) and changeable (BITMASK). -@@ -245,23 +245,23 @@ - .B "This is currently under construction. - .TP - .B \-noformat --Force not to format disk even when formatting of the --disk has been confirmed. --This option may be used to -+Force not to format disk even when formatting of the -+disk has been confirmed. -+This option may be used to - modify mode parameters without formatting the disk. - .TP - .B \-nomap - Do not map SCSI address to logical disk name. WARNING: --If you use this option, -+If you use this option, - .B sformat - is not able to check whether the disk has mounted - partitions. This may damage mounted file systems. - .TP - .B \-noparity - Try to disable parity checking on all SCSI commands that are --sent by -+sent by - .B sformat. --This may not be possible in all implementations of the -+This may not be possible in all implementations of the - .IR scg -driver. - .TP - .B \-nowait -@@ -269,7 +269,7 @@ - .B sformat - will prompt for a modification of the disk label and - partition table before starting to verify the disk. --If this option is in effect, -+If this option is in effect, - .B sformat - will immediately start to verify the disk after formatting. - .TP -@@ -284,27 +284,27 @@ - disk. - .TP - .B \-prgeom --Get and print geometry data. This is an old option but it --is useful to get all mode pages that are supported -+Get and print geometry data. This is an old option but it -+is useful to get all mode pages that are supported - by this disk. - .TP - .B \-prcurgeom - Get and print geometry data. This is basically the same as - .I \-prgeom --except that \-prgeom will obtain the default mode pages, -+except that \-prgeom will obtain the default mode pages, - \-prcurgeom will report the current values. - .TP - .B \-Proto - This option will cause --.B sformat -+.B sformat - to generate a data base entry for the current disk. - Make sure that this data base entry will be generated with --the correct format time. -+the correct format time. - .B Sformat - is able to compute a format time from the disk geometry, - but newer disks seem to need more time than computed. - If the format time is too short, the formatting may be --aborted and the disk will not be accessible until formatted -+aborted and the disk will not be accessible until formatted - again completely. - .TP - .B \-r -@@ -312,8 +312,8 @@ - .TP - .B \-randrw - The random read/write test is a method to find problems that --may be a result of first seeking to a new place on disk --and then writing data to it as it is frequently done by the unix file system. -+may be a result of first seeking to a new place on disk -+and then writing data to it as it is frequently done by the Unix file system. - This is usually caused by an inode or super block update. - The above problems may be a result of bad bearings in the disk. - If the disk does not produce errors while this test is running, -@@ -321,16 +321,16 @@ - that the disk is bad, the data on disk may get corrupted. - To minimize the risk of data loss, the first block containing - the disk label (partition) and the last block containing the --sinfo data (a --.B sformat -+sinfo data (a -+.B sformat - specific area) will never be written to. - .TP - .B \-reassign --Reassign a list of blocks --.B sformat -+Reassign a list of blocks -+.B sformat - will prompt for. - This is the preferred command when trying to repair --a block or a list of blocks with already known -+a block or a list of blocks with already known - block addresses. - If you don't know the address of a defective block, use the - .I \-repair -@@ -338,8 +338,8 @@ - .B Sformat - will first try to read the old content of the defective block - and then try to refresh the data by writing the old data to the block. --If it fails to write to the block, --.B sformat -+If it fails to write to the block, -+.B sformat - will reassign the defective block. - If the block does not cause errors after rewriting the data in it, - .B sformat -@@ -348,14 +348,14 @@ - but actually is not. - If for any reason, the disk will be powered off during writing or if - there is electro magnetic noise the CRC for a block may get corrupted --without any physical harm to the magnetic media. These cases can be -+without any physical harm to the magnetic media. These cases can be - repaired by writing again to the block. - .TP - .B \-refresh_only - .B Sformat - will not try to reassign a block that still fails - after rewriting (refreshing) the data in it. --This option is useful in conjunction with the -+This option is useful in conjunction with the - .I \-reassign - and the - .I \-repair -@@ -363,7 +363,7 @@ - .TP - .B \-repair - This is a combination of the --.I \-verify -+.I \-verify - and - .I \-reassign - option. -@@ -373,7 +373,7 @@ - .TP - .BI RW= # - Number of random R/W loops that is used with the --.I \-randrw -+.I \-randrw - option. - The default is the number of physical sectors / 100. - This will not last too long and is enough to cover every -@@ -385,9 +385,9 @@ - see if a disk has these problems. - .TP - .B \-seek --Do -+Do - .I random --or -+or - .I "full stroke - seek tests on the disk. This is done by reading data; trying to - do -@@ -398,7 +398,7 @@ - Do a SCSI modeselect with all parameters, that would have been - necessary for a format, but do not format the disk. - This allows to modify the mode pages of a disk without reformatting it. --If the -+If the - .B \-smp - option is used in conjunction with - .B \-setmodes -@@ -413,7 +413,7 @@ - Do not try to save mode parameters when setting them. - This option is useful if a nearly totally damaged disk - must be reformatted. Some disk controllers, in this case will --reject to format the disk if the area on disk where this data -+reject to format the disk if the area on disk where this data - will be stored is not accessible before formatting the disk. - .TP - .B \-start -@@ -432,8 +432,8 @@ - command. - .TP - .BR \-tr ", " \-t --This is an option that is only useful with old --.B Adaptec -+This is an option that is only useful with old -+.B Adaptec - SCSI bridge controllers. - These controllers are not able to deal with - logical sector numbers in some cases. Therefore -@@ -444,9 +444,9 @@ - sector header. It may fail if the block has a bad sector header. - .TP - .BI VL= # --Set the number of verify passes that are done -+Set the number of verify passes that are done - after formatting a disk to #. The default value is 5. --In write verify mode, this number is doubled because -+In write verify mode, this number is doubled because - .B sformat - will alternate write verify and read verify passes - in this case. -@@ -457,7 +457,7 @@ - .B \-V - Increment the verbose level in respect of SCSI command transport by one. - This helps to debug problems --with SCSI commands. -+with SCSI commands. - If you get incomprehensible error messages you should use this flag - to get more detailed output. - .B \-VV -@@ -469,17 +469,17 @@ - slows down the process and may be the reason for a buffer underrun. - .TP - .B \-verify --This options starts -+This options starts - .B sformat - in verify disk (surface analysis) mode. - Verifying a disk is a method that allows to scan for - defects without modifying data on the disk. --In this mode, the controller will read the disks without -+In this mode, the controller will read the disks without - transferring data to the computer while all error recovery is - disabled. - .TP - .BI Vstart= # --Set the first block for the -+Set the first block for the - .IR \-verify , - .IR \-repair , - .I \-randrw -@@ -491,7 +491,7 @@ - is near the end of the disk. - .TP - .BI Vend= # --Set the last block for the -+Set the last block for the - .IR \-verify , - .IR \-repair , - .I \-randrw -@@ -504,13 +504,13 @@ - .TP - .B \-wrveri - If this option is used in while formatting a disk, --it tells -+it tells - .B sformat - to write verify the disk instead of only read verifying it - after formatting. --If it is used in combination with the -+If it is used in combination with the - .I \-verify --option, -+option, - .B sformat - will write verify the disk without prior formatting. - In both cases, the old data on disk will be damaged. -@@ -523,30 +523,30 @@ - There are four types of questions. - .TP - \(bu --Questions that can be answered with -+Questions that can be answered with - .I yes - or - .I no. - Yes may be abbreviated with 'y' or 'Y'. --These questions are always assumed to be answered with -+These questions are always assumed to be answered with - .I no - if you simply enter - .I "carriage return. --NOTE: the latter is always a -+NOTE: the latter is always a - .I safe --answer. --All questions that request confirmation for actions that may damage or modify -+answer. -+All questions that request confirmation for actions that may damage or modify - data on disk are formed in such a way that answering them with - .I no --or -+or - .I "carriage return - will not harm any data. - All answers to this type of questions - except - .I "[y]es --or -+or - .I "[Y]ES --are interpreted as if -+are interpreted as if - .I no - has been entered. - .TP -@@ -560,16 +560,16 @@ - \(bu - Questions that need a word selected from a list of valid words as input. - If you enter '?', you will get a list of possible input to that question. --Each word is on a separate line an (in some cases) is followed by a -+Each word is on a separate line an (in some cases) is followed by a - explanation how to use it. - .TP - \(bu - Questions that need a number within a certain range. --For this type of questions, -+For this type of questions, - .B sformat - displays the current value and the valid range in parenthesis. - The default radix for numbers is ten. If you need to enter --a hexadecimal number precede it with -+a hexadecimal number precede it with - .I 0x - if you need to enter an octal number, precede it with - .I 0. -@@ -582,20 +582,20 @@ - Entering an dollar sign '$' will set the value to the greatest possible - .TP - + --Entering a -+Entering a - .I "plus sign - will increment the current value by one. - .TP - - --Entering a -+Entering a - .I "minus sign - will decrement the current value by one. - .TP - <CR> --Entering a -+Entering a - .I "carriage return - will not modify the current value. --If the default value is -1, you need to supply a valid -+If the default value is -1, you need to supply a valid - value to be allowed to leave the question menu. - .RE - .PP -@@ -604,7 +604,7 @@ - - .SH "The SCSI Selection Menu - .PP --When -+When - .B Sformat - is started without or with insufficient parameters, - the SCSI menu mode is entered. -@@ -612,7 +612,7 @@ - .PP - .nf - .na --.cs R 4*\w'x'/\n(.s -+.ft C - \s-2sparky joerg > sformat - sformat SCSI format/analysis/repair utilities - Release 3.1, Copyright J. Schilling -@@ -638,7 +638,7 @@ - 16) * - 17) HOST ADAPTOR - Select target -1 (0 - 12)/<cr>: \s+2 --.cs R -+.ft - .ad - .fi - .PP -@@ -646,17 +646,17 @@ - .PP - .nf - .na --.cs R 4*\w'x'/\n(.s -+.ft C - c0t0d0 0) 'Quantum ' 'XP34300 ' 'F76D' Disk --.cs R -+.ft - .ad - .fi - .PP --shows the canonical logical disk name (in this case -+shows the canonical logical disk name (in this case - .BR c0t0d0 ), - the menu number, the SCSI inquiry string and a description of the device type - that was found on this SCSI target. --The menu number is directly related to the SCSI target id of the device and the -+The menu number is directly related to the SCSI target id of the device and the - SCSI bus number. - Number 3 is SCSI target # 3 on SCSI bus # 0. - Number 12 is SCSI target # 2 on SCSI bus # 1. -@@ -668,7 +668,7 @@ - .PP - .nf - .na --.cs R 4*\w'x'/\n(.s -+.ft C - Select target -1 (0 - 6)/<cr>:0 - scsibus0 target 0: - c0t0d0 0) 'Quantum ' 'XP34300 ' 'F76D' Disk -@@ -680,7 +680,7 @@ - 6) 'Quantum ' 'XP34300 ' 'F76D' unsupported - 7) 'Quantum ' 'XP34300 ' 'F76D' unsupported - Select lun -1 (0 - 7)/<cr>: --.cs R -+.ft - .ad - .fi - .PP -@@ -694,26 +694,26 @@ - there is actually no device connected. - .PP - When selecting a specific logical unit, the main thread is entered as if --a complete SCSI target specification has been entered from the command -+a complete SCSI target specification has been entered from the command - line. - - .SH "Following The Main Thread - .PP --If the main formatting thread is entered, the following -+If the main formatting thread is entered, the following - stages are encountered: - .PP - .TP 20 - Mapping and checking --The first thing --.B sformat -+The first thing -+.B sformat - does, is to map the SCSI target/lun/busid triplet into - a logical disk name and to check if some - part of the disk is currently mounted. --This mapping will be skipped if the -+This mapping will be skipped if the - .I \-nomap - options is specified. --If the disk is mounted, the user will be asked if --it is ok to continue. -+If the disk is mounted, the user will be asked if -+it is ok to continue. - .br - Note: this is currently the one and only question. - .TP -@@ -734,12 +734,12 @@ - Read sinfo data - When the device is a disk, - .B sformat --tries to read the -+tries to read the - .B sinfo - data from the disk. --This allows the user to see if the device has been formatted with --.B sformat --before. If so, -+This allows the user to see if the device has been formatted with -+.B sformat -+before. If so, - .B sformat - will print out the number of reformats and the date of the first and last - format. -@@ -750,9 +750,9 @@ - .TP - Process special commands - If options tell --.B sformat --to take special actions (like --.IR \-start " or " \-prdefect ), -+.B sformat -+to take special actions (like -+.IR \-start " or " \-prdefect ), - they are done here. - .B Sformat - terminates after processing them. -@@ -762,23 +762,23 @@ - Several other things can be done from this thread. - Modifying the disk label will be one example. - You need not to be in fear that following this thread will modify or harm --data on the disk. -+data on the disk. - There will be extra questions that secure this case. - .TP - Test whether the disk is formatted --Several procedures differ if the disk is already formatted and has a -+Several procedures differ if the disk is already formatted and has a - valid label. - .PP - The next parts of the main thread will give you some questions to answer. - You may skip most of the questions if you do not want to modify anything. - .PP --If some data that is definitely needed by -+If some data that is definitely needed by -+.B sformat -+can not be determined from the disk or the data base, - .B sformat --can not be determined from the disk or the data base, --.B sformat - will force you to answer all questions of a group. --.B Sformat --will only ask question for parameters that are definitely needed or -+.B Sformat -+will only ask question for parameters that are definitely needed or - may be changed on the current disk. The content of the menus differ from disk - to disk. - .TP -@@ -786,12 +786,12 @@ - Several mode pages of the disk are read. - This data and the inquiry data is used to search in the disk data base. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Ignore database disk parameters from 'sformat.dat'? - .br --If you don't want the data from the data base to be used, negotiate the -+If you don't want the data from the data base to be used, negotiate the - appropriate question. - Some disks cannot be determined from the fetchable data. - This are mainly disks that are connected to a bridge controller e.g. -@@ -802,7 +802,7 @@ - capacity and geometry. - If there is more than one possible entry for this disk in the data base, - .br --.B sformat -+.B sformat - asks: - .br - .I "Select alternate disk type? -@@ -810,7 +810,7 @@ - If the disk type menu is entered, all possible data base entries are displayed. - The current entry is marked with '*', the default entry is marked with '+' - and the entry most similar to the current disk is marked with '~'. --A matching factor is displayed in parenthesis. Higher values -+A matching factor is displayed in parenthesis. Higher values - are indicating a better match. - .TP - Read in label data -@@ -818,18 +818,18 @@ - .B sformat - reads in the label and ask whether to remember this data. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Ignore old disk Label? - .br --I you confirm this question and reformat the disk, the old partitioning -+I you confirm this question and reformat the disk, the old partitioning - information will be lost. - .TP - Disk Parameters Menu - If you want to modify some disk parameters answer the next question with 'y'. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Modify Disk Geometry Parameters? -@@ -841,7 +841,7 @@ - Error Recovery - Error recovery parameters include read/write retry count and similar. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Modify Error recovery Parameters? -@@ -850,7 +850,7 @@ - Disconnect Parameter - Disconnect parameters are buffer full/empty ratio and bus inactivity limit. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Modify Disconnect Parameters -@@ -860,7 +860,7 @@ - If you want to use an alternate label that may be in the data base - go into the next menu. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Select alternate Label? -@@ -868,24 +868,24 @@ - The current entry is marked with '*', the default entry is marked with '+'. - .TP - Logical Label Geometry --.B Sformat --uses an abstract geometry in the label. This allows to have -+.B Sformat -+uses an abstract geometry in the label. This allows to have - one label for a group of disks. The label geometry menu allows to modify - this abstract geometry. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Modify Label Geometry Parameters? - .br - .TP - SCSI Parameters --This menu contains questions about command queuing, defect list format and -+This menu contains questions about command queuing, defect list format and - similar. --Some disks do not support the default block defect list format. Specify --another format in this case here. If the disk does not support the --SCSI write-verify command, --.B sformat -+Some disks do not support the default block defect list format. Specify -+another format in this case here. If the disk does not support the -+SCSI write-verify command, -+.B sformat - allows to split this into a SCSI write and a SCSI verify command. - The data cannot be compared in this case. - If the disk type is generally flaky a data base entry can be set up to do -@@ -893,22 +893,22 @@ - If the disk will not handle 1000 blocks per verify command because - of a firmware bug, a smaller value may be specified here. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Modify SCSI Parameters? - .br - .TP - Grown Defect List --If a disk has not been formatted before or has been refurbished, you should -+If a disk has not been formatted before or has been refurbished, you should - clear the old grown defect list to get a clean start. If the disk --has bad blocks, -+has bad blocks, - .B sformat - will find them after formatting while doing the surface analysis. - If the disk has known defects you should negotiate the next question to - keep the defect list. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Clear old grown defect list? -@@ -917,12 +917,12 @@ - Mode pages - If you want to format the disk, you need to set the mode pages before. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Set mode pages (needed for format)? - .br --However, if you do not want to format the disk, you may negotiate this -+However, if you do not want to format the disk, you may negotiate this - question and will be lead to the label modification menu. - .TP - Formatting the disk -@@ -930,7 +930,7 @@ - If formatting has started, you will see the progress of this process - indicated in the used up percentage of the estimated time. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Format Disk destroys all Data. Really? -@@ -941,14 +941,14 @@ - After the disk has been formatted or if the formatting has been denied, - the label menu is entered. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Print disk label? - .br - If you want to see the current layout of the disk label, enter 'y'. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Modify disk label? -@@ -957,42 +957,42 @@ - .TP - Inside the label modification menu - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Label: <Quantum XP34300> change ? - .br - If you want to retain the old label name, enter <CR>, else --enter 'y'. -+enter 'y'. - .B Sformat - will ask for the new Label name. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Enter disk label: Quantum XP34300 - .br - You are left in the tty line edit mode and may modify the input line (see --termio(7) manual page). -+termios(4) manual page). - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Volume Name: <> change ? - .br - If you want to retain the old label name, enter <CR>, else --enter 'y'. -+enter 'y'. - .B Sformat - will ask for the new Volume name. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Change partition table? - .br - If you want to change the partition table enter 'y'. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Part Tag Flag Cylinders Startsec # of Sec Size Blocks -@@ -1002,29 +1002,29 @@ - .I "Change ? - .br - If you want to modify this partition enter 'y', otherwise --enter <CR> until --.B sformat -+enter <CR> until -+.B sformat - asks for the partition you want to change. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Enter partition id Tag [root]: - .br --Enter <CR> if the partition tag is ok for this partition, otherwise --enter '?' to get a list of valid partition tags or enter the new -+Enter <CR> if the partition tag is ok for this partition, otherwise -+enter '?' to get a list of valid partition tags or enter the new - partition tag. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Enter partition permission Flags [wm]: - .br --Enter <CR> if the partition flag is ok for this partition, otherwise --enter '?' to get a list of valid partition flags or enter the new -+Enter <CR> if the partition flag is ok for this partition, otherwise -+enter '?' to get a list of valid partition flags or enter the new - partition flag. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Enter starting cylinder 0 (0 - 3851)/<cr>: -@@ -1033,7 +1033,7 @@ - enter '?' to get a list of possible input. - XXX - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Enter number of blocks 67580, 31/0/0 (0 - 8395180)/<cr>: -@@ -1042,7 +1042,7 @@ - enter '?' to get a list of possible input. - XXX - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Part Tag Flag Cylinders Startsec # of Sec Size Blocks -@@ -1055,17 +1055,17 @@ - You then will be asked again for all parameters of this partition. - Enter 'y' if this partition is now ok. - .sp --If all partitions are cycled through, -+If all partitions are cycled through, - .B sformat - will display the current label. - .br --.B Sformat -+.B Sformat - asks: - .br - .I "Use this label? - .br --If you enter 'y', --.B sformat -+If you enter 'y', -+.B sformat - will update the label on disk and go into the verify mode. - Anything else will put you into the label modification mode again. - .TP -@@ -1073,7 +1073,7 @@ - In disk verification mode, - .B sformat - will do a surface analysis. --If a bad block is encountered, -+If a bad block is encountered, - .B sformat - will reassign this bad block. - XXX -@@ -1083,7 +1083,7 @@ - The number of defects that SCSI disks can handle depends on the defect - mapping system they use. There are several possible systems: - .PP --The mapping system depends on the # of tracks per zone in the -+The mapping system depends on the # of tracks per zone in the - SCSI disk parameters. - Mapping area in this table means spare location. - .PP -@@ -1104,20 +1104,20 @@ - there still may be an additional mapping area at the end of the disk. - This is controlled by the alternate tracks per volume parameter. - .PP --If your disk says -+If your disk says - .I "no defect spare location, - you may be able to - get extra space by going into the disk parameter menu of sformat --and change a value. Note: some disks tell you that some of the -+and change a value. Note: some disks tell you that some of the - values are changeable (there is a range in parenthesis) but - actually ignore the new value. You will have to read the values - after formatting to see if the new parameters are in effect. - - .SH "How To Modify A Label --Remember, don't panic. You need no desc calculator to create or modify -+Remember, don't panic. You need no desk calculator to create or modify - a partition table. - .PP --The alternate cylinders are historic relics. In good old days (1982) when -+The alternate cylinders are historic relics. In good old days (1982) when - SMD disks that were not able to do defect mapping have been used, - these alternates were added to do the defect mapping in the driver. - In these days the space occupied by these spare cylinders really has been -@@ -1127,17 +1127,17 @@ - an outdated copy of the defect list is only able to hold 127 defects :-(. - - .PP --The label geometry cannot be changed in the partition menu. It must be set --before from the -+The label geometry cannot be changed in the partition menu. It must be set -+before from the - .B "Label Parameters - menu. - .TP 30 - Print disk label? --If this question is answered with 'y', the label and partitioning info -+If this question is answered with 'y', the label and partitioning info - will be displayed. - .TP - Modify disk label? --If this question is answered with 'y', the label modification menu will -+If this question is answered with 'y', the label modification menu will - be entered. - .TP - Label: <Toshiba 1015MB> change ? -@@ -1153,7 +1153,7 @@ - - .SH "Graphical Label Display - .PP --When printing the label or partition data, -+When printing the label or partition data, - .B sformat - uses a simple ASCII graphical display to visualize the layout of the partitions. - The symbols used in this graphic display are described below. -@@ -1162,7 +1162,7 @@ - .PP - .nf - .na --.cs R 4*\w'x'/\n(.s -+.ft C - a I--/ - b /-----------/ - c I----------------------------------------------------------------------I -@@ -1174,7 +1174,7 @@ - WARNING: - part 'e' has unaligned start. - part 'g' has unaligned start. --.cs R -+.ft - .ad - .fi - .fi -@@ -1188,7 +1188,7 @@ - Partition starts before zero or exceeds end of disk. - .TP - / --Partition has an adjacent start or end with another -+Partition has an adjacent start or end with another - partition (no error). - .TP - + diff --git a/sysutils/sformat/pkg-descr b/sysutils/sformat/pkg-descr deleted file mode 100644 index 3048f2ef18fe..000000000000 --- a/sysutils/sformat/pkg-descr +++ /dev/null @@ -1,27 +0,0 @@ -The main advantages to the Sun format utility are: -- Working surface analyze that will detect defective blocks that are going - to get bad. -- Analyzing program that detects defective bearings in the disk (-randrw). -- Will repair nearly any defective disk, that has no firmware bug or electric - defect. -- Allows to clear the grown defect list if a disk. -- Disk geometry and label geometry are separated. -- Allows cheating in the label geometry to deal with the problems with the - limitation to 16 bit data types in the Sun disk label. -- Large database of disks including firmware specials. -- You need no desk calculator to generate a partition table. - Shorthands for: - - MBytes - - cylinders/head/sectors - - size partition to end on end of disk - - partition following another partition - - partition ending before another partition - - shifting partition on the disk (allows growing part 0 and shrinking part 1) -- Partition consistency checker with (ascii) graphical display. -- Mode page interpreter allows to set easily all mode pages you will ever find - in a manual, sformat needs not to know about them. - -NOTE: Sformat has its full functionality on SunOS/Solaris on sparc - and Motorola systems, on all other systems sformat will create - Sun disk labels with wrong byte-order, but formatting/analysis/ - repair will work. diff --git a/sysutils/sformat/pkg-plist b/sysutils/sformat/pkg-plist deleted file mode 100644 index 7f183c929f23..000000000000 --- a/sysutils/sformat/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/sformat -man/man1/sformat.1.gz -%%DATADIR%%/sformat.dat |