From 78bdb819c73a0d86aa8218f187ee7f008e36a985 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 10 Feb 2000 23:46:42 +0000
Subject: [PATCH] Bye, bye NO_WRKSUBDIR

---
 infrastructure/mk/bsd.port.mk              | 6 +-----
 infrastructure/templates/Makefile.template | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 36a9e156e55..e7c806548ee 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.191 2000/02/09 20:09:05 espie Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.192 2000/02/10 23:46:42 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 $
 #
@@ -165,8 +165,6 @@ _REVISION_NEEDED=${NEED_VERSION:C/.*\.//}
 # NO_INSTALL	- Use a dummy (do-nothing) install target.
 # NO_PACKAGE	- Use a dummy (do-nothing) package target.
 # NO_PKG_REGISTER - Don't register a port install as a package.
-# NO_WRKSUBDIR	- Assume port unpacks directly into ${WRKDIR}.
-#				  (deprecated, use WRKDIST=${WRKDIR} instead)
 # NO_DEPENDS	- Don't verify build of dependencies.
 # CLEANDEPENDS  - Nuke dependent dirs on make clean (Default: no)
 # BROKEN		- Port is broken.  Set this string to the reason why.
@@ -627,8 +625,6 @@ WRKDIR?=		${.CURDIR}/work
 
 .if defined(WRKSRC)
 WRKDIST?=		${WRKSRC}
-.elif defined(NO_WRKSUBDIR)
-WRKDIST?=		${WRKDIR}
 .else
 WRKDIST?=		${WRKDIR}/${DISTNAME}
 .endif
diff --git a/infrastructure/templates/Makefile.template b/infrastructure/templates/Makefile.template
index 281803c5de4..6ae17378249 100644
--- a/infrastructure/templates/Makefile.template
+++ b/infrastructure/templates/Makefile.template
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.template,v 1.4 1999/12/03 14:24:40 espie Exp $
+# $OpenBSD: Makefile.template,v 1.5 2000/02/10 23:46:43 espie Exp $
 # $FreeBSD/NetBSD: credit FreeBSD/NetBSD if thats where the port came from $
 # Original from: credit the original author here
 #
@@ -82,7 +82,8 @@ MASTER_SITES=		???
 #
 #NO_DEPENDS=		yes
 #NO_WRKDIR=		yes
-#NO_WRKSUBDIR=		yes
+# NO_WRKSUBDIR is obsolete
+# Use WRKDIST=${WRKDIR}
 #NO_CHECKSUM=		yes
 #NO_EXTRACT=		yes
 #NO_PATCH=		yes