Attachment #247292 for bug #275735

Lines 69-74 check_dep() { Link Here

(-)b/Mk/Scripts/depends-list.sh (+6 lines)
69	d=${overlay}/${2}	69	d=${overlay}/${2}
70	f=	70	f=
71	case "${d}" in	71	case "${d}" in
		72	~/*) ;; # Ignore ~ in the path which would not be a subpkg
		73	~)
		74	d=${d%~*}
		75	;;
		76	esac
		77	case "${d}" in
72	@/*) ;; # Ignore @ in the path which would not be a flavor	78	@/*) ;; # Ignore @ in the path which would not be a flavor
73	@)	79	@)
74	f=${d##*@}	80	f=${d##*@}




{
	origin=$1
	target=$2
	subpkg=$3
	depends_args=$4
	if [ -z "${dp_USE_PACKAGE_DEPENDS}" -a -z "${dp_USE_PACKAGE_DEPENDS_ONLY}" ]; then
		MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args}
		return 0
	fi

	if [ -z "${subpkg}" ]; then
		port_var_fetch "${origin}" "${depends_args}" \
			PKGFILE pkgfile \
			PKGBASE pkgbase
	else
		port_var_fetch "${origin}" "${depends_args}" \
			PKGFILE.${subpkg} pkgfile \
			PKGBASE.${subpkg} pkgbase
	fi

	if [ -r "${pkgfile}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
		echo "===>   Installing existing package ${pkgfile}"

		continue
	fi

	subpkg=
	case "${origin}" in
	*@*/*) ;; # Ignore @ in the path which would not be a flavor
	*@*)
		export FLAVOR="${origin##*@}"
		origin=${origin%@*}
		;;
	*~*/*) ;; # Ignore ~ in the path which would not be a subpackage
	*~*)
		subpkg="${origin##*~}"
		origin=${origin%~*}
		;;
	esac

	case "${origin}" in

	fi

	# Now actually install the dependencies
	install_depends "${origin}" "${target}" "${subpkg}" "${depends_args}"
	# Recheck if the installed dependency validates the pattern except for /nonexistent
	[ "${fct}" = "false" ] || ${fct} "${pattern}"
	echo "===>   Returning to build of ${dp_PKGNAME}"

Lines 6-12 Link Here

(-)b/Mk/Scripts/functions.sh (-1 / +2 lines)
6	# Strip (owner,group,perm) from keywords	6	# Strip (owner,group,perm) from keywords
7	_strip_perms() {	7	_strip_perms() {
8	sed -Ee 's/^@$[^)]*$[[:space:]]+//' \	8	sed -Ee 's/^@$[^)]*$[[:space:]]+//' \
9	-e 's/^(@[[:alpha:]]+)$[^)]*$[[:space:]]+/\1 /'	9	-e 's/^(@[[:alpha:]]+)$[^)]*$[[:space:]]+/\1 /' \
		10	-e 's/^@@[[:alnum:]]+@@//'
10	}	11	}
11		12
12	# Expand TMPPLIST to absolute paths, splitting files and dirs into separate	13	# Expand TMPPLIST to absolute paths, splitting files and dirs into separate




# 					  few more targets only.

_LICENSE_DIR?=		${PREFIX}/share/licenses/${PKGNAME}
.    for sp in ${_PKGS}
_LICENSE_DIR.${sp}?=		${PREFIX}/share/licenses/${PKGNAME${_SP.${sp}}}
_LICENSE_CATALOG.${sp}?=	${_LICENSE_DIR.${sp}}/catalog.mk
_LICENSE_REPORT.${sp}?=	${_LICENSE_DIR.${sp}}/LICENSE
.    endfor
_LICENSE_STORE?=	${PORTSDIR}/Templates/Licenses
_LICENSE_CATALOG?=	${_LICENSE_DIR}/catalog.mk
_LICENSE_CATALOG_TMP?=	${WRKDIR}/.license-catalog.mk
_LICENSE_REPORT?=	${_LICENSE_DIR}/LICENSE
_LICENSE_REPORT_TMP?=	${WRKDIR}/.license-report
_LICENSE_COOKIE?=	${WRKDIR}/.license_done.${PORTNAME}.${PREFIX:S/\//_/g}


# Package list entries, and installation

.    if !defined(NO_LICENSES_INSTALL)
.      for sp in ${_PKGS}
.        if ${sp} == ${PKGBASE}
PLIST_FILES+=	${_LICENSE_CATALOG.${sp}} \
				${_LICENSE_REPORT.${sp}}
.          if ${_LICENSE_COMB} == "single"
PLIST_FILES+=	${_LICENSE_DIR.${sp}}/${_LICENSE}
.          else
.            for lic in ${_LICENSE}
.              if defined(_LICENSE_FILE_${lic})
PLIST_FILES+=	${_LICENSE_DIR.${sp}}/${lic}
.              endif
.            endfor
.          endif
.        else
PLIST_FILES${_SP.${sp}}+=	${_LICENSE_CATALOG.${sp}} \
				${_LICENSE_REPORT.${sp}}
.          if ${_LICENSE_COMB} == "single"
PLIST_FILES${_SP.${sp}}+=	${_LICENSE_DIR.${sp}}/${_LICENSE}
.          else
.            for lic in ${_LICENSE}
.              if defined(_LICENSE_FILE_${lic})
PLIST_FILES${_SP.${sp}}+=	${_LICENSE_DIR.${sp}}/${lic}
.              endif
.            endfor
.          endif
.        endif


install-license: install-license.${sp}
install-license.${sp}:
	@${MKDIR} ${STAGEDIR}${_LICENSE_DIR.${sp}}
	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG.${sp}}
	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${STAGEDIR}${_LICENSE_REPORT.${sp}}
.        if ${_LICENSE_COMB} == "single"
	@${INSTALL_DATA} ${_LICENSE_FILE} ${STAGEDIR}${_LICENSE_DIR.${sp}}/${_LICENSE}
.        else
.          for lic in ${_LICENSE}
	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR.${sp}}/${lic}
.          endfor
.        endif
.      endfor
.    endif

.  else	# !LICENSE




			CONFIGURE_ENABLE CONFIGURE_OFF CONFIGURE_ON \
			CONFIGURE_WITH IMPLIES MESON_ARGS MESON_DISABLED \
			MESON_ENABLED MESON_FALSE MESON_OFF MESON_ON MESON_TRUE \
			PREVENTS PREVENTS_MSG QMAKE_OFF QMAKE_ON \
			SUBPACKAGES SUBPACKAGES_OFF USE USE_OFF VARS VARS_OFF

# The format here is target_family:priority:target-type
_OPTIONS_TARGETS=	fetch:300:pre fetch:500:do fetch:700:post \

_OPTIONS_${target}?=
.  endfor

# Handle subpackages before the rest to be able to handle options helpers
# with subpackages
.  for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
.    if ${PORT_OPTIONS:M${opt}}
.      if defined(${opt}_SUBPACKAGES)
SUBPACKAGES+=	${${opt}_SUBPACKAGES}
.      endif
.    else
.      if defined(${opt}_SUBPACKAGES_OFF)
SUBPACKAGES+=	${${opt}_SUBPACKAGES_OFF}
.      endif
.    endif
.  endfor
.  for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
# PLIST_SUB
PLIST_SUB?=

.        if defined(${opt}_${deptype}_DEPENDS)
${deptype}_DEPENDS+=	${${opt}_${deptype}_DEPENDS}
.        endif
.        for p in ${SUBPACKAGES}
.          if defined(${opt}_${deptype}_DEPENDS.${p})
${deptype}_DEPENDS.{p}+=	${${opt}_${deptype}_DEPENDS.${p}}
.          endif
.        endfor
.      endfor
.      for target in ${_OPTIONS_TARGETS}
_target=	${target:C/:.*//}

.        if defined(${opt}_${deptype}_DEPENDS_OFF)
${deptype}_DEPENDS+=	${${opt}_${deptype}_DEPENDS_OFF}
.        endif
.        for p in ${SUBPACKAGES}
.          if defined(${opt}_${deptype}_DEPENDS_OFF.${p})
${deptype}_DEPENDS.{p}+=	${${opt}_${deptype}_DEPENDS_OFF.${p}}
.          endif
.        endfor
.      endfor
.      for target in ${_OPTIONS_TARGETS}
_target=	${target:C/:.*//}




_PKGMESSAGES+=	${PKGMESSAGE}

TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
_PLIST?=	${WRKDIR}/.PLIST

# backward compatibility for users
.    if defined(_PKG_TRANSITIONING_TO_NEW_EXT)

INSTALL_TARGET?=	install
INSTALL_TARGET+=	${LATE_INSTALL_ARGS}

# Integrate with the license auditing framework
.    if !defined (DISABLE_LICENSES)
.include "${PORTSDIR}/Mk/bsd.licenses.mk"
.    endif

# Popular master sites
.include "${PORTSDIR}/Mk/bsd.sites.mk"



PKGREPOSITORYSUBDIR?=	All
PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
.    if exists(${PACKAGES})
PACKAGES:=	${PACKAGES:S/:/\:/g}
_HAVE_PACKAGES=	yes
PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
.    else
PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
.    endif
WRKDIR_PKGFILE=	${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}

# The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
PKGLATESTREPOSITORY?=	${PACKAGES}/Latest

PKGOLDSIGFILE=			${PKGLATESTREPOSITORY}/${PKGBASE}.${PKG_COMPRESSION_FORMAT}.sig
.    endif


_PKGS=	${PKGBASE}
PORTS_FEATURES+=	SUBPACKAGES
.    if defined(SUBPACKAGES)
.      if ${SUBPACKAGES:Mmain}
DEV_ERROR+=	"SUBPACKAGES cannot contain 'main', it is a reserved value"
.      endif
.      for sp in ${SUBPACKAGES}
.        if ${sp:C/[[:lower:][:digit:]_]//g}
_BAD_SUBPACKAGES_NAMES+=	${sp}
.        endif
.      endfor
.      if !empty(_BAD_SUBPACKAGES_NAMES)
DEV_ERROR+=	"SUBPACKAGES cannot subpackages that are not all [a-z0-9_]: ${_BAD_SUBPACKAGES_NAMES}"
.      endif
.    endif
.    for sp in ${SUBPACKAGES}
# If a FRAMEWORK generated package needs to override its subpackage package name
# it can do it with this mechanism
.      if !defined(_PKGS.${sp})
_PKGS.${sp}=	${PKGBASE}-${sp}
.      endif
_PKGS+=	${_PKGS.${sp}}
PKGBASE.${sp}=	${_PKGS.${sp}}
_SP.${_PKGS.${sp}}=.${sp}
.    endfor

.    if !defined(_DID_SUBPACKAGES_HELPERS)
_DID_SUBPACKAGES_HELPERS=	yes
_SUBPACKAGE_HELPERS_FILE=	DESCR PKGINSTALL PKGDEINSTALL PKGMESSAGE \
							PKGPREINSTALL PKGPOSTINSTALL PKGPREDEINSTALL PKGPOSTDEINSTALL \
							PKGPREUPGRADE PKGPOSTUPGRADE PKGUPGRADE

.      for sp in ${SUBPACKAGES}
# These overwrite the current value
.        for v in ${_SUBPACKAGE_HELPERS_FILE}
${v}.${sp}?=	${$v}.${sp}
.        endfor
_PKGMESSAGES.${sp}=		${PKGMESSAGE}.${sp}
.        if !exists(${DESCR.${sp}})
DESCR.${sp}=	${DESCR}
DEV_WARNING+=	"DESCR.${sp} needs to point to an existing file."
.        endif
COMMENT.${sp}?=	${COMMENT} (subpkg: ${sp})
.      endfor
.    endif

.    if exists(${PACKAGES})
PACKAGES:=	${PACKAGES:S/:/\:/g}
_HAVE_PACKAGES=	yes
_PKGDIR=	${PKGREPOSITORY}
.    else
_PKGDIR=	${.CURDIR}
.    endif
.    for sp in ${_PKGS}
PKGNAME${_SP.${sp}}=	${sp}-${PKGVERSION}
PKGNAMES+=				${PKGNAME${_SP.${sp}}}
PKGFILE${_SP.${sp}}=	${_PKGDIR}/${PKGNAME${_SP.${sp}}}${PKG_SUFX}
.    endfor
_EXTRA_PACKAGE_TARGET_DEP+=	${_PKGDIR}
.    for sp in ${_PKGS}
WRKDIR_PKGFILE${_SP.${sp}}=	${WRKDIR}/pkg/${PKGNAME${_SP.${sp}}}${PKG_SUFX}
.    endfor

# Integrate with the license auditing framework
.    if !defined (DISABLE_LICENSES)
.include "${PORTSDIR}/Mk/bsd.licenses.mk"
.    endif

CONFIGURE_SCRIPT?=	configure
CONFIGURE_CMD?=		./${CONFIGURE_SCRIPT}
CONFIGURE_TARGET?=	${HOSTARCH}-portbld-${OPSYS:tl}${OSREL}

_EXTRA_PACKAGE_TARGET_DEP+= ${PKGFILE}
_PORTS_DIRECTORIES+=	${PKGREPOSITORY}

${PKGFILE}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY}
	@${LN} -f ${WRKDIR_PKGFILE} ${PKGFILE} 2>/dev/null \
			|| ${CP} -f ${WRKDIR_PKGFILE} ${PKGFILE}

.      if ${PKGORIGIN} == "ports-mgmt/pkg" || ${PKGORIGIN} == "ports-mgmt/pkg-devel"
_EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTREPOSITORY}
_PORTS_DIRECTORIES+=	${PKGLATESTREPOSITORY}

.    endif

# from here this will become a loop for subpackages
.    for sp in ${_PKGS}
${_PLIST}.${sp}: ${TMPPLIST}
	@if [ "${PKGBASE}" = "${sp}" ]; then \
		${SED} "/^@comment /d; /@@/d" ${TMPPLIST} > ${.TARGET} ; \
	else \
		${SED} -n "s/@@${sp:S/${PKGBASE}-//}@@//p" ${TMPPLIST} > ${.TARGET} ; \
	fi

${WRKDIR_PKGFILE${_SP.${sp}}}:	${_PLIST}.${sp} create-manifest ${WRKDIR}/pkg
	@echo "===>   Building ${PKGNAME${_SP.${sp}}}"
	@if ! ${SETENV} ${PKG_ENV} ${PKG_CREATE} ${PKG_CREATE_ARGS} -m ${METADIR}.${sp} -p ${_PLIST}.${sp} -o ${WRKDIR}/pkg ${PKGNAME}; then \
		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
		exit 1; \
	fi

_EXTRA_PACKAGE_TARGET_DEP+=	${WRKDIR_PKGFILE${_SP.${sp}}}

${PKGFILE${_SP.${sp}}}: ${WRKDIR_PKGFILE${_SP.${sp}}}
	@${LN} -f ${WRKDIR_PKGFILE${_SP.${sp}}} ${PKGFILE${_SP.${sp}}} 2>/dev/null \
		|| ${CP} -f ${WRKDIR_PKGFILE${_SP.${sp}}} ${PKGFILE${_SP.${sp}}}

_EXTRA_PACKAGE_TARGET_DEP+=	${PKGFILE${_SP.${sp}}}
.    endfor
# This will be the end of the loop

.    if !target(do-package)


.    if !target(delete-package)
delete-package:
.      for sp in ${_PKGS}
	@${ECHO_MSG} "===>  Deleting package for ${sp}"
# When staging, the package may only be in the workdir if not root
	@${RM} ${PKGFILE${_SP.${sp}}} ${WRKDIR_PKGFILE${_SP.${sp}}} 2>/dev/null || :
.      endfor
.    endif

.    if !target(delete-package-list)
delete-package-list:
.      for sp in ${_PKGS}
	@${ECHO_CMD} "[ -f ${PKGFILE${_SP.${sp}}} ] && (${ECHO_CMD} deleting ${PKGFILE${_SP.${sp}}}; ${RM} ${PKGFILE${_SP.${sp}}})"
.      endfor
.    endif

# Used by scripts and users to install a package from local repository.

.      if defined(INSTALLS_DEPENDS)
_INSTALL_PKG_ARGS+=	-A
.      endif
.      for sp in ${_PKGS}
install-package: install-package.${sp}
install-package.${sp}:
	@if [ -f "${WRKDIR_PKGFILE${_SP.${sp}}}" ]; then \
	    _pkgfile="${WRKDIR_PKGFILE${_SP.${sp}}}"; \
	else \
	    _pkgfile="${PKGFILE${_SP.${sp}}}"; \
	fi; \
	${PKG_ADD} ${_INSTALL_PKG_ARGS} $${_pkgfile}
.      endfor
.    endif

# Utility targets follow

test-message:
	@${ECHO_MSG} "===>  Testing for ${PKGNAME}"
package-message:
	@${ECHO_MSG} "===>  Building packages for ${PKGNAME}"

# Empty pre-* and post-* targets


		${SU_CMD} "${MAKE} ${.TARGET}"
	@${ECHO_MSG} "===>  Returning to user credentials"
.      else
.        for _sp in ${_PKGS}
	@${ECHO_MSG} "===>  Deinstalling for ${_sp}"
	@if ${PKG_INFO} -e ${_sp}; then \
		p=`${PKG_INFO} -q -O ${_sp}`; \
		${ECHO_MSG} "===>   Deinstalling $${p}"; \
		${PKG_DELETE} -f ${_sp} ; \
	else \
		${ECHO_MSG} "===>   ${_sp} not installed, skipping"; \
	fi
.        endfor
	@${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.      endif
.    endif

repackage: pre-repackage package

pre-repackage:
	@${RM} ${PACKAGE_COOKIE} ${TMPPLIST}*
.    endif

# Build a package but don't check the cookie for installation, also don't

depends: pkg-depends extract-depends patch-depends lib-depends fetch-depends build-depends run-depends

.      for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST
.        for sp in ${_PKGS}
${deptype}_DEPENDS_ALL+=	${${deptype}_DEPENDS${_SP.${sp}}}
.        endfor
${deptype:tl}-depends:
.        if !empty(${deptype}_DEPENDS_ALL) && !defined(NO_DEPENDS)
	@${SETENV} \
		dp_RAWDEPENDS="${${deptype}_DEPENDS_ALL}" \
		dp_DEPTYPE="${deptype}_DEPENDS" \
		dp_DEPENDS_TARGET="${DEPENDS_TARGET}" \
		dp_DEPENDS_PRECLEAN="${DEPENDS_PRECLEAN}" \


# Dependency lists: both build and runtime, recursive.  Print out directory names.

_UNIFIED_DEPENDS=${PKG_DEPENDS_ALL} ${EXTRACT_DEPENDS_ALL} ${PATCH_DEPENDS_ALL} ${FETCH_DEPENDS_ALL} ${BUILD_DEPENDS_ALL} ${LIB_DEPENDS_ALL} ${RUN_DEPENDS_ALL} ${TEST_DEPENDS_ALL}
_DEPEND_SPECIALS=	${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,}

.    for d in ${_UNIFIED_DEPENDS:M*\:/*}

ALL-DEPENDS-FLAVORS-LIST=	${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:Q}
DEINSTALL-DEPENDS-FLAVORS-LIST=	${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:N${PKG_DEPENDS}:Q}
MISSING-DEPENDS-LIST=		${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q}
BUILD-DEPENDS-LIST=			${DEPENDS-LIST} "${PKG_DEPENDS_ALL} ${EXTRACT_DEPENDS_ALL} ${PATCH_DEPENDS_ALL} ${FETCH_DEPENDS_ALL} ${BUILD_DEPENDS_ALL} ${LIB_DEPENDS_ALL}"
RUN-DEPENDS-LIST=			${DEPENDS-LIST} "${LIB_DEPENDS_ALL} ${RUN_DEPENDS_ALL}"
TEST-DEPENDS-LIST=			${DEPENDS-LIST} ${TEST_DEPENDS_ALL:Q}
CLEAN-DEPENDS-LIST=			${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q}
CLEAN-DEPENDS-LIMITED-LIST=	${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q}


	@${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies"
.        for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
.          if defined(${deptype}_DEPENDS)
	@targ=fetch; deps="${${deptype}_DEPENDS_ALL}"; ${FETCH_LIST}
.          endif
.        endfor
.      endif

.      if !defined(NO_DEPENDS)
.        for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
.          if defined(${deptype}_DEPENDS)
	@targ=fetch-list; deps="${${deptype}_DEPENDS_ALL}"; ${FETCH_LIST}
.          endif
.        endfor
.      endif

	@${PACKAGE-DEPENDS-LIST}
.    endif

_LIB_RUN_DEPENDS=	${LIB_DEPENDS_ALL} ${RUN_DEPENDS_ALL}
PACKAGE-DEPENDS-LIST?= \
	if [ "${CHILD_DEPENDS}" ]; then \
		installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \

	for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
		unset flavor; \
		case $${dir} in \
		*~*) \
			dir=$${dir%~*}; \
			;; \
		esac; \
		case $${dir} in \
		*@*) \
			flavor=$${dir\#*@}; \
			dir=$${dir%@*}; \

		fi; \
	done

# FIXME: SELF_DEPENDS can only be used to depend on sub packages whose
# package name has not been overrided by the framework, otherwize the
# assumption made below that the package name is "PKGBASE-$$self" is broken.
.    for sp in ${_PKGS}
ACTUAL-PACKAGE-DEPENDS${_SP.${sp}}?= \
	depfiles="" ; \
	for lib in ${LIB_DEPENDS${_SP.${sp}}:C/\:.*//}; do \
		depfiles="$$depfiles `${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}`" ; \
	done ; \
	for self in ${SELF_DEPENDS${_SP.${sp}}}; do \
		if [ "$$self" = "main" ]; then \
			printf "\"%s\": {origin: \"%s\", version: \"%s\"}\n" ${PKGBASE} ${PKGORIGIN} ${PKGVERSION}; \
		else \
			printf "\"%s-%s\": {origin: \"%s\", version: \"%s\"}\n" ${PKGBASE} $$self ${PKGORIGIN} ${PKGVERSION}; \
		fi ; \
	done ; \
	${SETENV} PKG_BIN="${PKG_BIN}" ${SH} ${SCRIPTSDIR}/actual-package-depends.sh $${depfiles} ${RUN_DEPENDS${_SP.${sp}}:C/(.*)\:.*/"\1"/}
.    endfor

PKG_NOTES_ENV?=
.    for note in ${PKG_NOTES}
PKG_NOTES_ENV+=	dp_PKG_NOTE_${note}=${PKG_NOTE_${note}:Q}
.    endfor

.    for sp in ${_PKGS}
PKG_NOTES.${sp}=	${PKG_NOTES}
PKG_NOTES_ENV.${sp}=	${PKG_NOTES_ENV}
.      if ${sp} != ${PKGBASE}
PKG_NOTES.${sp}+=	subpackage
PKG_NOTES_ENV.${sp}+=	dp_PKG_NOTE_subpackage=${_SP.${sp}:S/^.//1}
.      endif
create-manifest: create-manifest.${sp}
create-manifest.${sp}:
	@${SETENV} \
			dp_SCRIPTSDIR='${SCRIPTSDIR}'                         \
			dp_ACTUAL_PACKAGE_DEPENDS='${ACTUAL-PACKAGE-DEPENDS${_SP.${sp}}}' \
			dp_CATEGORIES='${CATEGORIES:u:S/$/,/}'                \
			dp_COMMENT=${COMMENT${_SP.${sp}}:Q}                   \
			dp_COMPLETE_OPTIONS_LIST='${COMPLETE_OPTIONS_LIST}'   \
			dp_DEPRECATED=${DEPRECATED:Q}                         \
			dp_DESCR='${DESCR${_SP.${sp}}}'                       \
			dp_EXPIRATION_DATE='${EXPIRATION_DATE}'               \
			dp_GROUPS='${GROUPS:u:S/$/,/}'                        \
			dp_LICENSE='${LICENSE:u:S/$/,/}'                      \
			dp_LICENSE_COMB='${LICENSE_COMB}'                     \
			dp_MAINTAINER='${MAINTAINER}'                         \
			dp_METADIR='${METADIR}.${sp}'                         \
			dp_NO_ARCH='${NO_ARCH}'                               \
			dp_PKGBASE='${sp}'                                    \
			dp_PKGDEINSTALL='${PKGDEINSTALL${_SP.${sp}}}'         \
			dp_PKGINSTALL='${PKGINSTALL${_SP.${sp}}}'             \
			dp_PKGMESSAGES='${_PKGMESSAGES${_SP.${sp}}}'          \
			dp_PKGORIGIN='${PKGORIGIN}'                           \
			dp_PKGPOSTDEINSTALL='${PKGPOSTDEINSTALL${_SP.${sp}}}' \
			dp_PKGPOSTINSTALL='${PKGPOSTINSTALL${_SP.${sp}}}'     \
			dp_PKGPREDEINSTALL='${PKGPREDEINSTALL${_SP.${sp}}}'   \
			dp_PKGPREINSTALL='${PKGPREINSTALL${_SP.${sp}}}'       \
			dp_PKGVERSION='${PKGVERSION}'                         \
			dp_PKG_BIN='${PKG_BIN}'                               \
			dp_PKG_IGNORE_DEPENDS='${PKG_IGNORE_DEPENDS}'         \
			dp_PKG_NOTES='${PKG_NOTES.${sp}}'                     \
			dp_PORT_OPTIONS='${PORT_OPTIONS}'                     \
			dp_PREFIX='${PREFIX}'                                 \
			dp_USERS='${USERS:u:S/$/,/}'                          \
			dp_WWW='${WWW}'                                       \
			${PKG_NOTES_ENV.${sp}}                                \
			${SH} ${SCRIPTSDIR}/create-manifest.sh
.    endfor

# Print out package names.

package-depends:
	@${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}'

.    for sp in ${_PKGS}
actual-package-depends: actual-package-depends.${sp}
actual-package-depends.${sp}:
	@${ACTUAL-PACKAGE-DEPENDS${_SP.${sp}}}
.    endfor

# Build packages for port and dependencies


# first to avoid gratuitous breakage.

.    if !target(describe)
_EXTRACT_DEPENDS=${EXTRACT_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_PATCH_DEPENDS=${PATCH_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_FETCH_DEPENDS=${FETCH_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_LIB_DEPENDS=${LIB_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_BUILD_DEPENDS=${BUILD_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
_RUN_DEPENDS=${RUN_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
.      if exists(${DESCR})
_DESCR=${DESCR}
.      else

	@for file in ${PLIST_FILES}; do \
		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
	done
.      for sp in ${_PKGS}
.        if ${sp} != ${PKGBASE}
	@for file in ${PLIST_FILES${_SP.${sp}}}; do \
		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's/^/@@${_SP.${sp}:S/^.//}@@/' >> ${TMPPLIST}; \
	done
.        endif
.      endfor
.      if !empty(PLIST)
.        for f in ${PLIST}
	@if [ -f "${f}" ]; then \

	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}
.      endfor

.      for sp in ${_PKGS}
.        if ${sp} != ${PKGBASE}
.          for dir in ${PLIST_DIRS${_SP.${sp}}}
	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@@${_SP.${sp}:S/^.//}@@@dir ,' >> ${TMPPLIST}
.          endfor
.        endif
.      endfor
.    endif

${TMPPLIST}:


pretty-flavors-package-names: .PHONY
.    if empty(FLAVORS)
	@${ECHO_CMD} "no flavor: ${_PKGS}"
.    else
.      for f in ${FLAVORS}
	@${ECHO_CMD} -n "${f}: "
	@cd ${.CURDIR} && ${SETENV} -i FLAVOR=${f} ${MAKE} -B -V _PKGS
.      endfor
.    endif

flavors-package-names: .PHONY
.    if empty(FLAVORS)
	@${ECHO_CMD} "${_PKGS}"
.    else
.      for f in ${FLAVORS}
	@cd ${.CURDIR} && ${SETENV} -i FLAVOR=${f} ${MAKE} -B -V _PKGS | ${XARGS} -n 1
.      endfor
.    endif


STAGE_ARGS=	-N
.      endif

.      for sp in ${_PKGS}
fake-pkg: fake-pkg.${sp}
fake-pkg.${sp}: ${_PLIST}.${sp}
.        if defined(INSTALLS_DEPENDS)
.          if !defined(NO_PKG_REGISTER)
	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME} as automatic"
.          endif
	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} -d ${STAGE_ARGS} -m ${METADIR}.${sp} -f ${_PLIST}.${sp}
.        else
.          if !defined(NO_PKG_REGISTER)
	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
.          endif
	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} ${STAGE_ARGS} -m ${METADIR}.${sp} -f ${_PLIST}.${sp}
.        endif
	@${RM} -r ${METADIR}.${sp}
.      endfor
	@${RM} -r ${METADIR}
.    endif

# Depend is generally meaningless for arbitrary ports, but if someone wants

Return to bug 275735

Lines 153-162 _LICENSE_LIST_PORT_VARS= PERMS NAME GROUPS Link Here

(-)b/Mk/bsd.licenses.mk (-24 / +44 lines)
153	# few more targets only.	153	# few more targets only.
154		154
155	_LICENSE_DIR?= ${PREFIX}/share/licenses/${PKGNAME}	155	_LICENSE_DIR?= ${PREFIX}/share/licenses/${PKGNAME}
		156	. for sp in ${_PKGS}
		157	_LICENSE_DIR.${sp}?= ${PREFIX}/share/licenses/${PKGNAME${_SP.${sp}}}
		158	_LICENSE_CATALOG.${sp}?= ${_LICENSE_DIR.${sp}}/catalog.mk
		159	_LICENSE_REPORT.${sp}?= ${_LICENSE_DIR.${sp}}/LICENSE
		160	. endfor
156	_LICENSE_STORE?= ${PORTSDIR}/Templates/Licenses	161	_LICENSE_STORE?= ${PORTSDIR}/Templates/Licenses
157	_LICENSE_CATALOG?= ${_LICENSE_DIR}/catalog.mk
158	_LICENSE_CATALOG_TMP?= ${WRKDIR}/.license-catalog.mk	162	_LICENSE_CATALOG_TMP?= ${WRKDIR}/.license-catalog.mk
159	_LICENSE_REPORT?= ${_LICENSE_DIR}/LICENSE
160	_LICENSE_REPORT_TMP?= ${WRKDIR}/.license-report	163	_LICENSE_REPORT_TMP?= ${WRKDIR}/.license-report
161	_LICENSE_COOKIE?= ${WRKDIR}/.license_done.${PORTNAME}.${PREFIX:S/\//_/g}	164	_LICENSE_COOKIE?= ${WRKDIR}/.license_done.${PORTNAME}.${PREFIX:S/\//_/g}
162		165
Lines 771-800 ${_LICENSE_COOKIE}: Link Here
771	# Package list entries, and installation	774	# Package list entries, and installation
772		775
773	. if !defined(NO_LICENSES_INSTALL)	776	. if !defined(NO_LICENSES_INSTALL)
774	PLIST_FILES+= ${_LICENSE_CATALOG} \	777	. for sp in ${_PKGS}
775	${_LICENSE_REPORT}	778	. if ${sp} == ${PKGBASE}
776		779	PLIST_FILES+= ${_LICENSE_CATALOG.${sp}} \
777	. if ${_LICENSE_COMB} == "single"	780	${_LICENSE_REPORT.${sp}}
778	PLIST_FILES+= ${_LICENSE_DIR}/${_LICENSE}	781	. if ${_LICENSE_COMB} == "single"
779	. else	782	PLIST_FILES+= ${_LICENSE_DIR.${sp}}/${_LICENSE}
780	. for lic in ${_LICENSE}	783	. else
781	. if defined(_LICENSE_FILE_${lic})	784	. for lic in ${_LICENSE}
782	PLIST_FILES+= ${_LICENSE_DIR}/${lic}	785	. if defined(_LICENSE_FILE_${lic})
		786	PLIST_FILES+= ${_LICENSE_DIR.${sp}}/${lic}
		787	. endif
		788	. endfor
783	. endif	789	. endif
784	. endfor	790	. else
785	. endif	791	PLIST_FILES${_SP.${sp}}+= ${_LICENSE_CATALOG.${sp}} \
		792	${_LICENSE_REPORT.${sp}}
		793	. if ${_LICENSE_COMB} == "single"
		794	PLIST_FILES${_SP.${sp}}+= ${_LICENSE_DIR.${sp}}/${_LICENSE}
		795	. else
		796	. for lic in ${_LICENSE}
		797	. if defined(_LICENSE_FILE_${lic})
		798	PLIST_FILES${_SP.${sp}}+= ${_LICENSE_DIR.${sp}}/${lic}
		799	. endif
		800	. endfor
		801	. endif
		802	. endif
786		803
787	install-license:	804
788	@${MKDIR} ${STAGEDIR}${_LICENSE_DIR}	805	install-license: install-license.${sp}
789	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG}	806	install-license.${sp}:
790	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${STAGEDIR}${_LICENSE_REPORT}	807	@${MKDIR} ${STAGEDIR}${_LICENSE_DIR.${sp}}
791	. if ${_LICENSE_COMB} == "single"	808	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG.${sp}}
792	@${INSTALL_DATA} ${_LICENSE_FILE} ${STAGEDIR}${_LICENSE_DIR}/${_LICENSE}	809	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${STAGEDIR}${_LICENSE_REPORT.${sp}}
793	. else	810	. if ${_LICENSE_COMB} == "single"
794	. for lic in ${_LICENSE}	811	@${INSTALL_DATA} ${_LICENSE_FILE} ${STAGEDIR}${_LICENSE_DIR.${sp}}/${_LICENSE}
795	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR}/${lic}	812	. else
796	. endfor	813	. for lic in ${_LICENSE}
797	. endif	814	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR.${sp}}/${lic}
		815	. endfor
		816	. endif
		817	. endfor
798	. endif	818	. endif
799		819
800	. else # !LICENSE	820	. else # !LICENSE

Lines 197-204 _ALL_OPTIONS_HELPERS= ${_OPTIONS_DEPENDS:S/$/_DEPENDS/} \ Link Here

(-)b/Mk/bsd.options.mk (-2 / +25 lines)
197	CONFIGURE_ENABLE CONFIGURE_OFF CONFIGURE_ON \	197	CONFIGURE_ENABLE CONFIGURE_OFF CONFIGURE_ON \
198	CONFIGURE_WITH IMPLIES MESON_ARGS MESON_DISABLED \	198	CONFIGURE_WITH IMPLIES MESON_ARGS MESON_DISABLED \
199	MESON_ENABLED MESON_FALSE MESON_OFF MESON_ON MESON_TRUE \	199	MESON_ENABLED MESON_FALSE MESON_OFF MESON_ON MESON_TRUE \
200	PREVENTS PREVENTS_MSG QMAKE_OFF QMAKE_ON USE USE_OFF \	200	PREVENTS PREVENTS_MSG QMAKE_OFF QMAKE_ON \
201	VARS VARS_OFF	201	SUBPACKAGES SUBPACKAGES_OFF USE USE_OFF VARS VARS_OFF
202		202
203	# The format here is target_family:priority:target-type	203	# The format here is target_family:priority:target-type
204	_OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \	204	_OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \
Lines 455-460 ALL_OPTIONS= ${OPTIONS_DEFINE} Link Here
455	_OPTIONS_${target}?=	455	_OPTIONS_${target}?=
456	. endfor	456	. endfor
457		457
		458	# Handle subpackages before the rest to be able to handle options helpers
		459	# with subpackages
		460	. for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
		461	. if ${PORT_OPTIONS:M${opt}}
		462	. if defined(${opt}_SUBPACKAGES)
		463	SUBPACKAGES+= ${${opt}_SUBPACKAGES}
		464	. endif
		465	. else
		466	. if defined(${opt}_SUBPACKAGES_OFF)
		467	SUBPACKAGES+= ${${opt}_SUBPACKAGES_OFF}
		468	. endif
		469	. endif
		470	. endfor
458	. for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}	471	. for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
459	# PLIST_SUB	472	# PLIST_SUB
460	PLIST_SUB?=	473	PLIST_SUB?=
Lines 540-545 ${flags}+= ${${opt}_${flags}} Link Here
540	. if defined(${opt}_${deptype}_DEPENDS)	553	. if defined(${opt}_${deptype}_DEPENDS)
541	${deptype}_DEPENDS+= ${${opt}_${deptype}_DEPENDS}	554	${deptype}_DEPENDS+= ${${opt}_${deptype}_DEPENDS}
542	. endif	555	. endif
		556	. for p in ${SUBPACKAGES}
		557	. if defined(${opt}_${deptype}_DEPENDS.${p})
		558	${deptype}_DEPENDS.{p}+= ${${opt}_${deptype}_DEPENDS.${p}}
		559	. endif
		560	. endfor
543	. endfor	561	. endfor
544	. for target in ${_OPTIONS_TARGETS}	562	. for target in ${_OPTIONS_TARGETS}
545	_target= ${target:C/:.*//}	563	_target= ${target:C/:.*//}
Lines 611-616 ${flags}+= ${${opt}_${flags}_OFF} Link Here
611	. if defined(${opt}_${deptype}_DEPENDS_OFF)	629	. if defined(${opt}_${deptype}_DEPENDS_OFF)
612	${deptype}_DEPENDS+= ${${opt}_${deptype}_DEPENDS_OFF}	630	${deptype}_DEPENDS+= ${${opt}_${deptype}_DEPENDS_OFF}
613	. endif	631	. endif
		632	. for p in ${SUBPACKAGES}
		633	. if defined(${opt}_${deptype}_DEPENDS_OFF.${p})
		634	${deptype}_DEPENDS.{p}+= ${${opt}_${deptype}_DEPENDS_OFF.${p}}
		635	. endif
		636	. endfor
614	. endfor	637	. endfor
615	. for target in ${_OPTIONS_TARGETS}	638	. for target in ${_OPTIONS_TARGETS}
616	_target= ${target:C/:.*//}	639	_target= ${target:C/:.*//}

Lines 21-35 install_depends() Link Here

(-)b/Mk/Scripts/do-depends.sh (-5 / +18 lines)
21	{	21	{
22	origin=$1	22	origin=$1
23	target=$2	23	target=$2
24	depends_args=$3	24	subpkg=$3
		25	depends_args=$4
25	if [ -z "${dp_USE_PACKAGE_DEPENDS}" -a -z "${dp_USE_PACKAGE_DEPENDS_ONLY}" ]; then	26	if [ -z "${dp_USE_PACKAGE_DEPENDS}" -a -z "${dp_USE_PACKAGE_DEPENDS_ONLY}" ]; then
26	MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args}	27	MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args}
27	return 0	28	return 0
28	fi	29	fi
29		30
30	port_var_fetch "${origin}" "${depends_args}" \	31	if [ -z "${subpkg}" ]; then
31	PKGFILE pkgfile \	32	port_var_fetch "${origin}" "${depends_args}" \
32	PKGBASE pkgbase	33	PKGFILE pkgfile \
		34	PKGBASE pkgbase
		35	else
		36	port_var_fetch "${origin}" "${depends_args}" \
		37	PKGFILE.${subpkg} pkgfile \
		38	PKGBASE.${subpkg} pkgbase
		39	fi
33		40
34	if [ -r "${pkgfile}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then	41	if [ -r "${pkgfile}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
35	echo "===> Installing existing package ${pkgfile}"	42	echo "===> Installing existing package ${pkgfile}"
Lines 123-134 for _line in ${dp_RAWDEPENDS} ; do Link Here
123	continue	130	continue
124	fi	131	fi
125		132
		133	subpkg=
126	case "${origin}" in	134	case "${origin}" in
127	@/*) ;; # Ignore @ in the path which would not be a flavor	135	@/*) ;; # Ignore @ in the path which would not be a flavor
128	@)	136	@)
129	export FLAVOR="${origin##*@}"	137	export FLAVOR="${origin##*@}"
130	origin=${origin%@*}	138	origin=${origin%@*}
131	;;	139	;;
		140	~/*) ;; # Ignore ~ in the path which would not be a subpackage
		141	~)
		142	subpkg="${origin##*~}"
		143	origin=${origin%~*}
		144	;;
132	esac	145	esac
133		146
134	case "${origin}" in	147	case "${origin}" in
Lines 194-200 for _line in ${dp_RAWDEPENDS} ; do Link Here
194	fi	207	fi
195		208
196	# Now actually install the dependencies	209	# Now actually install the dependencies
197	install_depends "${origin}" "${target}" "${depends_args}"	210	install_depends "${origin}" "${target}" "${subpkg}" "${depends_args}"
198	# Recheck if the installed dependency validates the pattern except for /nonexistent	211	# Recheck if the installed dependency validates the pattern except for /nonexistent
199	[ "${fct}" = "false" ] \|\| ${fct} "${pattern}"	212	[ "${fct}" = "false" ] \|\| ${fct} "${pattern}"
200	echo "===> Returning to build of ${dp_PKGNAME}"	213	echo "===> Returning to build of ${dp_PKGNAME}"