--- bsd.port.mk.backup	Tue Feb 20 09:30:54 2007
+++ bsd.port.mk	Tue Feb 20 15:43:11 2007
@@ -2289,37 +2289,11 @@
 PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
 
 
-.if ((${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install") || exists(${LOCALBASE}/sbin/pkg_info)
-.if (${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install"
-EXTRACT_DEPENDS+=	${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/ports-mgmt/pkg_install
-.endif
-.if !defined(DESTDIR)
 PKG_CMD?=		${LOCALBASE_REL}/sbin/pkg_create
 PKG_ADD?=		${LOCALBASE_REL}/sbin/pkg_add
 PKG_DELETE?=	${LOCALBASE_REL}/sbin/pkg_delete
 PKG_INFO?=		${LOCALBASE_REL}/sbin/pkg_info
 PKG_VERSION?=		${LOCALBASE_REL}/sbin/pkg_version
-.else
-PKG_CMD?=		${LOCALBASE_REL}/sbin/pkg_create
-PKG_ADD?=		${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_add
-PKG_DELETE?=		${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_delete
-PKG_INFO?=		${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_info
-.endif
-.else
-.if !defined(DESTDIR)
-PKG_CMD?=		/usr/sbin/pkg_create
-PKG_ADD?=		/usr/sbin/pkg_add
-PKG_DELETE?=	/usr/sbin/pkg_delete
-PKG_INFO?=		/usr/sbin/pkg_info
-PKG_VERSION?=		/usr/sbin/pkg_version
-.else
-PKG_CMD?=		/usr/sbin/pkg_create
-PKG_ADD?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_add
-PKG_DELETE?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_delete
-PKG_INFO?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_info
-PKG_VERSION?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_version
-.endif
-.endif
 
 # Does the pkg_create tool support conflict checking?
 # XXX Slow?