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

Collapse All | Expand All

(-)b/Mk/bsd.commands.mk (+1 lines)
Lines 128-132 PKG_VERSION?= ${PKG_BIN} version Link Here
128
PKG_CREATE?=		${PKG_BIN} create
128
PKG_CREATE?=		${PKG_BIN} create
129
PKG_ADD?=		${PKG_BIN} add
129
PKG_ADD?=		${PKG_BIN} add
130
PKG_QUERY?=		${PKG_BIN} query
130
PKG_QUERY?=		${PKG_BIN} query
131
PKG_INSTALL?=		${PKG_BIN} install -y
131
132
132
.endif
133
.endif
(-)b/Mk/bsd.port.mk (-3 / +23 lines)
Lines 1037-1042 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here
1037
#				  if an existing package is not present.
1037
#				  if an existing package is not present.
1038
# USE_PACKAGE_DEPENDS_ONLY
1038
# USE_PACKAGE_DEPENDS_ONLY
1039
#				- Like USE_PACKAGE_DEPENDS, but do not fallback on source.
1039
#				- Like USE_PACKAGE_DEPENDS, but do not fallback on source.
1040
# USE_REPO_DEPENDS
1041
#				- Try to install dependencies from package repositories
1042
#				  instead of building the port from scratch. Fall back on
1043
#				  source if the package is not available in the repository.
1044
# USE_REPO_DEPENDS_ONLY
1045
#				- Like USE_REPO_DEPENDS, but do not fallback on source.
1040
# INSTALL_AS_USER
1046
# INSTALL_AS_USER
1041
#				- Define this to install as the current user, intended
1047
#				- Define this to install as the current user, intended
1042
#				  for systems where you have no root access.
1048
#				  for systems where you have no root access.
Lines 4360-4373 _INSTALL_DEPENDS= \ Link Here
4360
				else \
4366
				else \
4361
					${PKG_ADD} -A $${subpkgfile}; \
4367
					${PKG_ADD} -A $${subpkgfile}; \
4362
				fi; \
4368
				fi; \
4369
				success="YES"; \
4363
			elif [ -n "${USE_PACKAGE_DEPENDS_ONLY}" -a "$${target}" = "${DEPENDS_TARGET}" ]; then \
4370
			elif [ -n "${USE_PACKAGE_DEPENDS_ONLY}" -a "$${target}" = "${DEPENDS_TARGET}" ]; then \
4364
				${ECHO_MSG} "===>   ${PKGNAME} depends on package: $${subpkgfile} - not found"; \
4371
				${ECHO_MSG} "===>   ${PKGNAME} depends on package: $${subpkgfile} - not found"; \
4365
				${ECHO_MSG} "===>   USE_PACKAGE_DEPENDS_ONLY set - not building missing dependency from source"; \
4372
				${ECHO_MSG} "===>   USE_PACKAGE_DEPENDS_ONLY set - not building missing dependency from source"; \
4366
				exit 1; \
4373
				exit 1; \
4367
			else \
4368
			  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
4369
			fi; \
4374
			fi; \
4370
		else \
4375
		fi; \
4376
		if [ -n "${USE_REPO_DEPENDS}" -o -n "${USE_REPO_DEPENDS_ONLY}" -a "$$target" = "${DEPENDS_TARGET}" -a -z "$$success" ]; then \
4377
			subpkgname=`(cd $$dir; ${MAKE} $$depends_args -V PKGNAME)`; \
4378
			subpkgname=$${subpkgname%-*} ; \
4379
			${ECHO_MSG} "===>   Installing package $${subpkgname} from repository"; \
4380
			if ! ${PKG_INSTALL} -A $${subpkgname}; then \
4381
				if [ -n "${USE_REPO_DEPENDS_ONLY}" ]; then \
4382
					${ECHO_MSG} "===>   ${PKGNAME} depends on package: $${subpkgname} - not found"; \
4383
					${ECHO_MSG} "===>   USE_REPO_DEPENDS_ONLY set - not building missing dependency from source"; \
4384
					exit 1; \
4385
				fi; \
4386
			else; \
4387
				success="YES"; \
4388
			fi; \
4389
		fi; \
4390
		if [ -z "$$success" ]; then \
4371
			(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
4391
			(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
4372
		fi; \
4392
		fi; \
4373
		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}";
4393
		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}";

Return to bug 198881