Attachment #237399 for bug #267131

Lines 38-44 COMPONENTS= conf \ Link Here

(-)b/devel/schilybase/Makefile (-1 / +5 lines)
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

Lines 1-5 Link Here

(-)b/devel/schilybase/Makefile.master (-2 / +4 lines)
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

Lines 1-3 Link Here

(-)b/devel/schilybase/distinfo (-3 / +3 lines)
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




--- RULES/i386-freebsd-clang.rul.orig	2022-07-05 01:45:06 UTC
+++ RULES/i386-freebsd-clang.rul
@@ -38,4 +38,21 @@ LIB_KVM=	
 
 #LDOPTS=		$(LIBS_PATH) $(LDPATH)
 
+#
+# Sunpro C/C++ run on Solaris and Linux and both have linkers
+# that support mapfiles
+#
+MAPVERS=	$(_MAPVERS) # This enables to use mapfiles
+#
+# The GNU linker is buggy and does not like the official order in linker map
+# files for symbol versioning. The following command reverses the order of
+# the version names in the linker map file.
+#
+MAPFILE_POST=	| sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | tail -r |  tr '@' '\012'
+
+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+#LDOPTS=		$(LIBS_PATH) $(LDPATH)
+LDOPTMAP=	$(PMAPVERS:%=-Wl,--version-script=%)
+LDOPTDYN=	-shared -Wl,-soname,$(TARGET) $(LDOPTMAP)
+
 RANLIB=		$(NOECHO)echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib




--- RULES/i386-freebsd-gcc.rul.orig	2022-07-05 01:45:16 UTC
+++ RULES/i386-freebsd-gcc.rul
@@ -38,4 +38,21 @@ LIB_KVM=	
 
 #LDOPTS=		$(LIBS_PATH) $(LDPATH)
 
+#
+# Sunpro C/C++ run on Solaris and Linux and both have linkers
+# that support mapfiles
+#
+MAPVERS=	$(_MAPVERS) # This enables to use mapfiles
+#
+# The GNU linker is buggy and does not like the official order in linker map
+# files for symbol versioning. The following command reverses the order of
+# the version names in the linker map file.
+#
+MAPFILE_POST=	| sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | tail -r |  tr '@' '\012'
+
+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+#LDOPTS=		$(LIBS_PATH) $(LDPATH)
+LDOPTMAP=	$(PMAPVERS:%=-Wl,--version-script=%)
+LDOPTDYN=	-shared -Wl,-soname,$(TARGET) $(LDOPTMAP)
+
 RANLIB=		$(NOECHO)echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib

Lines 4-10 Link Here

(-)b/devel/schilybase/files/patch-btcflash_btcflash.1 (-1 / +1 lines)
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

Lines 15-28 Link Here

(-)b/devel/schilybase/files/patch-cdrecord_cdrecord.1 (-4 / +4 lines)
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).




--- mkisofs/mkisofs.8.orig	2020-09-04 13:24:04 UTC
+++ mkisofs/mkisofs.8
@@ -2900,7 +2900,7 @@ but is kept to be compatible with 
 The format of the
 .I magic
 file is almost identical to the
-.BR magic (4)
+.BR magic (5)
 file used by the Linux
 .BR file (1)
 command - the routines for reading and decoding the
@@ -2939,7 +2939,7 @@ l l l l .
 .TE
 .PP
 The format of the file is described in the
-.BR magic (4)
+.BR magic (5)
 man page. The only difference here is that for each entry in the magic file, the
 .I message
 for the initial offset




--- obosh/obosh.1.orig	2022-10-16 15:57:08 UTC
+++ obosh/obosh.1
@@ -65,30 +65,16 @@ sh, obosh, jsh \- standard and job control shell and c
 .SH SYNOPSIS
 .LP
 .nf
-.B /usr/bin/sh\c
-.RB "   [" \(miacefhikmnprstuvxP "] ["\c
-.IR argument ]...
-.fi
-
-.LP
-.nf
-.B /usr/bin/obosh\c
+.B obosh\c
 .RB " [" \(miacefhikmnprstuvxP "] ["\c
 .IR argument ]...
 .fi
 
-.LP
-.nf
-.B /usr/bin/jsh\c
-.RB "  [" \(miacefhikmnprstuvxP "] ["\c
-.IR argument ]...
-.fi
-
 .SH DESCRIPTION
 .sp
 .LP
 The
-.B /usr/bin/sh
+.B obosh
 utility is a command programming language that
 executes commands read from a terminal or a file.
 .LP
@@ -98,16 +84,7 @@ permits one to call this implementation even when
 .B /usr/bin/sh
 has been linked to another shell.
 .LP
-The
-.B jsh
-utility is an interface to the shell that provides all of the
-functionality of
-.B sh
-and enables job control (see
-.B Job Control
-section below).
-Job control may also be enabled by calling the shell via the standard name
-and then calling
+Job control may be enabled by calling
 .BR "set\ \-m" .
 .sp
 .LP
@@ -150,7 +127,7 @@ commands are initially read from
 if such files exist.
 Thereafter, commands are read as described below, which is also the case
 when the shell is invoked as
-.BR /usr/bin/sh .
+.BR obosh .
 
 .SH OPTIONS
 The options below are
@@ -3405,7 +3382,7 @@ The location of the restricted Bourne Shell binary.
 See
 .BR attributes (7)
 for descriptions of the following attributes:
-.SS "/usr/bin/sh, /usr/bin/jsh"
+.SS "obosh"
 .sp
 
 .sp
@@ -3439,9 +3416,6 @@ CSIEnabled
 .BR login (1),
 .BR newgrp (1),
 .BR pbosh (1),
-.BR pfsh (1),
-.BR pfexec (1),
-.BR privileges (7),
 .BR ps (1),
 .BR pwd (1),
 .BR set (1),
@@ -3468,8 +3442,6 @@ CSIEnabled
 .BR profile (5),
 .BR attributes (7),
 .BR environ (7),
-.BR largefile (7),
-.BR XPG4 (7)
 .hy 1
 .SH WARNINGS
 .sp

Added Link Here

(-)b/devel/schilybase/files/patch-pbosh_pbosh.1 (+6 lines)
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 "

Lines 21-28 Link Here

(-)b/devel/schilybase/files/patch-readcd_readcd.1 (-2 / +2 lines)
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

Lines 15-29 Link Here

(-)b/devel/schilybase/files/patch-scgcheck_scgcheck.1 (-6 / +4 lines)
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

Added Link Here

(-)b/devel/schilybase/files/patch-sh_jsh.1 (+6 lines)
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 "




--- sh/sh.1.orig	2022-10-16 15:57:08 UTC
+++ sh/sh.1
@@ -61,32 +61,25 @@
 .if n .ds s sz
 .TH sh 1 "2022/10/06" "Schily Bourne Shell" "User Commands"
 .SH NAME
-sh, bosh, jsh \- standard and job control shell and command interpreter
+sh, bosh, jbosh \- standard and job control shell and command interpreter

 .sp
@@ -8476,7 +8469,7 @@ The location of the restricted Bourne Shell binary.
 See
 .BR attributes (7)
 for descriptions of the following attributes:
-.SS "/usr/bin/sh, /usr/bin/jsh"
+.SS "bosh, jbosh"
 .sp
 
 .sp
@@ -8509,9 +8502,6 @@ CSIEnabled
 .BR ksh93 (1),
 .BR login (1),
 .BR newgrp (1),
-.BR pfsh (1),
-.BR pfexec (1),
-.BR privileges (7),
 .BR ps (1),
 .BR pwd (1),
 .BR set (1),
@@ -8541,8 +8531,6 @@ CSIEnabled
 .BR profile (5),
 .BR attributes (7),
 .BR environ (7),
-.BR largefile (7),
-.BR XPG4 (7)
 .hy 1
 .SH WARNINGS
 .sp

Lines 1-4 Link Here

(-)b/devel/schilybase/pkg-plist (-1 lines)
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

Lines 6-12 WWW= http://schilytools.sourceforge.net/ Link Here

(-)b/sysutils/schilyutils/Makefile (-2 / +1 lines)
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

Removed Link Here

(-)a/devel/schilybase/files/patch-RULES_i386-freebsd-clang.rul (-24 lines)
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

Removed Link Here

(-)a/devel/schilybase/files/patch-RULES_i386-freebsd-gcc.rul (-24 lines)
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

Removed Link Here

(-)a/devel/schilybase/files/patch-mkisofs_mkisofs.8 (-20 lines)
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

Added Link Here

(-)b/devel/schilybase/files/patch-obosh_obosh.1 (+90 lines)
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

Lines 1-8 Link Here

(-)b/devel/schilybase/files/patch-sh_sh.1 (-4 / +23 lines)
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