View | Details | Raw Unified | Return to bug 267131 | Differences between
and this patch

Collapse All | Expand All

(-)b/archivers/Makefile (+1 lines)
Lines 233-238 Link Here
233
    SUBDIR += szip
233
    SUBDIR += szip
234
    SUBDIR += tar-stream-chunker
234
    SUBDIR += tar-stream-chunker
235
    SUBDIR += tardy
235
    SUBDIR += tardy
236
    SUBDIR += tartest
236
    SUBDIR += thunar-archive-plugin
237
    SUBDIR += thunar-archive-plugin
237
    SUBDIR += torrentzip
238
    SUBDIR += torrentzip
238
    SUBDIR += ucl
239
    SUBDIR += ucl
(-)b/archivers/star/Makefile (-3 / +5 lines)
Lines 6-16 WWW= http://cdrtools.sourceforge.net/private/star.html Link Here
6
6
7
PORTDOCS=	README* STARvsGNUTAR
7
PORTDOCS=	README* STARvsGNUTAR
8
8
9
OPTIONS_DEFINE+=DOCS GNUTAR TARTEST
9
OPTIONS_DEFINE+=DOCS GNUTAR
10
OPTIONS_SUB=	yes
10
OPTIONS_SUB=	yes
11
GNUTAR_DESC=	Install a gnutar binary
11
GNUTAR_DESC=	Install a gnutar binary
12
TARTEST_DESC=	Install tartest and test scripts
13
TARTEST_VARS=	COMPONENTS+=tartest
14
12
15
MASTERDIR=	${.CURDIR}/../../devel/schilybase
13
MASTERDIR=	${.CURDIR}/../../devel/schilybase
16
COMPONENTS=	mt \
14
COMPONENTS=	mt \
Lines 19-22 COMPONENTS= mt \ Link Here
19
		star_sym \
17
		star_sym \
20
		strar
18
		strar
21
19
20
# these are shipped in archivers/tartest
21
post-install:
22
	${RM} -r ${STAGEDIR}${DOCSDIR}/testscripts
23
22
.include "${MASTERDIR}/Makefile.master"
24
.include "${MASTERDIR}/Makefile.master"
(-)b/archivers/star/pkg-plist (-58 lines)
Lines 6-73 bin/star Link Here
6
bin/star_sym
6
bin/star_sym
7
bin/strar
7
bin/strar
8
bin/suntar
8
bin/suntar
9
%%TARTEST%%bin/tartest
10
bin/ustar
9
bin/ustar
11
etc/default/srmt
10
etc/default/srmt
12
etc/default/star
11
etc/default/star
13
sbin/srmt
12
sbin/srmt
14
share/doc/srmt/default-srmt.sample
13
share/doc/srmt/default-srmt.sample
15
%%TARTEST%%share/doc/star/testscripts/00INDEX
16
%%TARTEST%%share/doc/star/testscripts/100char_longlink.tar
17
%%TARTEST%%share/doc/star/testscripts/100char_longlink.tar-non-compliant
18
%%TARTEST%%share/doc/star/testscripts/README.GNUtar-multivol.fail
19
%%TARTEST%%share/doc/star/testscripts/README.create-and-remove
20
%%TARTEST%%share/doc/star/testscripts/README.gtarfail
21
%%TARTEST%%share/doc/star/testscripts/README.largefiles
22
%%TARTEST%%share/doc/star/testscripts/README.longnames
23
%%TARTEST%%share/doc/star/testscripts/README.paxbug
24
%%TARTEST%%share/doc/star/testscripts/README.quicktest
25
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test.tar.gz
26
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test2.tar.gz
27
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test3.tar.gz
28
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test4.tar.gz
29
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-compact-test5.tar.gz
30
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test.tar.gz
31
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test2.tar.gz
32
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test3.tar.gz
33
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test4.tar.gz
34
%%TARTEST%%share/doc/star/testscripts/acl-nfsv4-test5.tar.gz
35
%%TARTEST%%share/doc/star/testscripts/acl-test.tar.gz
36
%%TARTEST%%share/doc/star/testscripts/acl-test2.tar.gz
37
%%TARTEST%%share/doc/star/testscripts/acl-test3.tar.gz
38
%%TARTEST%%share/doc/star/testscripts/acl-test4.tar.gz
39
%%TARTEST%%share/doc/star/testscripts/acl-test5.tar.gz
40
%%TARTEST%%share/doc/star/testscripts/create-and-remove.tar
41
%%TARTEST%%share/doc/star/testscripts/dirloop.tar
42
%%TARTEST%%share/doc/star/testscripts/g-hdr.pax.gz
43
%%TARTEST%%share/doc/star/testscripts/gnu-multi-fail-volume1.gtar
44
%%TARTEST%%share/doc/star/testscripts/gnu-multi-fail-volume2.gtar
45
%%TARTEST%%share/doc/star/testscripts/gtarfail.tar
46
%%TARTEST%%share/doc/star/testscripts/gtarfail2.tar
47
%%TARTEST%%share/doc/star/testscripts/long.ustar.gz
48
%%TARTEST%%share/doc/star/testscripts/longpath.tar.bz2
49
%%TARTEST%%share/doc/star/testscripts/mk
50
%%TARTEST%%share/doc/star/testscripts/mk2
51
%%TARTEST%%share/doc/star/testscripts/not_a_tar_file
52
%%TARTEST%%share/doc/star/testscripts/not_a_tar_file1
53
%%TARTEST%%share/doc/star/testscripts/not_a_tar_file2
54
%%TARTEST%%share/doc/star/testscripts/not_a_tar_file3
55
%%TARTEST%%share/doc/star/testscripts/old-file.tar
56
%%TARTEST%%share/doc/star/testscripts/pax-big-10g.tar.bz2
57
%%TARTEST%%share/doc/star/testscripts/pax-rename.tar.gz
58
%%TARTEST%%share/doc/star/testscripts/quicktest.filelist
59
%%TARTEST%%share/doc/star/testscripts/remove.tar
60
%%TARTEST%%share/doc/star/testscripts/tartest-quicktest.out
61
%%TARTEST%%share/doc/star/testscripts/types-star-oldsparse.tar.gz
62
%%TARTEST%%share/doc/star/testscripts/typescript
63
%%TARTEST%%share/doc/star/testscripts/ustar-all-filetypes.tar
64
%%TARTEST%%share/doc/star/testscripts/ustar-all-quicktest-past-contig.tar
65
%%TARTEST%%share/doc/star/testscripts/ustar-all-quicktest.tar
66
%%TARTEST%%share/doc/star/testscripts/ustar-all-quicktest.tar-without-cont-file
67
%%TARTEST%%share/doc/star/testscripts/ustar-bad-filetypes.tar
68
%%TARTEST%%share/doc/star/testscripts/ustar-bad-signedsum.tar
69
%%TARTEST%%share/doc/star/testscripts/ustar-big-2g.tar.bz2
70
%%TARTEST%%share/doc/star/testscripts/ustar-big-8g.tar.bz2
71
%%GNUTAR%%share/man/man1/gnutar.1.gz
14
%%GNUTAR%%share/man/man1/gnutar.1.gz
72
share/man/man1/srmt.1.gz
15
share/man/man1/srmt.1.gz
73
share/man/man1/scpio.1.gz
16
share/man/man1/scpio.1.gz
Lines 77-82 share/man/man1/star.1.gz Link Here
77
share/man/man1/star_sym.1.gz
20
share/man/man1/star_sym.1.gz
78
share/man/man1/strar.1.gz
21
share/man/man1/strar.1.gz
79
share/man/man1/suntar.1.gz
22
share/man/man1/suntar.1.gz
80
%%TARTEST%%share/man/man1/tartest.1.gz
81
share/man/man1/ustar.1.gz
23
share/man/man1/ustar.1.gz
82
share/man/man5/star.5.gz
24
share/man/man5/star.5.gz
(-)b/archivers/tartest/Makefile (+14 lines)
Added Link Here
1
PORTNAME=	tartest
2
CATEGORIES=	archivers devel
3
4
COMMENT=	Test tar archive for POSIX.1-1990 compliance
5
WWW=		https://schilytools.sourceforge.net/
6
7
MASTERDIR=	${.CURDIR}/../../devel/schilybase
8
COMPONENTS=	tartest
9
10
post-install:
11
	${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/star
12
	cd ${WRKSRC}/star && ${COPYTREE_SHARE} testscripts ${STAGEDIR}/${PREFIX}/share/doc/star/
13
14
.include "${MASTERDIR}/Makefile.master"
(-)b/archivers/tartest/pkg-descr (+11 lines)
Added Link Here
1
Tartest reads a tar archive from stdin
2
and checks this archive for compliance with POSIX.1-1990.
3
4
As tartest is limited to tests the data that is delivered by the tar
5
archiver that is going to be checked, it cannot tests if the tar
6
archiver in question will produce correct archives under all
7
circumstances.  There may be borderline cases that trigger bugs in the
8
tar archiver.
9
10
This port also contains the various test scripts belonging to
11
archivers/star.
(-)b/archivers/tartest/pkg-plist (+109 lines)
Added Link Here
1
bin/tartest
2
share/doc/star/testscripts/00INDEX
3
share/doc/star/testscripts/100char_longlink.tar
4
share/doc/star/testscripts/100char_longlink.tar-non-compliant
5
share/doc/star/testscripts/README.GNUtar-multivol.fail
6
share/doc/star/testscripts/README.create-and-remove
7
share/doc/star/testscripts/README.gtarfail
8
share/doc/star/testscripts/README.largefiles
9
share/doc/star/testscripts/README.longnames
10
share/doc/star/testscripts/README.paxbug
11
share/doc/star/testscripts/README.quicktest
12
share/doc/star/testscripts/acl-nfsv4-compact-test.tar.gz
13
share/doc/star/testscripts/acl-nfsv4-compact-test2.tar.gz
14
share/doc/star/testscripts/acl-nfsv4-compact-test3.tar.gz
15
share/doc/star/testscripts/acl-nfsv4-compact-test4.tar.gz
16
share/doc/star/testscripts/acl-nfsv4-compact-test5.tar.gz
17
share/doc/star/testscripts/acl-nfsv4-test.tar.gz
18
share/doc/star/testscripts/acl-nfsv4-test2.tar.gz
19
share/doc/star/testscripts/acl-nfsv4-test3.tar.gz
20
share/doc/star/testscripts/acl-nfsv4-test4.tar.gz
21
share/doc/star/testscripts/acl-nfsv4-test5.tar.gz
22
share/doc/star/testscripts/acl-test.tar.gz
23
share/doc/star/testscripts/acl-test2.tar.gz
24
share/doc/star/testscripts/acl-test3.tar.gz
25
share/doc/star/testscripts/acl-test4.tar.gz
26
share/doc/star/testscripts/acl-test5.tar.gz
27
share/doc/star/testscripts/create-and-remove.tar
28
share/doc/star/testscripts/dirloop.tar
29
share/doc/star/testscripts/g-hdr.pax.gz
30
share/doc/star/testscripts/gnu-multi-fail-volume1.gtar
31
share/doc/star/testscripts/gnu-multi-fail-volume2.gtar
32
share/doc/star/testscripts/gtarfail.tar
33
share/doc/star/testscripts/gtarfail2.tar
34
share/doc/star/testscripts/long.ustar.gz
35
share/doc/star/testscripts/longpath.tar.bz2
36
share/doc/star/testscripts/mk
37
share/doc/star/testscripts/mk2
38
share/doc/star/testscripts/not_a_tar_file
39
share/doc/star/testscripts/not_a_tar_file1
40
share/doc/star/testscripts/not_a_tar_file2
41
share/doc/star/testscripts/not_a_tar_file3
42
share/doc/star/testscripts/old-file.tar
43
share/doc/star/testscripts/pax-big-10g.tar.bz2
44
share/doc/star/testscripts/pax-rename.tar.gz
45
share/doc/star/testscripts/quicktest.filelist
46
share/doc/star/testscripts/remove.tar
47
share/doc/star/testscripts/tar-test-inputs/file-size/12-digit.tar.bz2
48
share/doc/star/testscripts/tar-test-inputs/file-size/ZIPBOMB-WARNING
49
share/doc/star/testscripts/tar-test-inputs/file-size/gnu.tar.bz2
50
share/doc/star/testscripts/tar-test-inputs/file-size/pax.tar.bz2
51
share/doc/star/testscripts/tar-test-inputs/format-acceptance/gnu-g.tar
52
share/doc/star/testscripts/tar-test-inputs/format-acceptance/gnu.tar
53
share/doc/star/testscripts/tar-test-inputs/format-acceptance/pax.tar
54
share/doc/star/testscripts/tar-test-inputs/format-acceptance/star.tar
55
share/doc/star/testscripts/tar-test-inputs/format-acceptance/suntar.tar
56
share/doc/star/testscripts/tar-test-inputs/format-acceptance/ustar-pre-posix.tar
57
share/doc/star/testscripts/tar-test-inputs/format-acceptance/ustar.tar
58
share/doc/star/testscripts/tar-test-inputs/format-acceptance/v7.tar
59
share/doc/star/testscripts/tar-test-inputs/large-mtime/12-digit.tar
60
share/doc/star/testscripts/tar-test-inputs/large-mtime/gnu.tar
61
share/doc/star/testscripts/tar-test-inputs/large-mtime/pax.tar
62
share/doc/star/testscripts/tar-test-inputs/long-paths/gnu.tar
63
share/doc/star/testscripts/tar-test-inputs/long-paths/pax.tar
64
share/doc/star/testscripts/tar-test-inputs/long-paths/star.tar
65
share/doc/star/testscripts/tar-test-inputs/long-paths/ustar.tar
66
share/doc/star/testscripts/tar-test-inputs/multi-volume/exustar-1.tar
67
share/doc/star/testscripts/tar-test-inputs/multi-volume/exustar-2.tar
68
share/doc/star/testscripts/tar-test-inputs/multi-volume/gnu-1.tar
69
share/doc/star/testscripts/tar-test-inputs/multi-volume/gnu-2.tar
70
share/doc/star/testscripts/tar-test-inputs/multi-volume/gnupax-1.tar
71
share/doc/star/testscripts/tar-test-inputs/multi-volume/gnupax-2.tar
72
share/doc/star/testscripts/tar-test-inputs/multi-volume/xstar-1.tar
73
share/doc/star/testscripts/tar-test-inputs/multi-volume/xstar-2.tar
74
share/doc/star/testscripts/tar-test-inputs/multi-volume/xustar-1.tar
75
share/doc/star/testscripts/tar-test-inputs/multi-volume/xustar-2.tar
76
share/doc/star/testscripts/tar-test-inputs/negative-mtime/gnu.tar
77
share/doc/star/testscripts/tar-test-inputs/negative-mtime/pax.tar
78
share/doc/star/testscripts/tar-test-inputs/sparse-files/gnu-small.tar
79
share/doc/star/testscripts/tar-test-inputs/sparse-files/gnu.tar
80
share/doc/star/testscripts/tar-test-inputs/sparse-files/pax-gnu0-0.tar
81
share/doc/star/testscripts/tar-test-inputs/sparse-files/pax-gnu0-1.tar
82
share/doc/star/testscripts/tar-test-inputs/sparse-files/pax-gnu1-0.tar
83
share/doc/star/testscripts/tar-test-inputs/sparse-files/star.tar
84
share/doc/star/testscripts/tar-test-inputs/sparse-files/xstar.tar
85
share/doc/star/testscripts/tar-test-inputs/user-group-largenum/8-digit.tar
86
share/doc/star/testscripts/tar-test-inputs/user-group-largenum/gnu.tar
87
share/doc/star/testscripts/tar-test-inputs/user-group-largenum/pax.tar
88
share/doc/star/testscripts/tar-test-inputs/user-group-name/pax.tar
89
share/doc/star/testscripts/tar-test-inputs/user-group-name/ustar-32chars.tar
90
share/doc/star/testscripts/tar-test-inputs/volume-label/gnu.tar
91
share/doc/star/testscripts/tar-test-inputs/volume-label/pax.tar
92
share/doc/star/testscripts/tar-test-inputs/volume-label/star.tar
93
share/doc/star/testscripts/tar-test-inputs/xattr/acl.tar
94
share/doc/star/testscripts/tar-test-inputs/xattr/fflags-libarchive.tar
95
share/doc/star/testscripts/tar-test-inputs/xattr/fflags-schily.tar
96
share/doc/star/testscripts/tar-test-inputs/xattr/xattr-libarchive.tar
97
share/doc/star/testscripts/tar-test-inputs/xattr/xattr-schily.tar
98
share/doc/star/testscripts/tartest-quicktest.out
99
share/doc/star/testscripts/types-star-oldsparse.tar.gz
100
share/doc/star/testscripts/typescript
101
share/doc/star/testscripts/ustar-all-filetypes.tar
102
share/doc/star/testscripts/ustar-all-quicktest-past-contig.tar
103
share/doc/star/testscripts/ustar-all-quicktest.tar
104
share/doc/star/testscripts/ustar-all-quicktest.tar-without-cont-file
105
share/doc/star/testscripts/ustar-bad-filetypes.tar
106
share/doc/star/testscripts/ustar-bad-signedsum.tar
107
share/doc/star/testscripts/ustar-big-2g.tar.bz2
108
share/doc/star/testscripts/ustar-big-8g.tar.bz2
109
share/man/man1/tartest.1.gz
(-)b/devel/schilybase/Makefile (-1 / +5 lines)
Lines 38-44 COMPONENTS= conf \ Link Here
38
		libsiconv/tables \
38
		libsiconv/tables \
39
		libstreamar \
39
		libstreamar \
40
		man \
40
		man \
41
		man/man4
41
		man/man5
42
42
43
post-patch-PROFILE-off:
43
post-patch-PROFILE-off:
44
	@${ECHO_MSG} '=> Patching Makefiles to disable profiled libraries'
44
	@${ECHO_MSG} '=> Patching Makefiles to disable profiled libraries'
Lines 52-57 _LANGUAGES= C af am ar be bg ca cs da de el en es et eu fi fr ga he hi hr \ Link Here
52
		hu hy is it ja kk ko lt lv mn nb nl nn pl pt ro ru se sk sl sr \
52
		hu hy is it ja kk ko lt lv mn nb nl nn pl pt ro ru se sk sl sr \
53
		sv tr uk zh
53
		sv tr uk zh
54
54
55
post-install:
56
	# this is just a copy of the FreeBSD termcap file, no need to ship it again.
57
	${RM} ${STAGEDIR}${PREFIX}/etc/termcap
58
55
post-install-NLS-on:
59
post-install-NLS-on:
56
	@${ECHO_MSG} '=> installing dummy message catalogues'
60
	@${ECHO_MSG} '=> installing dummy message catalogues'
57
	${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES
61
	${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES
(-)b/devel/schilybase/Makefile.master (-2 / +4 lines)
Lines 1-5 Link Here
1
DISTVERSION=	2022-09-18
1
DISTVERSION=	2022-10-16
2
MASTER_SITES=	http://fuz.su/pub/schilytools/
2
MASTER_SITES=	http://fuz.su/pub/schilytools/ \
3
		https://schilytools.pkgsrc.pub/pub/schilytools/ \
4
		https://mirrors.dotsrc.org/schilytools/
3
DISTNAME=	schily-${DISTVERSION}
5
DISTNAME=	schily-${DISTVERSION}
4
6
5
MAINTAINER=	fuz@fuz.su
7
MAINTAINER=	fuz@fuz.su
(-)b/devel/schilybase/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1663463867
1
TIMESTAMP = 1665936453
2
SHA256 (schily-2022-09-18.tar.bz2) = 73aab13a15bfb4e2a418a7602365a914ed5f5bc782d8aef21580195e1e5e5b65
2
SHA256 (schily-2022-10-16.tar.bz2) = ce82ed7c2e634380b7db835c3c4a44db9c79a10bd8bd75b3eb8873d292484b66
3
SIZE (schily-2022-09-18.tar.bz2) = 4878648
3
SIZE (schily-2022-10-16.tar.bz2) = 4864898
(-)a/devel/schilybase/files/patch-RULES_i386-freebsd-clang.rul (-24 lines)
Removed Link Here
1
--- RULES/i386-freebsd-clang.rul.orig	2022-07-05 01:45:06 UTC
2
+++ RULES/i386-freebsd-clang.rul
3
@@ -38,4 +38,21 @@ LIB_KVM=	
4
 
5
 #LDOPTS=		$(LIBS_PATH) $(LDPATH)
6
 
7
+#
8
+# Sunpro C/C++ run on Solaris and Linux and both have linkers
9
+# that support mapfiles
10
+#
11
+MAPVERS=	$(_MAPVERS) # This enables to use mapfiles
12
+#
13
+# The GNU linker is buggy and does not like the official order in linker map
14
+# files for symbol versioning. The following command reverses the order of
15
+# the version names in the linker map file.
16
+#
17
+MAPFILE_POST=	| sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | tail -r |  tr '@' '\012'
18
+
19
+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
20
+#LDOPTS=		$(LIBS_PATH) $(LDPATH)
21
+LDOPTMAP=	$(PMAPVERS:%=-Wl,--version-script=%)
22
+LDOPTDYN=	-shared -Wl,-soname,$(TARGET) $(LDOPTMAP)
23
+
24
 RANLIB=		$(NOECHO)echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
(-)a/devel/schilybase/files/patch-RULES_i386-freebsd-gcc.rul (-24 lines)
Removed Link Here
1
--- RULES/i386-freebsd-gcc.rul.orig	2022-07-05 01:45:16 UTC
2
+++ RULES/i386-freebsd-gcc.rul
3
@@ -38,4 +38,21 @@ LIB_KVM=	
4
 
5
 #LDOPTS=		$(LIBS_PATH) $(LDPATH)
6
 
7
+#
8
+# Sunpro C/C++ run on Solaris and Linux and both have linkers
9
+# that support mapfiles
10
+#
11
+MAPVERS=	$(_MAPVERS) # This enables to use mapfiles
12
+#
13
+# The GNU linker is buggy and does not like the official order in linker map
14
+# files for symbol versioning. The following command reverses the order of
15
+# the version names in the linker map file.
16
+#
17
+MAPFILE_POST=	| sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | tail -r |  tr '@' '\012'
18
+
19
+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
20
+#LDOPTS=		$(LIBS_PATH) $(LDPATH)
21
+LDOPTMAP=	$(PMAPVERS:%=-Wl,--version-script=%)
22
+LDOPTDYN=	-shared -Wl,-soname,$(TARGET) $(LDOPTMAP)
23
+
24
 RANLIB=		$(NOECHO)echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
(-)b/devel/schilybase/files/patch-btcflash_btcflash.1 (-1 / +1 lines)
Lines 4-10 Link Here
4
 login shell.
4
 login shell.
5
 .SH "SEE ALSO"
5
 .SH "SEE ALSO"
6
 .BR cdrecord (1),
6
 .BR cdrecord (1),
7
-.BR scg (7),
7
-.BR scg (4),
8
 .BR rcmd (3),
8
 .BR rcmd (3),
9
 .BR ssh (1).
9
 .BR ssh (1).
10
 .SH NOTES
10
 .SH NOTES
(-)b/devel/schilybase/files/patch-cdrecord_cdrecord.1 (-4 / +4 lines)
Lines 15-28 Link Here
15
# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
15
# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
16
###########################################################################
16
###########################################################################
17
17
18
--- cdrecord/cdrecord.1.orig	2020-09-03 23:04:33 UTC
18
--- cdrecord/cdrecord.1.orig	2022-10-16 15:57:08 UTC
19
+++ cdrecord/cdrecord.1
19
+++ cdrecord/cdrecord.1
20
@@ -3226,8 +3226,6 @@ There must be at least one track per file.
20
@@ -3228,8 +3228,6 @@ There must be at least one track per file.
21
 .SH SEE ALSO
21
 .SH SEE ALSO
22
 .BR cdda2wav (1),
22
 .BR cdda2wav (1),
23
 .BR readcd (1),
23
 .BR readcd (1),
24
-.BR scg (7),
24
-.BR scg (4),
25
-.BR fbk (7),
25
-.BR fbk (4),
26
 .BR mkisofs (8),
26
 .BR mkisofs (8),
27
 .BR rcmd (3),
27
 .BR rcmd (3),
28
 .BR ssh (1).
28
 .BR ssh (1).
(-)a/devel/schilybase/files/patch-mkisofs_mkisofs.8 (-20 lines)
Removed Link Here
1
--- mkisofs/mkisofs.8.orig	2020-09-04 13:24:04 UTC
2
+++ mkisofs/mkisofs.8
3
@@ -2900,7 +2900,7 @@ but is kept to be compatible with 
4
 The format of the
5
 .I magic
6
 file is almost identical to the
7
-.BR magic (4)
8
+.BR magic (5)
9
 file used by the Linux
10
 .BR file (1)
11
 command - the routines for reading and decoding the
12
@@ -2939,7 +2939,7 @@ l l l l .
13
 .TE
14
 .PP
15
 The format of the file is described in the
16
-.BR magic (4)
17
+.BR magic (5)
18
 man page. The only difference here is that for each entry in the magic file, the
19
 .I message
20
 for the initial offset
(-)b/devel/schilybase/files/patch-obosh_obosh.1 (+90 lines)
Added Link Here
1
--- obosh/obosh.1.orig	2022-10-16 15:57:08 UTC
2
+++ obosh/obosh.1
3
@@ -65,30 +65,16 @@ sh, obosh, jsh \- standard and job control shell and c
4
 .SH SYNOPSIS
5
 .LP
6
 .nf
7
-.B /usr/bin/sh\c
8
-.RB "   [" \(miacefhikmnprstuvxP "] ["\c
9
-.IR argument ]...
10
-.fi
11
-
12
-.LP
13
-.nf
14
-.B /usr/bin/obosh\c
15
+.B obosh\c
16
 .RB " [" \(miacefhikmnprstuvxP "] ["\c
17
 .IR argument ]...
18
 .fi
19
 
20
-.LP
21
-.nf
22
-.B /usr/bin/jsh\c
23
-.RB "  [" \(miacefhikmnprstuvxP "] ["\c
24
-.IR argument ]...
25
-.fi
26
-
27
 .SH DESCRIPTION
28
 .sp
29
 .LP
30
 The
31
-.B /usr/bin/sh
32
+.B obosh
33
 utility is a command programming language that
34
 executes commands read from a terminal or a file.
35
 .LP
36
@@ -98,16 +84,7 @@ permits one to call this implementation even when
37
 .B /usr/bin/sh
38
 has been linked to another shell.
39
 .LP
40
-The
41
-.B jsh
42
-utility is an interface to the shell that provides all of the
43
-functionality of
44
-.B sh
45
-and enables job control (see
46
-.B Job Control
47
-section below).
48
-Job control may also be enabled by calling the shell via the standard name
49
-and then calling
50
+Job control may be enabled by calling
51
 .BR "set\ \-m" .
52
 .sp
53
 .LP
54
@@ -150,7 +127,7 @@ commands are initially read from
55
 if such files exist.
56
 Thereafter, commands are read as described below, which is also the case
57
 when the shell is invoked as
58
-.BR /usr/bin/sh .
59
+.BR obosh .
60
 
61
 .SH OPTIONS
62
 The options below are
63
@@ -3405,7 +3382,7 @@ The location of the restricted Bourne Shell binary.
64
 See
65
 .BR attributes (7)
66
 for descriptions of the following attributes:
67
-.SS "/usr/bin/sh, /usr/bin/jsh"
68
+.SS "obosh"
69
 .sp
70
 
71
 .sp
72
@@ -3439,9 +3416,6 @@ CSIEnabled
73
 .BR login (1),
74
 .BR newgrp (1),
75
 .BR pbosh (1),
76
-.BR pfsh (1),
77
-.BR pfexec (1),
78
-.BR privileges (7),
79
 .BR ps (1),
80
 .BR pwd (1),
81
 .BR set (1),
82
@@ -3468,8 +3442,6 @@ CSIEnabled
83
 .BR profile (5),
84
 .BR attributes (7),
85
 .BR environ (7),
86
-.BR largefile (7),
87
-.BR XPG4 (7)
88
 .hy 1
89
 .SH WARNINGS
90
 .sp
(-)b/devel/schilybase/files/patch-pbosh_pbosh.1 (+6 lines)
Added Link Here
1
--- pbosh/pbosh.1.orig	2022-09-24 00:18:51 UTC
2
+++ pbosh/pbosh.1
3
@@ -1,2 +1,2 @@
4
-.so man1/sh.1
5
+.so man1/bosh.1
6
 .\" "@(#)pbosh.1	1.1 18/06/26 "
(-)b/devel/schilybase/files/patch-readcd_readcd.1 (-2 / +2 lines)
Lines 21-28 Link Here
21
 .SH SEE ALSO
21
 .SH SEE ALSO
22
 .BR cdrecord (1),
22
 .BR cdrecord (1),
23
 .BR mkisofs (8),
23
 .BR mkisofs (8),
24
-.BR scg (7),
24
-.BR scg (4),
25
-.BR fbk (7),
25
-.BR fbk (4),
26
 .BR rcmd (3),
26
 .BR rcmd (3),
27
 .BR ssh (1).
27
 .BR ssh (1).
28
 
28
 
(-)b/devel/schilybase/files/patch-scgcheck_scgcheck.1 (-6 / +4 lines)
Lines 15-29 Link Here
15
# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
15
# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
16
###########################################################################
16
###########################################################################
17
17
18
--- scgcheck/scgcheck.1.orig	2016-01-26 21:48:54 UTC
18
--- scgcheck/scgcheck.1.orig	2022-10-16 15:57:08 UTC
19
+++ scgcheck/scgcheck.1
19
+++ scgcheck/scgcheck.1
20
@@ -276,8 +276,7 @@ Specify the log file to be used instead 
20
@@ -276,7 +276,6 @@ Specify the log file to be used instead of 
21
 .SH SEE ALSO
22
 .BR cdrecord (1),
21
 .BR cdrecord (1),
23
 .BR readcd (1),
22
 .BR readcd (1),
24
-.BR mkisofs (1),
23
 .BR mkisofs (1),
25
-.BR scg (7).
24
-.BR scg (4).
26
+.BR mkisofs (8).
27
 
25
 
28
 .SH NOTES
26
 .SH NOTES
29
 .PP
27
 .PP
(-)b/devel/schilybase/files/patch-sh_jsh.1 (+6 lines)
Added Link Here
1
--- sh/jsh.1.orig	2022-09-24 00:17:51 UTC
2
+++ sh/jsh.1
3
@@ -1,2 +1,2 @@
4
-.so man1/sh.1
5
+.so man1/bosh.1
6
 .\" "@(#)jsh.1	1.1 10/05/12 "
(-)b/devel/schilybase/files/patch-sh_sh.1 (-4 / +23 lines)
Lines 1-8 Link Here
1
--- sh/sh.1.orig	2022-09-18 01:03:28 UTC
1
--- sh/sh.1.orig	2022-10-16 15:57:08 UTC
2
+++ sh/sh.1
2
+++ sh/sh.1
3
@@ -61,32 +61,25 @@
3
@@ -61,32 +61,25 @@
4
 .if n .ds s sz
4
 .if n .ds s sz
5
 .TH sh 1 "2022/09/11" "Schily Bourne Shell" "User Commands"
5
 .TH sh 1 "2022/10/06" "Schily Bourne Shell" "User Commands"
6
 .SH NAME
6
 .SH NAME
7
-sh, bosh, jsh \- standard and job control shell and command interpreter
7
-sh, bosh, jsh \- standard and job control shell and command interpreter
8
+sh, bosh, jbosh \- standard and job control shell and command interpreter
8
+sh, bosh, jbosh \- standard and job control shell and command interpreter
Lines 134-143 Link Here
134
 .sp
134
 .sp
135
@@ -8476,7 +8469,7 @@ The location of the restricted Bourne Shell binary.
135
@@ -8476,7 +8469,7 @@ The location of the restricted Bourne Shell binary.
136
 See
136
 See
137
 .BR attributes (5)
137
 .BR attributes (7)
138
 for descriptions of the following attributes:
138
 for descriptions of the following attributes:
139
-.SS "/usr/bin/sh, /usr/bin/jsh"
139
-.SS "/usr/bin/sh, /usr/bin/jsh"
140
+.SS "sh, jbosh"
140
+.SS "bosh, jbosh"
141
 .sp
141
 .sp
142
 
142
 
143
 .sp
143
 .sp
144
@@ -8509,9 +8502,6 @@ CSIEnabled
145
 .BR ksh93 (1),
146
 .BR login (1),
147
 .BR newgrp (1),
148
-.BR pfsh (1),
149
-.BR pfexec (1),
150
-.BR privileges (7),
151
 .BR ps (1),
152
 .BR pwd (1),
153
 .BR set (1),
154
@@ -8541,8 +8531,6 @@ CSIEnabled
155
 .BR profile (5),
156
 .BR attributes (7),
157
 .BR environ (7),
158
-.BR largefile (7),
159
-.BR XPG4 (7)
160
 .hy 1
161
 .SH WARNINGS
162
 .sp
(-)b/devel/schilybase/pkg-plist (-1 lines)
Lines 1-4 Link Here
1
etc/termcap
2
include/scg/aspi-dos.h
1
include/scg/aspi-dos.h
3
include/scg/aspi-win32.h
2
include/scg/aspi-win32.h
4
include/scg/scgcmd.h
3
include/scg/scgcmd.h
(-)b/misc/schilytools/Makefile (-5 / +2 lines)
Lines 1-5 Link Here
1
PORTNAME=	schilytools
1
PORTNAME=	schilytools
2
DISTVERSION=	2
2
DISTVERSION=	3
3
CATEGORIES=	misc
3
CATEGORIES=	misc
4
4
5
MAINTAINER=	fuz@fuz.su
5
MAINTAINER=	fuz@fuz.su
Lines 13-26 RUN_DEPENDS= bosh>=2022.08.18.b:shells/bosh \ Link Here
13
		sccs>=2021.05.19:devel/sccs \
13
		sccs>=2021.05.19:devel/sccs \
14
		smake>=2021.05.19:devel/smake \
14
		smake>=2021.05.19:devel/smake \
15
		sunpromake>=2021.05.19:devel/sunpromake \
15
		sunpromake>=2021.05.19:devel/sunpromake \
16
		tartest>=2022.09.18:archivers/tartest \
16
		ved>=2021.05.19:editors/ved \
17
		ved>=2021.05.19:editors/ved \
17
		cdrtools>=2021.05.19:sysutils/cdrtools \
18
		cdrtools>=2021.05.19:sysutils/cdrtools \
18
		rscsi>=2021.05.19:net/rscsi
19
		rscsi>=2021.05.19:net/rscsi
19
20
20
USES=		metaport
21
USES=		metaport
21
22
22
OPTIONS_DEFINE=	DEPRECATED
23
DEPRECATED_DESC=	include deprecated utilities
24
DEPRECATED_RUN_DEPENDS=	man2html:textproc/man2html
25
26
.include <bsd.port.mk>
23
.include <bsd.port.mk>
(-)b/sysutils/schilyutils/Makefile (-2 / +1 lines)
Lines 6-12 WWW= http://schilytools.sourceforge.net/ Link Here
6
6
7
USES+=		perl5 shebangfix
7
USES+=		perl5 shebangfix
8
USE_PERL5=	run
8
USE_PERL5=	run
9
SHEBANG_FILES=	man2html/man2html cstyle/cstyle.pl
9
SHEBANG_FILES=	cstyle/cstyle.pl
10
10
11
# bin/bsh bin/calc bin/copy bin/count bin/fsdiff
11
# bin/bsh bin/calc bin/copy bin/count bin/fsdiff
12
CONFLICTS_INSTALL=	bsh calc deforaos-browser \
12
CONFLICTS_INSTALL=	bsh calc deforaos-browser \
13
- 

Return to bug 267131