From owner-freebsd-ports  Wed Dec 20 23:29:11 2000
From owner-freebsd-ports@FreeBSD.ORG  Wed Dec 20 23:29:06 2000
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from dune.clickarray.com (unknown [216.132.92.2])
	by hub.freebsd.org (Postfix) with ESMTP
	id 40AA537B400; Wed, 20 Dec 2000 23:29:06 -0800 (PST)
Received: from vader.clickarray.com ([10.2.1.252])
	by dune.clickarray.com (8.9.3/8.9.3) with ESMTP id XAA00763;
	Wed, 20 Dec 2000 23:32:01 -0800 (PST)
	(envelope-from asami@cs.berkeley.edu)
Received: (from asami@localhost)
	by vader.clickarray.com (8.11.0/8.11.0) id eBL7TfJ50535;
	Wed, 20 Dec 2000 23:29:41 -0800 (PST)
	(envelope-from asami@cs.berkeley.edu)
X-Authentication-Warning: vader.clickarray.com: asami set sender to asami@cs.berkeley.edu using -f
Sender: asami@clickarray.com
To: Dan Moschuk <dan@freebsd.org>
Cc: developers@freebsd.org, ports@freebsd.org
Subject: Re: New bsd.port.mk patch
References: <20001220001338.A85396@spirit.jaded.net>
From: asami@freebsd.org (Satoshi - Ports Wraith - Asami)
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: text/plain; charset=US-ASCII
Date: 20 Dec 2000 23:29:40 -0800
In-Reply-To: <20001220001338.A85396@spirit.jaded.net>
 (Dan Moschuk's message of "Wed, 20 Dec 2000 00:13:38 -0500")
Message-ID: <yfkofy6teor.fsf@vader.clickarray.com>
Lines: 45
User-Agent: T-gnus/6.14.5 (based on Gnus v5.8.7) (revision 06) SEMI/1.13.7
 (Awazu) FLIM/1.13.2 (Kasanui) Emacs/20.7 (i386--freebsd) MULE/4.0
 =?ISO-2022-JP?B?KBskQjJWMWMbKEIp?=
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

 * From: Dan Moschuk <dan@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

Thanks for the patch.  I will test and commit something like it soon.

Satoshi


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