Attachment #250102 for bug #278481




PORTNAME=	toybox
PORTVERSION=	0.8.11
CATEGORIES=	sysutils
MASTER_SITES=	http://landley.net/toybox/downloads/



USES=		gmake shebangfix

SHEBANG_FILES=	mkroot/record-commands scripts/probes/bloatcheck \
		scripts/mcm-buildall.sh scripts/change.sh \
		scripts/probes/findglobals scripts/genconfig.sh \
		scripts/install.sh scripts/make.sh scripts/mkroot.sh \
		scripts/portability.sh scripts/runtest.sh \
		scripts/single.sh scripts/test.sh configure \
		tests/*

BIN_LINKS=	[ cat chgrp chmod chown cksum cpio crc32 date dos2unix echo \
		egrep false fgrep fsync grep help hostname kill ln ls mkdir \
		mknod mktemp mountpoint nice pidof printenv pwd rm rmdir sed \
		sleep sync touch true uname unix2dos usleep vmstat
SBIN_LINKS=	killall5 lsmod mkswap modinfo sysctl
USRBIN_LINKS=	acpi ascii base64 basename bunzip2 bzcat cal chrt chvt \
		clear cmp comm count cut dirname du expand factor fallocate \
		file find flock fmt groups head hexedit iconv id killall link \
		logger logname lspci lsusb makedevs mkfifo mkpasswd nl nohup \
		od paste patch pmap printf pwdx readlink realpath renice \
		reset rev seq setsid shred shuf sort split strings tac tee \
		test time timeout truncate tty uniq unlink uudecode uuencode \
		uuidgen w watch wc which who whoami xargs xxd yes
USRSBIN_LINKS=	chroot

do-configure:
	cd ${WRKSRC} && HOSTCC=${CC} ${GMAKE} bsd_defconfig


	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/sbin
	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/bin
	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/sbin
	(cd ${WRKSRC} && PREFIX=${STAGEDIR}${PREFIX}/${PORTNAME} scripts/install.sh --symlink --long)
	${LN} -s ../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${f}
.endfor
.for f in ${SBIN_LINKS}
	${LN} -s ../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/sbin/${f}
.endfor
.for f in ${USRBIN_LINKS}
	${LN} -s ../../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/bin/${f}
.endfor
.for f in ${USRSBIN_LINKS}
	${LN} -s ../../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/sbin/${f}
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/sysutils/toybox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1690881504	1	TIMESTAMP = 1712845660
2	SHA256 (toybox-0.8.10.tar.gz) = d3afee05ca90bf425ced73f527e418fecd626c5340b5f58711a14531f8d7d108	2	SHA256 (toybox-0.8.11.tar.gz) = 15aa3f832f4ec1874db761b9950617f99e1e38144c22da39a71311093bfe67dc
3	SIZE (toybox-0.8.10.tar.gz) = 3534989	3	SIZE (toybox-0.8.11.tar.gz) = 3550912

Lines 1-6 Link Here

(-)b/sysutils/toybox/files/patch-kconfig_freebsd__miniconfig (-2 / +7 lines)
1	--- kconfig/freebsd_miniconfig.orig 2023-07-30 09:41:04 UTC	1	--- kconfig/freebsd_miniconfig.orig 2024-04-09 01:50:07 UTC
2	+++ kconfig/freebsd_miniconfig	2	+++ kconfig/freebsd_miniconfig
3	@@ -49,6 +49,7 @@ CONFIG_RENICE=y	3	@@ -49,6 +49,7 @@ CONFIG_SED=y
4	CONFIG_RM=y	4	CONFIG_RM=y
5	CONFIG_RMDIR=y	5	CONFIG_RMDIR=y
6	CONFIG_SED=y	6	CONFIG_SED=y
Lines 8-10 Link Here
8	CONFIG_SLEEP=y	8	CONFIG_SLEEP=y
9	CONFIG_SORT=y	9	CONFIG_SORT=y
10	CONFIG_SPLIT=y	10	CONFIG_SPLIT=y
		11	@@ -154,3 +155,4 @@ CONFIG_TOYBOX_HELP_DASHDASH=y
		12	CONFIG_TOYBOX_FLOAT=y
		13	CONFIG_TOYBOX_HELP=y
		14	CONFIG_TOYBOX_HELP_DASHDASH=y
		15	+CONFIG_UNAME=y

Added Link Here

(-)b/sysutils/toybox/files/patch-lib_portability.c (+11 lines)
1	--- lib/portability.c.orig 2024-04-09 01:50:07 UTC
2	+++ lib/portability.c
3	@@ -65,7 +65,7 @@ struct mtab_list xgetmountlist(char path)
4	int i, count;
5
6	if (path) error_exit("xgetmountlist");
7	- if ((count = getmntinfo(&entries, 0)) == 0) perror_exit("getmntinfo");
8	+ if (!(count = getmntinfo(&entries, MNT_NOWAIT))) perror_exit("getmntinfo");
9
10	// The "test" part of the loop is done before the first time through and
11	// again after each "increment", so putting the actual load there avoids

Lines 8-13 toybox/bin/cksum Link Here

(-)b/sysutils/toybox/pkg-plist (-2 / +35 lines)
8	toybox/bin/cpio	8	toybox/bin/cpio
9	toybox/bin/crc32	9	toybox/bin/crc32
10	toybox/bin/date	10	toybox/bin/date
		11	toybox/bin/df
		12	toybox/bin/dnsdomainname
11	toybox/bin/dos2unix	13	toybox/bin/dos2unix
12	toybox/bin/echo	14	toybox/bin/echo
13	toybox/bin/egrep	15	toybox/bin/egrep
Lines 24-29 toybox/bin/mkdir Link Here
24	toybox/bin/mknod	26	toybox/bin/mknod
25	toybox/bin/mktemp	27	toybox/bin/mktemp
26	toybox/bin/mountpoint	28	toybox/bin/mountpoint
		29	toybox/bin/netcat
27	toybox/bin/nice	30	toybox/bin/nice
28	toybox/bin/pidof	31	toybox/bin/pidof
29	toybox/bin/printenv	32	toybox/bin/printenv
Lines 32-39 toybox/bin/rm Link Here
32	toybox/bin/rmdir	35	toybox/bin/rmdir
33	toybox/bin/sed	36	toybox/bin/sed
34	toybox/bin/sleep	37	toybox/bin/sleep
		38	toybox/bin/stat
		39	toybox/bin/su
35	toybox/bin/sync	40	toybox/bin/sync
36	toybox/bin/touch	41	toybox/bin/touch
		42	toybox/bin/toybox
37	toybox/bin/true	43	toybox/bin/true
38	toybox/bin/uname	44	toybox/bin/uname
39	toybox/bin/unix2dos	45	toybox/bin/unix2dos
Lines 46-65 toybox/sbin/modinfo Link Here
46	toybox/sbin/sysctl	52	toybox/sbin/sysctl
47	toybox/usr/bin/acpi	53	toybox/usr/bin/acpi
48	toybox/usr/bin/ascii	54	toybox/usr/bin/ascii
		55	toybox/usr/bin/base32
49	toybox/usr/bin/base64	56	toybox/usr/bin/base64
50	toybox/usr/bin/basename	57	toybox/usr/bin/basename
51	toybox/usr/bin/bunzip2	58	toybox/usr/bin/bunzip2
52	toybox/usr/bin/bzcat	59	toybox/usr/bin/bzcat
53	toybox/usr/bin/cal	60	toybox/usr/bin/cal
54	toybox/usr/bin/chrt	61	toybox/usr/bin/chrt
55	toybox/usr/bin/chvt
56	toybox/usr/bin/clear	62	toybox/usr/bin/clear
57	toybox/usr/bin/cmp	63	toybox/usr/bin/cmp
58	toybox/usr/bin/comm	64	toybox/usr/bin/comm
59	toybox/usr/bin/count	65	toybox/usr/bin/count
60	toybox/usr/bin/cut	66	toybox/usr/bin/cut
		67	toybox/usr/bin/dd
61	toybox/usr/bin/dirname	68	toybox/usr/bin/dirname
62	toybox/usr/bin/du	69	toybox/usr/bin/du
		70	toybox/usr/bin/env
63	toybox/usr/bin/expand	71	toybox/usr/bin/expand
64	toybox/usr/bin/factor	72	toybox/usr/bin/factor
65	toybox/usr/bin/fallocate	73	toybox/usr/bin/fallocate
Lines 67-75 toybox/usr/bin/file Link Here
67	toybox/usr/bin/find	75	toybox/usr/bin/find
68	toybox/usr/bin/flock	76	toybox/usr/bin/flock
69	toybox/usr/bin/fmt	77	toybox/usr/bin/fmt
		78	toybox/usr/bin/fold
		79	toybox/usr/bin/ftpget
		80	toybox/usr/bin/ftpput
70	toybox/usr/bin/groups	81	toybox/usr/bin/groups
		82	toybox/usr/bin/gunzip
71	toybox/usr/bin/head	83	toybox/usr/bin/head
72	toybox/usr/bin/hexedit	84	toybox/usr/bin/hexedit
		85	toybox/usr/bin/host
		86	toybox/usr/bin/httpd
73	toybox/usr/bin/iconv	87	toybox/usr/bin/iconv
74	toybox/usr/bin/id	88	toybox/usr/bin/id
75	toybox/usr/bin/killall	89	toybox/usr/bin/killall
Lines 79-86 toybox/usr/bin/logname Link Here
79	toybox/usr/bin/lspci	93	toybox/usr/bin/lspci
80	toybox/usr/bin/lsusb	94	toybox/usr/bin/lsusb
81	toybox/usr/bin/makedevs	95	toybox/usr/bin/makedevs
		96	toybox/usr/bin/mcookie
		97	toybox/usr/bin/md5sum
		98	toybox/usr/bin/microcom
82	toybox/usr/bin/mkfifo	99	toybox/usr/bin/mkfifo
83	toybox/usr/bin/mkpasswd	100	toybox/usr/bin/mkpasswd
		101	toybox/usr/bin/nbd-server
		102	toybox/usr/bin/nc
84	toybox/usr/bin/nl	103	toybox/usr/bin/nl
85	toybox/usr/bin/nohup	104	toybox/usr/bin/nohup
86	toybox/usr/bin/od	105	toybox/usr/bin/od
Lines 89-94 toybox/usr/bin/patch Link Here
89	toybox/usr/bin/pmap	108	toybox/usr/bin/pmap
90	toybox/usr/bin/printf	109	toybox/usr/bin/printf
91	toybox/usr/bin/pwdx	110	toybox/usr/bin/pwdx
		111	toybox/usr/bin/pwgen
		112	toybox/usr/bin/readelf
92	toybox/usr/bin/readlink	113	toybox/usr/bin/readlink
93	toybox/usr/bin/realpath	114	toybox/usr/bin/realpath
94	toybox/usr/bin/renice	115	toybox/usr/bin/renice
Lines 96-113 toybox/usr/bin/reset Link Here
96	toybox/usr/bin/rev	117	toybox/usr/bin/rev
97	toybox/usr/bin/seq	118	toybox/usr/bin/seq
98	toybox/usr/bin/setsid	119	toybox/usr/bin/setsid
		120	toybox/usr/bin/sha1sum
		121	toybox/usr/bin/sha224sum
		122	toybox/usr/bin/sha256sum
		123	toybox/usr/bin/sha384sum
		124	toybox/usr/bin/sha3sum
		125	toybox/usr/bin/sha512sum
99	toybox/usr/bin/shred	126	toybox/usr/bin/shred
100	toybox/usr/bin/shuf	127	toybox/usr/bin/shuf
101	toybox/usr/bin/sort	128	toybox/usr/bin/sort
102	toybox/usr/bin/split	129	toybox/usr/bin/split
103	toybox/usr/bin/strings	130	toybox/usr/bin/strings
104	toybox/usr/bin/tac	131	toybox/usr/bin/tac
		132	toybox/usr/bin/tail
105	toybox/usr/bin/tee	133	toybox/usr/bin/tee
106	toybox/usr/bin/test	134	toybox/usr/bin/test
107	toybox/usr/bin/time	135	toybox/usr/bin/time
108	toybox/usr/bin/timeout	136	toybox/usr/bin/timeout
109	toybox/usr/bin/truncate	137	toybox/usr/bin/truncate
		138	toybox/usr/bin/ts
		139	toybox/usr/bin/tsort
110	toybox/usr/bin/tty	140	toybox/usr/bin/tty
		141	toybox/usr/bin/unicode
111	toybox/usr/bin/uniq	142	toybox/usr/bin/uniq
112	toybox/usr/bin/unlink	143	toybox/usr/bin/unlink
113	toybox/usr/bin/uudecode	144	toybox/usr/bin/uudecode
Lines 116-125 toybox/usr/bin/uuidgen Link Here
116	toybox/usr/bin/w	147	toybox/usr/bin/w
117	toybox/usr/bin/watch	148	toybox/usr/bin/watch
118	toybox/usr/bin/wc	149	toybox/usr/bin/wc
		150	toybox/usr/bin/wget
119	toybox/usr/bin/which	151	toybox/usr/bin/which
120	toybox/usr/bin/who	152	toybox/usr/bin/who
121	toybox/usr/bin/whoami	153	toybox/usr/bin/whoami
122	toybox/usr/bin/xargs	154	toybox/usr/bin/xargs
123	toybox/usr/bin/xxd	155	toybox/usr/bin/xxd
124	toybox/usr/bin/yes	156	toybox/usr/bin/yes
		157	toybox/usr/bin/zcat
125	toybox/usr/sbin/chroot	158	toybox/usr/sbin/chroot
126	-	159	toybox/usr/sbin/devmem

Return to bug 278481

Lines 1-5 Link Here

(-)b/sysutils/toybox/Makefile (-31 / +5 lines)
1	PORTNAME= toybox	1	PORTNAME= toybox
2	PORTVERSION= 0.8.10	2	PORTVERSION= 0.8.11
3	CATEGORIES= sysutils	3	CATEGORIES= sysutils
4	MASTER_SITES= http://landley.net/toybox/downloads/	4	MASTER_SITES= http://landley.net/toybox/downloads/
5		5
Lines 16-44 BUILD_DEPENDS= bash:shells/bash gsed:textproc/gsed Link Here
16		16
17	USES= gmake shebangfix	17	USES= gmake shebangfix
18		18
19	SHEBANG_FILES= mkroot/record-commands scripts/bloatcheck \	19	SHEBANG_FILES= mkroot/record-commands scripts/probes/bloatcheck \
20	scripts/mcm-buildall.sh scripts/change.sh \	20	scripts/mcm-buildall.sh scripts/change.sh \
21	scripts/findglobals.sh scripts/genconfig.sh \	21	scripts/probes/findglobals scripts/genconfig.sh \
22	scripts/install.sh scripts/make.sh scripts/mkroot.sh \	22	scripts/install.sh scripts/make.sh scripts/mkroot.sh \
23	scripts/portability.sh scripts/runtest.sh \	23	scripts/portability.sh scripts/runtest.sh \
24	scripts/single.sh scripts/test.sh configure \	24	scripts/single.sh scripts/test.sh configure \
25	tests/*	25	tests/*
26		26
27	BIN_LINKS= [ cat chgrp chmod chown cksum cpio crc32 date dos2unix echo \
28	egrep false fgrep fsync grep help hostname kill ln ls mkdir \
29	mknod mktemp mountpoint nice pidof printenv pwd rm rmdir sed \
30	sleep sync touch true uname unix2dos usleep vmstat
31	SBIN_LINKS= killall5 lsmod mkswap modinfo sysctl
32	USRBIN_LINKS= acpi ascii base64 basename bunzip2 bzcat cal chrt chvt \
33	clear cmp comm count cut dirname du expand factor fallocate \
34	file find flock fmt groups head hexedit iconv id killall link \
35	logger logname lspci lsusb makedevs mkfifo mkpasswd nl nohup \
36	od paste patch pmap printf pwdx readlink realpath renice \
37	reset rev seq setsid shred shuf sort split strings tac tee \
38	test time timeout truncate tty uniq unlink uudecode uuencode \
39	uuidgen w watch wc which who whoami xargs xxd yes
40	USRSBIN_LINKS= chroot
41
42	do-configure:	27	do-configure:
43	cd ${WRKSRC} && HOSTCC=${CC} ${GMAKE} bsd_defconfig	28	cd ${WRKSRC} && HOSTCC=${CC} ${GMAKE} bsd_defconfig
44		29
Lines 48-64 do-install: Link Here
48	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/sbin	33	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/sbin
49	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/bin	34	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/bin
50	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/sbin	35	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/sbin
51	.for f in ${BIN_LINKS}	36	(cd ${WRKSRC} && PREFIX=${STAGEDIR}${PREFIX}/${PORTNAME} scripts/install.sh --symlink --long)
52	${LN} -s ../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${f}
53	.endfor
54	.for f in ${SBIN_LINKS}
55	${LN} -s ../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/sbin/${f}
56	.endfor
57	.for f in ${USRBIN_LINKS}
58	${LN} -s ../../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/bin/${f}
59	.endfor
60	.for f in ${USRSBIN_LINKS}
61	${LN} -s ../../../bin/toybox ${STAGEDIR}${PREFIX}/${PORTNAME}/usr/sbin/${f}
62	.endfor
63		37
64	.include <bsd.port.mk>	38	.include <bsd.port.mk>