Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2622,9 +2622,12 @@
 WRKDIR_PKGFILE=	${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
 
 # The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
-PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
+PKGLATESTREPOSITORY=	${PACKAGES}/Latest
+PKGLATESTREPOSITORY_NG?=	${PACKAGES}
 PKGBASE?=			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PKGLATESTFILE=		${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX}
+PKG_BOOTSTRAP_SUFX?= .bootstrap
+PKGLATESTFILE_NG=		${PKGLATESTREPOSITORY_NG}/${PKGBASE}${PKG_BOOTSTRAP_SUFX}
 
 CONFIGURE_SCRIPT?=	configure
 CONFIGURE_CMD?=		./${CONFIGURE_SCRIPT}
@@ -3410,10 +3413,13 @@
 .  if ${PKGORIGIN} == "ports-mgmt/pkg" || ${PKGORIGIN} == "ports-mgmt/pkg-devel"
 _EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTREPOSITORY}
 _PORTS_DIRECTORIES+=	${PKGLATESTREPOSITORY}
-_EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE}
+_EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE} ${PKGLATESTFILE_NG}
 
 ${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
 	${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE}
+
+${PKGLATESTFILE_NG}: ${PKGFILE} ${PKGLATESTREPOSITORY_NG}
+	${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE_NG}
 .  endif
 
 .endif