From c1fa9429b1ab9b1822680a3ceef3ea6502dfa76f Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Wed, 16 Jun 2010 12:06:46 +0000
Subject: [PATCH] remove PKG_CMD, set up PKG_ADD/PKG_CREATE/PKG_DELETE/PKG_INFO

---
 infrastructure/mk/bsd.port.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index b6db9263ba3..6e913c410f9 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1003 2010/06/15 11:42:21 kili Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1004 2010/06/16 12:06:46 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 $
 #
@@ -185,13 +185,15 @@ FETCH_CMD ?= /usr/bin/ftp -V ${_PROGRESS} -k ${FTP_KEEPALIVE}
 PKG_TMPDIR ?= /var/tmp
 
 PKGDB_LOCK ?=
-PKG_CMD ?= /usr/sbin/pkg_create
+PKG_ADD ?= /usr/sbin/pkg_add
+PKG_INFO ?= /usr/sbin/pkg_info
+PKG_CREATE ?= /usr/sbin/pkg_create
 PKG_DELETE ?= /usr/sbin/pkg_delete
 
-_PKG_ADD = /usr/sbin/pkg_add ${_PROGRESS}
-_PKG_CREATE = ${PKG_CMD} ${_PROGRESS}
+_PKG_ADD = ${PKG_ADD} ${_PROGRESS}
+_PKG_CREATE = ${PKG_CREATE} ${_PROGRESS}
 _PKG_DELETE = ${PKG_DELETE} ${_PROGRESS}
-_PKG_QUERY = /usr/sbin/pkg_info ${PKGDB_LOCK} -e
+_PKG_QUERY = ${PKG_INFO} ${PKGDB_LOCK} -e
 _PKG_ADD += ${PKG_DBLOCK}
 _PKG_CREATE += ${PKGDB_LOCK}
 _PKG_DELETE += ${PKGDB_LOCK}