From 247217cd33d5ca6bb4d29d9ea7a4067a7de66d4d Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sat, 31 Jan 1998 20:59:30 +0000
Subject: Allow package building in current directory again.

---
 share/mk/bsd.port.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'share/mk')

diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 2fae7aa..ac153cf 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$Id: bsd.port.mk,v 1.267 1997/11/20 05:33:56 asami Exp $
+#	$Id: bsd.port.mk,v 1.268 1998/01/02 10:37:14 asami Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -675,7 +675,11 @@ MAINTAINER?=	ports@FreeBSD.ORG
 #  shouldn't match "[a-z]*"), see the target "delete-package-links" below.
 PKGREPOSITORYSUBDIR?=	All
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
+.if exists(${PACKAGES})
 PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
+.else
+PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
+.endif
 
 # The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
 PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
@@ -1151,7 +1155,7 @@ _PORT_USE: .USE
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 	@if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
 		${ECHO_MSG} "===>  ${PKGNAME} is already installed - perhaps an older version?"; \
-		${ECHO_MSG} "      If so, you may wish to \`\`pkg_delete ${PKGNAME}'' and install"; \
+		${ECHO_MSG} "      If so, you may wish to \`\`make deinstall'' and install"; \
 		${ECHO_MSG} "      this port again by \`\`make reinstall'' to upgrade it properly."; \
 		${ECHO_MSG} "      If you really wish to overwrite the old port of ${PKGNAME}"; \
 		${ECHO_MSG} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
-- 
cgit v1.1