Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 566144)
+++ Mk/bsd.port.mk	(working copy)
@@ -2621,7 +2626,7 @@
 PKGREPOSITORYSUBDIR?=	All
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
 .if exists(${PACKAGES})
-PACKAGES:=	${PACKAGES:S/:/\:/g}
+PACKAGES:=	${PACKAGES}
 _HAVE_PACKAGES=	yes
 PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
 .else
@@ -3408,19 +3413,19 @@
 # Package
 
 .if defined(_HAVE_PACKAGES)
-_EXTRA_PACKAGE_TARGET_DEP+= ${PKGFILE}
-_PORTS_DIRECTORIES+=	${PKGREPOSITORY}
+_EXTRA_PACKAGE_TARGET_DEP+= ${PKGFILE:S/:/\:/g}
+_PORTS_DIRECTORIES+=	${PKGREPOSITORY:S/:/\:/g}
 
-${PKGFILE}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY}
+${PKGFILE:S/:/\:/g}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY:S/:/\:/g}
 	@${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}
-_EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE}
+_EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTREPOSITORY:S/:/\:/g}
+_PORTS_DIRECTORIES+=	${PKGLATESTREPOSITORY:S/:/\:/g}
+_EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE:S/:/\:/g}
 
-${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
+${PKGLATESTFILE:S/:/\:/g}: ${PKGFILE:S/:/\:/g} ${PKGLATESTREPOSITORY:S/:/\:/g}
 	${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE}
 .  endif