diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1047,7 +1047,7 @@
 .if !defined(PORTS_FEATURES) && empty(${PORTS_FEATURES:MFLAVORS})
 PORTS_FEATURES+=	FLAVORS
 .endif
-MINIMAL_PKG_VERSION=	1.15.9
+MINIMAL_PKG_VERSION=	1.17.2
 
 _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
 						${STAGEDIR}${PREFIX} ${WRKDIR}/pkg ${BINARY_LINKDIR}
@@ -3298,9 +3298,9 @@
 check-build-conflicts:
 .if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK)
 	@conflicts_with=$$( \
-	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \
-		| while read pkgname prfx orgn; do \
-		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+	{ ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_BUILD:C/.+/'&'/}} 2>/dev/null || : ; } \
+			| while read pkgname prfx; \
+		if [ "/${PREFIX}" = "/$${prfx}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
 			${ECHO_CMD} -n " $${pkgname}"; \
 		fi; \
 	done); \
@@ -3323,9 +3323,9 @@
 identify-install-conflicts:
 .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS)
 	@conflicts_with=$$( \
-	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
-		| while read pkgname prfx orgn; do \
-		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+	{ ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_INSTALL:C/.+/'&'/}} 2>/dev/null || : ; } \
+			| while read pkgname prfx; do \
+		if [ "/${PREFIX}" = "/$${prfx}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
 			${ECHO_CMD} -n " $${pkgname}"; \
 		fi; \
 	done); \
@@ -3348,9 +3348,9 @@
 .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS)
 .if defined(DEFER_CONFLICTS_CHECK)
 	@conflicts_with=$$( \
-	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
-			| while read pkgname prfx orgn; do \
-		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+	{ ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_BUILD:C/.+/'&'/}} ${CONFLICTS_INSTALL:C/.+/'&'/}} 2>/dev/null || : ; } \
+			| while read pkgname prfx; do \
+		if [ "/${PREFIX}" = "/$${prfx}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
 			${ECHO_CMD} -n " $${pkgname}"; \
 		fi; \
 	done); \
@@ -3366,9 +3366,9 @@
 	fi
 .else
 	@conflicts_with=$$( \
-	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
-			| while read pkgname prfx orgn; do \
-		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+	{ ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_INSTALL:C/.+/'&'/}} 2>/dev/null || : ; } \
+			| while read pkgname prfx; do \
+		if [ "/${PREFIX}" = "/$${prfx}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
 			${ECHO_CMD} -n " $${pkgname}"; \
 		fi; \
 	done); \