D5689.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D5689.diff
View Options

	Index: Mk/Scripts/qa.sh
	===================================================================
	--- Mk/Scripts/qa.sh
	+++ Mk/Scripts/qa.sh
	@@ -96,6 +96,7 @@

	baselibs() {
	local rc
	+ local found
	[ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return
	while read f; do
	case ${f} in
	@@ -107,12 +108,20 @@
	err "Bad linking on ${f##* } please add USES=libedit"
	rc=1
	;;
	+ NEEDED\[libcrypto.so.]\|NEEDED\[libssl.so.])
	+ found=1
	+ ;;
	esac
	done <<-EOF
	$(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \
	${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/libexec \
	-type f -exec readelf -d {} + 2>/dev/null)
	EOF
	+ if [ -z "${USESOPENSSL}" -a -n "${found}" ]; then
	+ warn "you need USES=openssl"
	+ elif [ -n "${USESOPENSSL}" -a -z "${found}" ]; then
	+ warn "you may not need USES=openssl"
	+ fi
	return ${rc}
	}

	Index: Mk/bsd.port.mk
	===================================================================
	--- Mk/bsd.port.mk
	+++ Mk/bsd.port.mk
	@@ -1531,6 +1531,9 @@
	"STRIP=${STRIP}" \
	TMPPLIST=${TMPPLIST} \
	PKGBASE=${PKGBASE}
	+.if defined(USE_OPENSSL) \|\| !empty(USES:Mopenssl)
	+QA_ENV+= USESOPENSSL=yes
	+.endif
	.if !empty(USES:Mdesktop-file-utils)
	QA_ENV+= USESDESKTOPFILEUTILS=yes
	.endif