Date: 20 Dec 2000 23:29:40 -0800 From: asami@freebsd.org (Satoshi - Ports Wraith - Asami) To: Dan Moschuk <dan@freebsd.org> Cc: developers@freebsd.org, ports@freebsd.org Subject: Re: New bsd.port.mk patch Message-ID: <yfkofy6teor.fsf@vader.clickarray.com> In-Reply-To: <20001220001338.A85396@spirit.jaded.net> (Dan Moschuk's message of "Wed, 20 Dec 2000 00:13:38 -0500") References: <20001220001338.A85396@spirit.jaded.net>
next in thread | previous in thread | raw e-mail | index | archive | help
* 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?yfkofy6teor.fsf>