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

Collapse All | Expand All

(-)Mk/Scripts/actual-package-depends.sh (+29 lines)
Line 0 Link Here
1
#!/bin/sh
2
# MAINTAINER: portmgr@FeeeBSD.org
3
# $FreeBSD$
4
5
if [ -z "${PKG_BIN}" ]; then
6
	echo "PKG_BIN required in environment." >&2
7
	exit 1
8
fi
9
10
find_dep() {
11
	pattern=$1
12
	case ${pattern} in
13
	*\>*|*\<*|*=*)
14
		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null
15
		return
16
		;;
17
	/*)
18
		searchfile=$pattern
19
		;;
20
	*)
21
		searchfile=$(/usr/bin/which ${pattern} 2>/dev/null)
22
		;;
23
	esac
24
	[ -n "${searchfile}" ] && ${PKG_BIN} which -q ${searchfile}
25
}
26
27
for lookup; do
28
	${PKG_BIN} query "\"%n\": {origin: \"%o\", version: \"%v\"}" "$(find_dep ${lookup})" || :
29
done
(-)Mk/Scripts/find-lib.sh (+23 lines)
Line 0 Link Here
1
#!/bin/sh
2
# MAINTAINER: portmgr@FreeBSD.org
3
# $FreeBSD$
4
5
if [ -z "${LIB_DIRS}" -o -z "${LOCALBASE}" ]; then
6
	echo "LIB_DIRS, LOCALBASE required in environment." >&2
7
	exit 1
8
fi
9
10
if [ $# -ne 1 ]; then
11
	echo "$0: no argument provided." >&2
12
fi
13
14
lib=$1
15
dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`"
16
17
for libdir in ${dirs} ; do
18
	test -f ${libdir}/${lib} || continue
19
	libfile=`realpath ${libdir}/${lib}`
20
	[ `file -b -L --mime-type ${libfile}` = "application/x-sharedlib" ] || continue
21
	echo $libfile
22
	break
23
done
(-)Mk/bsd.port.mk (-16 / +8 lines)
Lines 4473-4490 Link Here
4473
		target="${DEPENDS_TARGET}"; \
4473
		target="${DEPENDS_TARGET}"; \
4474
		depends_args="${DEPENDS_ARGS}"; \
4474
		depends_args="${DEPENDS_ARGS}"; \
4475
		${ECHO_MSG}  -n "===>   ${PKGNAME} depends on shared library: $${lib}" ; \
4475
		${ECHO_MSG}  -n "===>   ${PKGNAME} depends on shared library: $${lib}" ; \
4476
		found=0 ; \
4476
		libfile=`${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}` ; \
4477
		dirs="${LIB_DIRS} `${CAT} ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || : `" ; \
4477
		if [ -z "$${libfile}" ]; then \
4478
		for libdir in $$dirs; do \
4479
			test -f $${libdir}/$${lib} || continue; \
4480
			if [ -x /usr/bin/file ]; then \
4481
				_LIB_FILE=`realpath $${libdir}/$${lib}`; \
4482
				[ `file -b -L --mime-type $${_LIB_FILE}` = "application/x-sharedlib" ] || continue ; \
4483
			fi ; \
4484
			found=1 ; \
4485
			${ECHO_MSG} -n " - found ($${_LIB_FILE})"; \
4486
		done ; \
4487
		if [ $${found} -eq 0 ]; then \
4488
			${ECHO_MSG} " - not found"; \
4478
			${ECHO_MSG} " - not found"; \
4489
			${ECHO_MSG} "===>    Verifying for $$lib in $$dir"; \
4479
			${ECHO_MSG} "===>    Verifying for $$lib in $$dir"; \
4490
			if [ ! -d "$$dir" ] ; then \
4480
			if [ ! -d "$$dir" ] ; then \
Lines 4493-4499 Link Here
4493
				${_INSTALL_DEPENDS} \
4483
				${_INSTALL_DEPENDS} \
4494
			fi ; \
4484
			fi ; \
4495
		else \
4485
		else \
4496
			${ECHO_MSG}; \
4486
			${ECHO_MSG} " - found ($${libfile})"; \
4497
		fi ; \
4487
		fi ; \
4498
	done
4488
	done
4499
.endif
4489
.endif
Lines 4801-4809 Link Here
4801
	done
4791
	done
4802
4792
4803
ACTUAL-PACKAGE-DEPENDS?= \
4793
ACTUAL-PACKAGE-DEPENDS?= \
4804
	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
4794
	depfiles="" ; \
4805
		${PKG_QUERY} "\"%n\": {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
4795
	for lib in ${LIB_DEPENDS:C/\:.*//}; do \
4806
	fi
4796
		depfiles="$$depfiles `${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}`" ; \
4797
	done ; \
4798
	${SETENV} PKG_BIN="${PKG_BIN}" ${SH} ${SCRIPTSDIR}/actual-package-depends.sh $${depfiles} ${RUN_DEPENDS:C/(.*)\:.*/"\1"/}
4807
4799
4808
create-manifest:
4800
create-manifest:
4809
	@${MKDIR} ${METADIR}; \
4801
	@${MKDIR} ${METADIR}; \
(-)Mk/bsd.options.mk (-8 lines)
Lines 99-106 Link Here
99
#				USE_FOO+= bar
99
#				USE_FOO+= bar
100
#				If you need more than one option, you can do
100
#				If you need more than one option, you can do
101
#				FOO=bar,baz and you'll get USE_FOO=bar baz
101
#				FOO=bar,baz and you'll get USE_FOO=bar baz
102
# ${opt}_USE_OFF=	FOO=bar	When option is disabled, it will enable
103
#				USE_FOO+= bar
104
#
102
#
105
# For each of:
103
# For each of:
106
# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
104
# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
Lines 462-473 Link Here
462
.      endif
460
.      endif
463
.    endfor
461
.    endfor
464
.  else
462
.  else
465
.    if defined(${opt}_USE_OFF)
466
.      for option in ${${opt}_USE_OFF}
467
_u=		${option:C/=.*//g}
468
USE_${_u:tu}+=	${option:C/.*=//g:C/,/ /g}
469
.      endfor
470
.    endif
471
.    if defined(${opt}_CONFIGURE_ENABLE)
463
.    if defined(${opt}_CONFIGURE_ENABLE)
472
.      for iopt in ${${opt}_CONFIGURE_ENABLE}
464
.      for iopt in ${${opt}_CONFIGURE_ENABLE}
473
CONFIGURE_ARGS+=	--disable-${iopt:C/=.*//}
465
CONFIGURE_ARGS+=	--disable-${iopt:C/=.*//}
(-)www/chromium/Makefile (-1 / +1 lines)
Lines 52-58 Link Here
52
		libwebp.so:${PORTSDIR}/graphics/webp
52
		libwebp.so:${PORTSDIR}/graphics/webp
53
53
54
RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
54
RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
55
		${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
55
		droid-fonts-ttf>0:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
56
		xdg-open:${PORTSDIR}/devel/xdg-utils
56
		xdg-open:${PORTSDIR}/devel/xdg-utils
57
57
58
ONLY_FOR_ARCHS=	i386 amd64
58
ONLY_FOR_ARCHS=	i386 amd64

Return to bug 197012