From owner-freebsd-ports  Tue Dec 19 21:13:49 2000
From owner-freebsd-ports@FreeBSD.ORG  Tue Dec 19 21:13:43 2000
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from spirit.jaded.net (d226-59-226.home.cgocable.net [24.226.59.226])
	by hub.freebsd.org (Postfix) with ESMTP
	id 445A337B400; Tue, 19 Dec 2000 21:13:43 -0800 (PST)
Received: (from dan@localhost)
	by spirit.jaded.net (8.11.1/8.11.1) id eBK5DcE94366;
	Wed, 20 Dec 2000 00:13:38 -0500 (EST)
	(envelope-from dan)
Date: Wed, 20 Dec 2000 00:13:38 -0500
From: Dan Moschuk <dan@freebsd.org>
To: developers@freebsd.org
Cc: ports@freebsd.org, asami@freebsd.org
Subject: New bsd.port.mk patch
Message-ID: <20001220001338.A85396@spirit.jaded.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Sender: dan@spirit.jaded.net
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


I've added Trevor Johnson's suggestions and added a nice informative 
message when the -P option was omitted. 

If no one has any problems with this, and if asami-san gives me the OK, I'd
like to commit this in the next few days (with -STABLE following a few days
afterwards).

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.360
diff -u -r1.360 bsd.port.mk
--- bsd.port.mk	2000/11/16 13:06:25	1.360
+++ bsd.port.mk	2000/12/20 05:08:05
@@ -620,12 +620,21 @@
 PACKAGES?=		${PORTSDIR}/packages
 TEMPLATES?=		${PORTSDIR}/Templates
 
-.if (!defined(PATCHDIR) && exists(${MASTERDIR}/patches)) || \
-	(!defined(PKGDIR) && exists(${MASTERDIR}/pkg)) || \
-	(!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5))
+.if (!defined(PKGDIR) && exists(${MASTERDIR}/pkg/DESCR)) || \
+	(defined(PKGDIR) && exists(${PKGDIR}/DESCR))
 pre-everything::
 	@${ECHO} "Error: your port uses an old layout.  Please update it to match this bsd.port.mk."
 	@${FALSE}
+.endif
+.if (!defined(PKGDIR) && exists(${MASTERDIR}/pkg) && \
+	!exists(${MASTERDIR}/pkg/DESCR)) || \
+	(defined(PKGDIR) && exists(${PKGDIR}) && !exists(${PKGDIR}/DESCR))
+pre-everything::
+	@${ECHO}
+	@${ECHO} ">> This port contains stale directories from the old port layout! "
+	@${ECHO} ">> If you use cvs to update your ports collection, please make sure you update "
+	@${ECHO} ">> using the -P option from now on!"
+	@${ECHO}
 .endif
 PATCHDIR?=		${MASTERDIR}/files
 FILESDIR?=		${MASTERDIR}/files

-Dan
-- 
Man is a rational animal who always loses his temper when he is called
upon to act in accordance with the dictates of reason.
                -- Oscar Wilde


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message