Attachment #243740 for bug #272816

View | Details | Raw Unified | Return to bug 272816
Collapse All | Expand All

Lines 203-211 Link Here

(-)b/etc/mtree/BSD.usr.dist (-2 / +2 lines)
203	calendar	203	calendar
204	..	204	..
205	certs	205	certs
206	trusted tags=package=caroot	206	trusted tags=package=caroot-data
207	..	207	..
208	untrusted tags=package=caroot	208	untrusted tags=package=caroot-data
209	..	209	..
210	..	210	..
211	dict	211	dict

Lines 113-120 nfs_COMMENT= NFS Utilities Link Here

(-)b/release/packages/Makefile.package (-2 / +2 lines)
113	nfs_DESC= NFS Utilities	113	nfs_DESC= NFS Utilities
114	nvme-tools_COMMENT= NVME Utilities	114	nvme-tools_COMMENT= NVME Utilities
115	nvme-tools_DESC= NVME Utilities	115	nvme-tools_DESC= NVME Utilities
116	openssl_COMMENT= OpenSSL Library and Utility	116	openssl_COMMENT= OpenSSL Utility
117	openssl_DESC= OpenSSL Library and Utility	117	openssl_DESC= OpenSSL Utility
118	pkg-bootstrap_COMMENT= pkg bootstrap Utility	118	pkg-bootstrap_COMMENT= pkg bootstrap Utility
119	pkg-bootstrap_DESC= pkg bootstrap Utility	119	pkg-bootstrap_DESC= pkg bootstrap Utility
120	periodic_COMMENT= Periodic Utility	120	periodic_COMMENT= Periodic Utility




			# else imposed on it.
			;;
		caroot)
			pkgdeps="caroot-data openssl"
			;;
		# -dev packages that have no corresponding non-dev package

	cp "${uclsource}" "${uclfile}"
	if [ ! -z "${pkgdeps}" ]; then
		echo 'deps: {' >> ${uclfile}
		for dep in ${pkgdeps}; do
			cat <<EOF >> ${uclfile}
	FreeBSD-${dep}: {
		origin: "base",
		version: "${PKG_VERSION}"
	}
}
EOF
		done
		echo '}' >> ${uclfile}
	fi
	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"
	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \

Lines 1-3 Link Here

(-)b/secure/caroot/Makefile.inc (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2	PACKAGE= caroot	2	PACKAGE= caroot-data

Lines 6-12 SUBDIR= engines modules Link Here

(-)b/secure/lib/libcrypto/Makefile (-1 / +1 lines)
6	.include <bsd.own.mk>	6	.include <bsd.own.mk>
7	.include <src.opts.mk>	7	.include <src.opts.mk>
8	PACKAGE= openssl	8	PACKAGE= libssl
9	LIB= crypto	9	LIB= crypto
10	SHLIB_MAJOR= 30	10	SHLIB_MAJOR= 30
11	VERSION_MAP= ${.CURDIR}/Version.map	11	VERSION_MAP= ${.CURDIR}/Version.map

Lines 5-11 Link Here

(-)b/secure/lib/libssl/Makefile (-1 / +1 lines)
5	LIB= ssl	5	LIB= ssl
6	SHLIB_MAJOR= 30	6	SHLIB_MAJOR= 30
7	VERSION_MAP= ${.CURDIR}/Version.map	7	VERSION_MAP= ${.CURDIR}/Version.map
8	PACKAGE= openssl	8	PACKAGE= libssl
9	NO_LINT=	9	NO_LINT=

Return to bug 272816

Lines 43-49 main() { Link Here

(-)b/release/packages/generate-ucl.sh (-5 / +7 lines)
43	# else imposed on it.	43	# else imposed on it.
44	;;	44	;;
45	caroot)	45	caroot)
46	pkgdeps="openssl"	46	pkgdeps="caroot-data openssl"
47	;;	47	;;
48	# -dev packages that have no corresponding non-dev package	48	# -dev packages that have no corresponding non-dev package
Lines 139-152 main() { Link Here
139	cp "${uclsource}" "${uclfile}"	139	cp "${uclsource}" "${uclfile}"
140	if [ ! -z "${pkgdeps}" ]; then	140	if [ ! -z "${pkgdeps}" ]; then
141	cat <<EOF >> ${uclfile}	141	echo 'deps: {' >> ${uclfile}
142	deps: {	142	for dep in ${pkgdeps}; do
143	FreeBSD-${pkgdeps}: {	143	cat <<EOF >> ${uclfile}
		144	FreeBSD-${dep}: {
144	origin: "base",	145	origin: "base",
145	version: "${PKG_VERSION}"	146	version: "${PKG_VERSION}"
146	}	147	}
147	}
148	EOF	148	EOF
		149	done
		150	echo '}' >> ${uclfile}
149	fi	151	fi
150	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"	152	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"
151	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \	153	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \