pkg_add -f -> pkg_add -F prior to killing the old option.

This commit is contained in:
espie 2005-01-13 11:54:55 +00:00
parent 190b681d1e
commit 3edf27f16d

View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.677 2005/01/06 19:30:34 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.678 2005/01/13 11:54:55 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -1892,7 +1892,7 @@ ${_UPDATE_COOKIE}: ${_PACKAGE_COOKIES}
case $$a in \
'') ;; \
*) ${ECHO_MSG} "Upgrading from $$a"; \
${SUDO} ${SETENV} PKG_PATH=${PKGREPOSITORY}:${PKG_PATH} PKG_TMPDIR=${PKG_TMPDIR} pkg_add ${_PKGADD_AUTO} -f update -f installed -r ${PKGFILE${SUBPACKAGE}};; \
${SUDO} ${SETENV} PKG_PATH=${PKGREPOSITORY}:${PKG_PATH} PKG_TMPDIR=${PKG_TMPDIR} pkg_add ${_PKGADD_AUTO} -F update -F installed -r ${PKGFILE${SUBPACKAGE}};; \
esac
.else
@a=`pkg_info -e ${FULLPKGPATH} 2>/dev/null || true`; \